diff --git a/src/main/resources/synthetic.xml b/src/main/resources/synthetic.xml
index f2afaec..2f24f2c 100644
--- a/src/main/resources/synthetic.xml
+++ b/src/main/resources/synthetic.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!--
 
-    Copyright 2017 XEBIALABS
+    Copyright 2018 XEBIALABS
 
     Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/src/main/resources/web/include/XLDVersionsTile/grid/application.html b/src/main/resources/web/include/XLDVersionsTile/grid/application.html
index 570b5da..3ba63c8 100644
--- a/src/main/resources/web/include/XLDVersionsTile/grid/application.html
+++ b/src/main/resources/web/include/XLDVersionsTile/grid/application.html
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright 2017 XEBIALABS
+    Copyright 2018 XEBIALABS
 
     Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/src/main/resources/web/include/XLDVersionsTile/grid/name-filter-template.html b/src/main/resources/web/include/XLDVersionsTile/grid/name-filter-template.html
index 9c745ea..b593168 100644
--- a/src/main/resources/web/include/XLDVersionsTile/grid/name-filter-template.html
+++ b/src/main/resources/web/include/XLDVersionsTile/grid/name-filter-template.html
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright 2017 XEBIALABS
+    Copyright 2018 XEBIALABS
 
     Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/src/main/resources/web/include/XLDVersionsTile/grid/version.html b/src/main/resources/web/include/XLDVersionsTile/grid/version.html
index cce746d..e96b6c8 100644
--- a/src/main/resources/web/include/XLDVersionsTile/grid/version.html
+++ b/src/main/resources/web/include/XLDVersionsTile/grid/version.html
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright 2017 XEBIALABS
+    Copyright 2018 XEBIALABS
 
     Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/src/main/resources/web/include/XLDVersionsTile/js/xld-versions-tile.js b/src/main/resources/web/include/XLDVersionsTile/js/xld-versions-tile.js
index ac45b31..4779254 100644
--- a/src/main/resources/web/include/XLDVersionsTile/js/xld-versions-tile.js
+++ b/src/main/resources/web/include/XLDVersionsTile/js/xld-versions-tile.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 XEBIALABS
+ * Copyright 2018 XEBIALABS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
  *
diff --git a/src/main/resources/web/include/XLDVersionsTile/xld-versions-tile-view.html b/src/main/resources/web/include/XLDVersionsTile/xld-versions-tile-view.html
index 9c17a32..4f82f6b 100644
--- a/src/main/resources/web/include/XLDVersionsTile/xld-versions-tile-view.html
+++ b/src/main/resources/web/include/XLDVersionsTile/xld-versions-tile-view.html
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright 2017 XEBIALABS
+    Copyright 2018 XEBIALABS
 
     Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/src/main/resources/xl-ui-plugin.xml b/src/main/resources/xl-ui-plugin.xml
index 520b3ac..8d8ddf3 100644
--- a/src/main/resources/xl-ui-plugin.xml
+++ b/src/main/resources/xl-ui-plugin.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright 2017 XEBIALABS
+    Copyright 2018 XEBIALABS
 
     Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/src/main/resources/xlr_xldeploy/AddCITag.py b/src/main/resources/xlr_xldeploy/AddCITag.py
index 29935ae..bdc3472 100644
--- a/src/main/resources/xlr_xldeploy/AddCITag.py
+++ b/src/main/resources/xlr_xldeploy/AddCITag.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/main/resources/xlr_xldeploy/GetCITags.py b/src/main/resources/xlr_xldeploy/GetCITags.py
index 8c0abac..571a423 100644
--- a/src/main/resources/xlr_xldeploy/GetCITags.py
+++ b/src/main/resources/xlr_xldeploy/GetCITags.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/main/resources/xlr_xldeploy/LocalCLI.py b/src/main/resources/xlr_xldeploy/LocalCLI.py
index c8e68c3..a05d3ba 100644
--- a/src/main/resources/xlr_xldeploy/LocalCLI.py
+++ b/src/main/resources/xlr_xldeploy/LocalCLI.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/main/resources/xlr_xldeploy/SetCITags.py b/src/main/resources/xlr_xldeploy/SetCITags.py
index 9e01fea..baac030 100644
--- a/src/main/resources/xlr_xldeploy/SetCITags.py
+++ b/src/main/resources/xlr_xldeploy/SetCITags.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/main/resources/xlr_xldeploy/XLDVersionsTile.py b/src/main/resources/xlr_xldeploy/XLDVersionsTile.py
index a0bd353..1a9d16d 100644
--- a/src/main/resources/xlr_xldeploy/XLDVersionsTile.py
+++ b/src/main/resources/xlr_xldeploy/XLDVersionsTile.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/main/resources/xlr_xldeploy/XLDeployClient.py b/src/main/resources/xlr_xldeploy/XLDeployClient.py
index f5ca9d2..c68c951 100644
--- a/src/main/resources/xlr_xldeploy/XLDeployClient.py
+++ b/src/main/resources/xlr_xldeploy/XLDeployClient.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -373,26 +373,23 @@ def update_ci_property(self, ci_id, ci_property, property_value):
             data[ci_property] = property_value
         self.update_ci(ci_id, json.dumps(data), 'json')
 
