diff --git a/content/io/cloudslang/amazon/aws/ec2/utils/get_unique_name.sl b/content/io/cloudslang/amazon/aws/ec2/utils/get_unique_name.sl
index 3934540fd1..00d876d593 100644
--- a/content/io/cloudslang/amazon/aws/ec2/utils/get_unique_name.sl
+++ b/content/io/cloudslang/amazon/aws/ec2/utils/get_unique_name.sl
@@ -195,7 +195,6 @@ flow:
           - instance_tags_key: '${return_result}'
         navigate:
           - SUCCESS: add_value_tag
-          - FAILURE: set_failure_message_unknown_error
 
     - add_value_tag:
         do:
@@ -204,12 +203,10 @@ flow:
             - delimiter: '${delimiter}'
             - element: '${random_name}'
         publish:
-          - return_code: '${return_code}'
           - instance_tags_value: '${return_result}'
           - return_result: 'Successfully generated a unique name!'
         navigate:
           - SUCCESS: SUCCESS
-          - FAILURE: set_failure_message_unknown_error
 
     - is_list_empty:
         do:
diff --git a/content/io/cloudslang/base/lists/add_element.sl b/content/io/cloudslang/base/lists/add_element.sl
index 1f555dc849..1637d7f22e 100644
--- a/content/io/cloudslang/base/lists/add_element.sl
+++ b/content/io/cloudslang/base/lists/add_element.sl
@@ -21,34 +21,26 @@
 #!                 Example: '7'
 #! @input delimiter: The list delimiter
 #!
-#! @output response: 'success' or 'failure'
 #! @output return_result: The new list or an error message otherwise
-#! @output return_code: 0 if success, -1 if failure
 #!
 #! @result SUCCESS: The new list was retrieved with success
-#! @result FAILURE: Otherwise
 #!!#
 ########################################################################################################################
-
 namespace: io.cloudslang.base.lists
-
 operation:
   name: add_element
-
   inputs:
-    - list
-    - element
-    - delimiter
-
-  java_action:
-    gav: 'io.cloudslang.content:cs-lists:0.0.7'
-    class_name: io.cloudslang.content.actions.ListAppenderAction
-    method_name: appendElement
-
+    - list:
+        required: false
+    - element:
+        required: false
+    - delimiter:
+        default: ','
+        required: false
+  python_action:
+    script: |
+      list = list+delimiter+element if list else element
   outputs:
-    - return_result: ${returnResult}
-    - return_code: ${returnCode}
-
+    - return_result: ${list}
   results:
-    - SUCCESS: ${returnCode == '0'}
-    - FAILURE
+    - SUCCESS
\ No newline at end of file
diff --git a/content/io/cloudslang/base/os/linux/samples/deploy_tomcat_on_ubuntu.sl b/content/io/cloudslang/base/os/linux/samples/deploy_tomcat_on_ubuntu.sl
index 315d29a6d8..ed67745f06 100644
--- a/content/io/cloudslang/base/os/linux/samples/deploy_tomcat_on_ubuntu.sl
+++ b/content/io/cloudslang/base/os/linux/samples/deploy_tomcat_on_ubuntu.sl
@@ -336,12 +336,13 @@ flow:
 
     - upload_init_config_file:
         do:
-          remote.remote_secure_copy:
+          ssh.ssh_flow:
+            - host
+            - username: 'root'
+            - password: ${root_password}
             - source_path
-            - destination_host: ${host}
-            - destination_path: '/etc/init.d/tomcat'
-            - destination_username: 'root'
-            - destination_password: ${root_password}
+            - destination_path: '/etc/init.d/tomcat/'
+            - command: ${'ln -s ' + source_path + '/* ' + destination_path}
         publish:
           - return_result
           - return_code