diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/12t Truck/12t Delivery Truck.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/12t Truck/12t Delivery Truck.vecto
index 92c360e6589c62c96aeca7e9b085484ddb2237d4..98a0b4567ca37e2278cd7c8bc5739bc591beb7de 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/12t Truck/12t Delivery Truck.vecto	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/12t Truck/12t Delivery Truck.vecto	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
-    "Date": "24.06.2015 12:03:58",
-    "AppVersion": "2.2 beta",
-    "FileVersion": 2
+    "CreatedBy": "Michael Krisper, IVT, Graz University of Technology",
+    "Date": "2016-08-10T14:14:07.6435917Z",
+    "AppVersion": "2.2",
+    "FileVersion": 3
   },
   "Body": {
     "SavedInDeclMode": true,
@@ -15,43 +15,53 @@
       "Regional Delivery",
       "Urban Delivery"
     ],
+    "AuxiliaryAssembly": "CLASSIC",
+    "AuxiliaryVersion": "CLASSIC",
+    "AdvancedAuxiliaryFilePath": "",
     "Aux": [
       {
         "ID": "FAN",
         "Type": "Fan",
         "Path": "<NOFILE>",
-        "Technology": "Belt driven or driven via transm. - Discrete step clutch"
+        "Technology": [
+          "Crankshaft mounted - Discrete step clutch"
+        ]
       },
       {
         "ID": "STP",
         "Type": "Steering pump",
         "Path": "<NOFILE>",
-        "Technology": "Variable displacement"
+        "Technology": [
+          "Fixed displacement"
+        ]
       },
       {
         "ID": "AC",
         "Type": "HVAC",
         "Path": "<NOFILE>",
-        "Technology": "Default"
+        "Technology": []
       },
       {
         "ID": "ES",
         "Type": "Electric System",
         "Path": "<NOFILE>",
-        "Technology": "Custom Technology List",
-        "TechList": []
+        "Technology": [
+          "Standard technology"
+        ]
       },
       {
         "ID": "PS",
         "Type": "Pneumatic System",
         "Path": "<NOFILE>",
-        "Technology": "Default"
+        "Technology": [
+          "Medium Supply 1-stage"
+        ]
       }
     ],
     "VACC": "<NOFILE>",
     "EngineOnlyMode": false,
     "StartStop": {
-      "Enabled": false,
+      "Enabled": true,
       "MaxSpeed": 5.0,
       "MinTime": 5.0,
       "Delay": 5
@@ -59,7 +69,12 @@
     "LAC": {
       "Enabled": true,
       "Dec": -0.5,
-      "MinSpeed": 50.0
+      "MinSpeed": 50.0,
+      "PreviewDistanceFactor": 10.0,
+      "DF_offset": 2.5,
+      "DF_scaling": 1.5,
+      "DF_targetSpeedLookup": "",
+      "Df_velocityDropLookup": ""
     },
     "OverSpeedEcoRoll": {
       "Mode": "OverSpeed",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/12t Truck/12t Delivery Truck_8gear.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/12t Truck/12t Delivery Truck_8gear.vecto
index 12d66a1b5e1f1db9d743b93c2517ddb17a7c2ffe..077d7671cb00ff8472b734e1ba1b3f26cce8a2ea 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/12t Truck/12t Delivery Truck_8gear.vecto	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/12t Truck/12t Delivery Truck_8gear.vecto	
@@ -3,7 +3,7 @@
     "CreatedBy": " ()",
     "Date": "03.05.2016 17:05:59",
     "AppVersion": "2.2",
-    "FileVersion": 2
+    "FileVersion": 3
   },
   "Body": {
     "SavedInDeclMode": true,
@@ -19,36 +19,43 @@
     "AuxiliaryVersion": "CLASSIC",
     "AdvancedAuxiliaryFilePath": "",
     "Aux": [
-      {
+{
         "ID": "FAN",
         "Type": "Fan",
         "Path": "<NOFILE>",
-        "Technology": "Crankshaft mounted - Discrete step clutch"
+        "Technology": [
+          "Crankshaft mounted - Discrete step clutch"
+        ]
       },
       {
         "ID": "STP",
         "Type": "Steering pump",
         "Path": "<NOFILE>",
-        "Technology": "Fixed displacement"
+        "Technology": [
+          "Fixed displacement"
+        ]
       },
       {
         "ID": "AC",
         "Type": "HVAC",
         "Path": "<NOFILE>",
-        "Technology": ""
+        "Technology": []
       },
       {
         "ID": "ES",
         "Type": "Electric System",
         "Path": "<NOFILE>",
-        "Technology": "",
-        "TechList": []
+        "Technology": [
+          "Standard technology"
+        ]
       },
       {
         "ID": "PS",
         "Type": "Pneumatic System",
         "Path": "<NOFILE>",
-        "Technology": ""
+        "Technology": [
+          "Medium Supply 1-stage"
+        ]
       }
     ],
     "VACC": "<NOFILE>",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vecto
index 4533c8fd2cdcf3710ede7926bbc2427dbb2d1dc2..8f3b4121026022d6b19b0b56e69d30172b71c1f4 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vecto	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vecto	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "10/6/2015 3:19:54 PM",
+    "CreatedBy": "Michael Krisper, IVT, Graz University of Technology",
+    "Date": "2016-08-10T15:11:16.3665917Z",
     "AppVersion": "2.2",
-    "FileVersion": 2
+    "FileVersion": 3
   },
   "Body": {
     "SavedInDeclMode": true,
@@ -14,37 +14,47 @@
       "Long Haul",
       "Regional Delivery"
     ],
+    "AuxiliaryAssembly": "CLASSIC",
+    "AuxiliaryVersion": "CLASSIC",
+    "AdvancedAuxiliaryFilePath": "",
     "Aux": [
       {
         "ID": "FAN",
         "Type": "Fan",
         "Path": "<NOFILE>",
-        "Technology": "Hydraulic driven - Constant displacement pump"
+        "Technology": [
+          "Hydraulic driven - Constant displacement pump"
+        ]
       },
       {
         "ID": "STP",
         "Type": "Steering pump",
         "Path": "<NOFILE>",
-        "Technology": "Variable displacement"
+        "Technology": [
+          "Fixed displacement"
+        ]
       },
       {
         "ID": "AC",
         "Type": "HVAC",
         "Path": "<NOFILE>",
-        "Technology": "Default"
+        "Technology": []
       },
       {
         "ID": "ES",
         "Type": "Electric System",
         "Path": "<NOFILE>",
-        "Technology": "Custom Technology List",
-        "TechList": []
+        "Technology": [
+          "Standard technology"
+        ]
       },
       {
         "ID": "PS",
         "Type": "Pneumatic System",
         "Path": "<NOFILE>",
-        "Technology": "Default"
+        "Technology": [
+          "Medium Supply 1-stage"
+        ]
       }
     ],
     "VACC": "<NOFILE>",
@@ -58,7 +68,12 @@
     "LAC": {
       "Enabled": true,
       "Dec": -0.5,
-      "MinSpeed": 50.0
+      "MinSpeed": 50.0,
+      "PreviewDistanceFactor": 10.0,
+      "DF_offset": 2.5,
+      "DF_scaling": 1.5,
+      "DF_targetSpeedLookup": "",
+      "Df_velocityDropLookup": ""
     },
     "OverSpeedEcoRoll": {
       "Mode": "OverSpeed",