-    def add_ci_to_environment(self, env_id, ci_id):
+    def add_ci_to_environment(self, env_id, ci_id, ci_type):
         self.check_ci_exist(env_id, throw_on_fail=True)
         ci = self.get_ci(env_id, 'json')
         data = json.loads(ci)
-        data["members"].append(ci_id)
+        if str(ci_type) == 'udm.Dictionary':
+            data["dictionaries"].append(ci_id)
+        else:
+            data["members"].append(ci_id)
         self.update_ci(env_id, json.dumps(data), 'json')
 
-        get_env_response = self.get_ci(env_id, 'xml')
-        items = get_env_response.partition('</members>')
-        xml = items[0] + '<ci ref="' + ci_id + '"/>' + items[1] + items[2]
-        print(xml)
-        self.update_ci(env_id, xml, 'xml')
-
     def remove_ci_from_environment(self, env_id, ci_id):
         get_env_response = self.get_ci(env_id, 'xml')
         print get_env_response
         env_root = ET.fromstring(get_env_response)
         member_to_remove = None
         for child in env_root:
-            if child.tag == 'members':
+            if child.tag in ('members','dictionaries'):
                 for member in child:
                     if member.attrib['ref'] == ci_id:
                         print 'Found ' + ci_id + ' in ' + env_id
diff --git a/src/main/resources/xlr_xldeploy/XLDeployClientUtil.py b/src/main/resources/xlr_xldeploy/XLDeployClientUtil.py
index 54e0e33..2fb478b 100644
--- a/src/main/resources/xlr_xldeploy/XLDeployClientUtil.py
+++ b/src/main/resources/xlr_xldeploy/XLDeployClientUtil.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/main/resources/xlr_xldeploy/__init__.py b/src/main/resources/xlr_xldeploy/__init__.py
index 60b919a..1afb837 100644
--- a/src/main/resources/xlr_xldeploy/__init__.py
+++ b/src/main/resources/xlr_xldeploy/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -7,3 +7,5 @@
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
+
+#
diff --git a/src/main/resources/xlr_xldeploy/cli.py b/src/main/resources/xlr_xldeploy/cli.py
index 3f29c34..41c0216 100644
--- a/src/main/resources/xlr_xldeploy/cli.py
+++ b/src/main/resources/xlr_xldeploy/cli.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/main/resources/xlr_xldeploy/cliFile.py b/src/main/resources/xlr_xldeploy/cliFile.py
index c159843..52b85a3 100644
--- a/src/main/resources/xlr_xldeploy/cliFile.py
+++ b/src/main/resources/xlr_xldeploy/cliFile.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/main/resources/xlr_xldeploy/cliUrl.py b/src/main/resources/xlr_xldeploy/cliUrl.py
index adb47de..fcf6a36 100644
--- a/src/main/resources/xlr_xldeploy/cliUrl.py
+++ b/src/main/resources/xlr_xldeploy/cliUrl.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/main/resources/xlr_xldeploy/controlTask.py b/src/main/resources/xlr_xldeploy/controlTask.py
index 00f0cda..ccd4dd0 100644
--- a/src/main/resources/xlr_xldeploy/controlTask.py
+++ b/src/main/resources/xlr_xldeploy/controlTask.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/main/resources/xlr_xldeploy/createCITask.py b/src/main/resources/xlr_xldeploy/createCITask.py
index 25000cc..31b84af 100644
--- a/src/main/resources/xlr_xldeploy/createCITask.py
+++ b/src/main/resources/xlr_xldeploy/createCITask.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -18,4 +18,5 @@
 else:
     xld_client.create_ci(ciID, ciType)
 if addToEnvironment:
