diff --git a/force_bdss/io/tests/test_workflow_writer.py b/force_bdss/io/tests/test_workflow_writer.py
index 74a8dbf90ff1b776f1bccbc9f40a73462a1d16cf..f7a0ccc9cbdc31606b8ab323eb0ac3a8de76c94e 100644
--- a/force_bdss/io/tests/test_workflow_writer.py
+++ b/force_bdss/io/tests/test_workflow_writer.py
@@ -45,7 +45,7 @@ class TestWorkflowWriter(unittest.TestCase):
         self.assertIn("version", result)
         self.assertIn("workflow", result)
         self.assertIn("mco", result["workflow"])
-        self.assertIn("data_sources", result["workflow"])
+        self.assertIn("execution_layers", result["workflow"])
         self.assertIn("kpi_calculators", result["workflow"])
 
     def test_write_and_read(self):
diff --git a/force_bdss/io/workflow_reader.py b/force_bdss/io/workflow_reader.py
index 09be4f0937bdcf8280ca4c788076b1d28a0e64e6..4f0ce4a06f3b67ef57a795c7e1214e27199a3f75 100644
--- a/force_bdss/io/workflow_reader.py
+++ b/force_bdss/io/workflow_reader.py
@@ -9,7 +9,7 @@ from ..factory_registry_plugin import IFactoryRegistryPlugin
 
 log = logging.getLogger(__name__)
 
-SUPPORTED_FILE_VERSIONS = ["1", "2"]
+SUPPORTED_FILE_VERSIONS = ["1"]
 
 
 class InvalidFileException(Exception):
diff --git a/force_bdss/tests/fixtures/test_empty.json b/force_bdss/tests/fixtures/test_empty.json
index 4984d568725e4fca080c28f36d2fc9bf72bf1cca..00c6b2f2c28e9e39c2fad25d947c2b0cf13c5d38 100644
--- a/force_bdss/tests/fixtures/test_empty.json
+++ b/force_bdss/tests/fixtures/test_empty.json
@@ -2,7 +2,7 @@
   "version": "1",
   "workflow": {
     "mco": null,
-    "data_sources": [
+    "execution_layers": [
     ],
     "kpi_calculators": [
     ],
diff --git a/force_bdss/tests/fixtures/test_null.json b/force_bdss/tests/fixtures/test_null.json
index 8a0a016aed40e63b7ae68981e7a89bf39ec1867a..409716123f2fc8280ff5fd17b7b83b0316aabd1d 100644
--- a/force_bdss/tests/fixtures/test_null.json
+++ b/force_bdss/tests/fixtures/test_null.json
@@ -8,16 +8,18 @@
         ]
       }
     },
-    "data_sources": [
-      {
-        "id": "force.bdss.enthought.factory.test_ds",
-        "model_data": {
-          "input_slot_maps": [
-          ],
-          "output_slot_names": [
-          ]
+    "execution_layers": [
+      [
+        {
+          "id": "force.bdss.enthought.factory.test_ds",
+          "model_data": {
+            "input_slot_maps": [
+            ],
+            "output_slot_names": [
+            ]
+          }
         }
-      }
+      ]
     ],
     "kpi_calculators": [
       {