-    xld_client.add_ci_to_environment(envID, ciID)
+    xld_client.add_ci_to_environment(envID, ciID, ciType)
+
diff --git a/src/main/resources/xlr_xldeploy/createFolder.py b/src/main/resources/xlr_xldeploy/createFolder.py
index 36f8ce7..441a73d 100644
--- a/src/main/resources/xlr_xldeploy/createFolder.py
+++ b/src/main/resources/xlr_xldeploy/createFolder.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/main/resources/xlr_xldeploy/deleteCITask.py b/src/main/resources/xlr_xldeploy/deleteCITask.py
index d2bd05b..212a0c2 100644
--- a/src/main/resources/xlr_xldeploy/deleteCITask.py
+++ b/src/main/resources/xlr_xldeploy/deleteCITask.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/main/resources/xlr_xldeploy/deleteInfrastructureTask.py b/src/main/resources/xlr_xldeploy/deleteInfrastructureTask.py
index 87805d5..01e40a2 100644
--- a/src/main/resources/xlr_xldeploy/deleteInfrastructureTask.py
+++ b/src/main/resources/xlr_xldeploy/deleteInfrastructureTask.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/main/resources/xlr_xldeploy/deployTask.py b/src/main/resources/xlr_xldeploy/deployTask.py
index 1386587..97f2251 100644
--- a/src/main/resources/xlr_xldeploy/deployTask.py
+++ b/src/main/resources/xlr_xldeploy/deployTask.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/main/resources/xlr_xldeploy/doesCIExistTask.py b/src/main/resources/xlr_xldeploy/doesCIExistTask.py
index e0a3646..ee7e48e 100644
--- a/src/main/resources/xlr_xldeploy/doesCIExistTask.py
+++ b/src/main/resources/xlr_xldeploy/doesCIExistTask.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/main/resources/xlr_xldeploy/getAllVersionsTask.py b/src/main/resources/xlr_xldeploy/getAllVersionsTask.py
index e7c7349..1bd4092 100644
--- a/src/main/resources/xlr_xldeploy/getAllVersionsTask.py
+++ b/src/main/resources/xlr_xldeploy/getAllVersionsTask.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/main/resources/xlr_xldeploy/getCITask.py b/src/main/resources/xlr_xldeploy/getCITask.py
index b187721..2cec356 100644
--- a/src/main/resources/xlr_xldeploy/getCITask.py
+++ b/src/main/resources/xlr_xldeploy/getCITask.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/main/resources/xlr_xldeploy/getLatestDeployedTask.py b/src/main/resources/xlr_xldeploy/getLatestDeployedTask.py
index d2695ba..785d843 100644
--- a/src/main/resources/xlr_xldeploy/getLatestDeployedTask.py
+++ b/src/main/resources/xlr_xldeploy/getLatestDeployedTask.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/main/resources/xlr_xldeploy/getLatestVersionTask.py b/src/main/resources/xlr_xldeploy/getLatestVersionTask.py
index 52b123d..878387c 100644
--- a/src/main/resources/xlr_xldeploy/getLatestVersionTask.py
+++ b/src/main/resources/xlr_xldeploy/getLatestVersionTask.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/main/resources/xlr_xldeploy/importTask.py b/src/main/resources/xlr_xldeploy/importTask.py
index 78ba1aa..36dbb50 100644
--- a/src/main/resources/xlr_xldeploy/importTask.py
+++ b/src/main/resources/xlr_xldeploy/importTask.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/main/resources/xlr_xldeploy/migrateTask.py b/src/main/resources/xlr_xldeploy/migrateTask.py
index 5e7ddcf..aff4192 100644
--- a/src/main/resources/xlr_xldeploy/migrateTask.py
+++ b/src/main/resources/xlr_xldeploy/migrateTask.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/main/resources/xlr_xldeploy/undeployTask.py b/src/main/resources/xlr_xldeploy/undeployTask.py
index 732e36a..f858247 100644
--- a/src/main/resources/xlr_xldeploy/undeployTask.py
+++ b/src/main/resources/xlr_xldeploy/undeployTask.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/main/resources/xlr_xldeploy/updateCIProperty.py b/src/main/resources/xlr_xldeploy/updateCIProperty.py
index 48e3a55..d9c857e 100644
--- a/src/main/resources/xlr_xldeploy/updateCIProperty.py
+++ b/src/main/resources/xlr_xldeploy/updateCIProperty.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/test/resources/docker/docker-compose.yml b/src/test/resources/docker/docker-compose.yml
index 00efd91..f6119a0 100644
--- a/src/test/resources/docker/docker-compose.yml
+++ b/src/test/resources/docker/docker-compose.yml
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
diff --git a/src/test/resources/docker/initialize/data/create-ci-demo-data.json b/src/test/resources/docker/initialize/data/create-ci-demo-data.json
index 0bf6c56..f5e3e5e 100644
--- a/src/test/resources/docker/initialize/data/create-ci-demo-data.json
+++ b/src/test/resources/docker/initialize/data/create-ci-demo-data.json
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 XEBIALABS
+ * Copyright 2018 XEBIALABS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
  *
diff --git a/src/test/resources/docker/initialize/data/server-configs.json b/src/test/resources/docker/initialize/data/server-configs.json
index 656fb5f..52ab955 100644
--- a/src/test/resources/docker/initialize/data/server-configs.json
+++ b/src/test/resources/docker/initialize/data/server-configs.json
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 XEBIALABS
+ * Copyright 2018 XEBIALABS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
  *
diff --git a/src/test/resources/docker/initialize/initialize_data.sh b/src/test/resources/docker/initialize/initialize_data.sh
index 176722f..9caa14d 100755
--- a/src/test/resources/docker/initialize/initialize_data.sh
+++ b/src/test/resources/docker/initialize/initialize_data.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2017 XEBIALABS
+# Copyright 2018 XEBIALABS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #