diff --git a/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh b/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh
index 5227ba879ee3b235a6d511298d39dec27cf8b68c..6179011253332280b3e7654152587e72e0478675 100644
--- a/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh	
+++ b/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh	
@@ -1,7 +1,7 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T10:06:43.0936564Z",
+    "CreatedBy": "",
+    "Date": "2017-06-22T11:15:06.0747543Z",
     "AppVersion": "3",
     "FileVersion": 7
   },
@@ -12,7 +12,6 @@
     "CurbWeightExtra": 0.0,
     "Loading": 0.0,
     "MassMax": 11.99,
-    "CdA": 4.83,
     "rdyn": 0.0,
     "CdCorrMode": "CdofVdecl",
     "CdCorrFile": "",
@@ -31,6 +30,8 @@
       "LossMap": "",
       "Cycle": ""
     },
+    "TorqueLimits": {},
+    "IdlingSpeed": 600.0,
     "AxleConfig": {
       "Type": "4x2",
       "Axles": [
@@ -40,7 +41,8 @@
           "AxleWeightShare": 0.0,
           "TwinTyres": false,
           "RRCISO": 0.0065,
-          "FzISO": 20850.0
+          "FzISO": 20850.0,
+          "Type": "VehicleNonDriven"
         },
         {
           "Inertia": 6.5,
@@ -48,9 +50,11 @@
           "AxleWeightShare": 0.0,
           "TwinTyres": true,
           "RRCISO": 0.0075,
-          "FzISO": 20850.0
+          "FzISO": 20850.0,
+          "Type": "VehicleDriven"
         }
       ]
-    }
+    },
+    "CdA": 4.83
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Engine_175kW_6.8l.veng b/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Engine_175kW_6.8l.veng
index 0f15f912ab82372c2d896b8af8f2b0e57b062d96..f5b2fd42395e000fc6a8fb8b100d2e9a31bddebd 100644
--- a/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Engine_175kW_6.8l.veng	
+++ b/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Engine_175kW_6.8l.veng	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T10:06:50.6286564Z",
+    "CreatedBy": "",
+    "Date": "2017-06-22T11:14:49.3067543Z",
     "AppVersion": "3",
-    "FileVersion": 3
+    "FileVersion": 4
   },
   "Body": {
     "SavedInDeclMode": true,
@@ -11,11 +11,18 @@
     "Displacement": "6871",
     "IdlingSpeed": 600.0,
     "Inertia": 3.56517,
-    "FullLoadCurve": "175kW.vfld",
-    "FuelMap": "175kW.vmap",
     "WHTC-Urban": 1.04,
     "WHTC-Rural": 1.01,
-    "WHTC-Motorway": 1.00,
-    "ColdHotBalancingFactor": 1.0
+    "WHTC-Motorway": 1.0,
+    "WHTC-Engineering": 1.0,
+    "ColdHotBalancingFactor": 1.0,
+    "CFRegPer": 1.0,
+    "CFNCV": 1.0,
+    "RatedPower": 175000.0,
+    "RatedSpeed": 1950.0000000000002,
+    "MaxTorque": 1000.0,
+    "FuelType": 0,
+    "FullLoadCurve": "175kW.vfld",
+    "FuelMap": "175kW.vmap"
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Class5_Tractor.vveh b/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Class5_Tractor.vveh
index 9853ba577c00dcdc3d168754d5111d8dcaa3b5af..69fe6f0b805c94258cbf487159a0ecb6c7703994 100644
--- a/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Class5_Tractor.vveh	
+++ b/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Class5_Tractor.vveh	
@@ -1,7 +1,7 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T10:08:01.8366564Z",
+    "CreatedBy": "",
+    "Date": "2017-06-22T11:14:19.0107543Z",
     "AppVersion": "3",
     "FileVersion": 7
   },
@@ -12,7 +12,6 @@
     "CurbWeightExtra": 0.0,
     "Loading": 0.0,
     "MassMax": 18.0,
-    "CdA": 5.3,
     "rdyn": 0.0,
     "CdCorrMode": "CdofVdecl",
     "CdCorrFile": "",
@@ -31,6 +30,8 @@
       "LossMap": "",
       "Cycle": ""
     },
+    "TorqueLimits": {},
+    "IdlingSpeed": 600.0,
     "AxleConfig": {
       "Type": "4x2",
       "Axles": [
@@ -40,7 +41,8 @@
           "AxleWeightShare": 0.0,
           "TwinTyres": false,
           "RRCISO": 0.0055,
-          "FzISO": 33350.0
+          "FzISO": 33350.0,
+          "Type": "VehicleNonDriven"
         },
         {
           "Inertia": 14.9,
@@ -48,9 +50,11 @@
           "AxleWeightShare": 0.0,
           "TwinTyres": true,
           "RRCISO": 0.0065,
-          "FzISO": 33350.0
+          "FzISO": 33350.0,
+          "Type": "VehicleDriven"
         }
       ]
-    }
+    },
+    "CdA": 5.3
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng b/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng
index 4bdfc0cdfcdcc4fd2b19f656c1e37cad41fa648d..34912295216a6a4671cb3094b4f1d593ca74f6e0 100644
--- a/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng	
+++ b/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T10:08:08.3476564Z",
+    "CreatedBy": "",
+    "Date": "2017-06-22T11:14:03.7167543Z",
     "AppVersion": "3",
-    "FileVersion": 3
+    "FileVersion": 4
   },
   "Body": {
     "SavedInDeclMode": true,
@@ -11,11 +11,18 @@
     "Displacement": "12740",
     "IdlingSpeed": 600.0,
     "Inertia": 5.1498,
-    "FullLoadCurve": "325kW.vfld",
-    "FuelMap": "325kW.vmap",
     "WHTC-Urban": 1.04,
     "WHTC-Rural": 1.01,
-    "WHTC-Motorway": 1.00,
-    "ColdHotBalancingFactor": 1.0
+    "WHTC-Motorway": 1.0,
+    "WHTC-Engineering": 1.0,
+    "ColdHotBalancingFactor": 1.0,
+    "CFRegPer": 1.0,
+    "CFNCV": 1.0,
+    "RatedPower": 325000.0,
+    "RatedSpeed": 1600.0,
+    "MaxTorque": 2400.0,
+    "FuelType": 0,
+    "FullLoadCurve": "325kW.vfld",
+    "FuelMap": "325kW.vmap"
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh
index b72b915743e0e3b45da5379eb3ffcfc9fa7e0c86..d2a3b50e5b25192b95786e2a5f5f36c21ef45db0 100644
--- a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh	
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh	
@@ -1,7 +1,7 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2017-05-19T08:36:54.5380903Z",
+    "CreatedBy": "",
+    "Date": "2017-06-22T11:16:11.6047543Z",
     "AppVersion": "3",
     "FileVersion": 7
   },
@@ -12,7 +12,6 @@
     "CurbWeightExtra": 0.0,
     "Loading": 0.0,
     "MassMax": 26.0,
-    "CdA": 5.2,
     "rdyn": 0.0,
     "CdCorrMode": "CdofVdecl",
     "CdCorrFile": "",
@@ -32,6 +31,7 @@
       "Cycle": ""
     },
     "TorqueLimits": {},
+    "IdlingSpeed": 600.0,
     "AxleConfig": {
       "Type": "6x2",
       "Axles": [
@@ -41,7 +41,8 @@
           "AxleWeightShare": 0.0,
           "TwinTyres": false,
           "RRCISO": 0.0055,
-          "FzISO": 33350.0
+          "FzISO": 33350.0,
+          "Type": "VehicleNonDriven"
         },
         {
           "Inertia": 14.9,
@@ -49,7 +50,8 @@
           "AxleWeightShare": 0.0,
           "TwinTyres": true,
           "RRCISO": 0.0055,
-          "FzISO": 33350.0
+          "FzISO": 33350.0,
+          "Type": "VehicleDriven"
         },
         {
           "Inertia": 14.9,
@@ -57,9 +59,11 @@
           "AxleWeightShare": 0.0,
           "TwinTyres": false,
           "RRCISO": 0.0055,
-          "FzISO": 33350.0
+          "FzISO": 33350.0,
+          "Type": "VehicleNonDriven"
         }
       ]
-    }
+    },
+    "CdA": 5.2
   }
 }
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng
index 9c995ff80fd7f9212a3f0e162b74a3f2fcd27894..268260fcd305c7db013a66502a1495d1d76d5ec7 100644
--- a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng	
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng	
@@ -1,9 +1,9 @@
 {
   "Header": {
-    "CreatedBy": " ()",
-    "Date": "2017-05-19T08:13:02.2025457Z",
+    "CreatedBy": "",
+    "Date": "2017-06-22T11:15:58.5117543Z",
     "AppVersion": "3",
-    "FileVersion": 3
+    "FileVersion": 4
   },
   "Body": {
     "SavedInDeclMode": true,
@@ -11,12 +11,18 @@
     "Displacement": "7000",
     "IdlingSpeed": 600.0,
     "Inertia": 3.6,
-    "FullLoadCurve": "324kW.vfld",
-    "FuelMap": "350kW.vmap",
     "WHTC-Urban": 1.0,
     "WHTC-Rural": 1.0,
     "WHTC-Motorway": 1.0,
     "WHTC-Engineering": 1.0,
-    "ColdHotBalancingFactor": 1.0
+    "ColdHotBalancingFactor": 1.0,
+    "CFRegPer": 1.0,
+    "CFNCV": 1.0,
+    "RatedPower": 324000.0,
+    "RatedSpeed": 1600.0,
+    "MaxTorque": 2300.0,
+    "FuelType": 0,
+    "FullLoadCurve": "324kW.vfld",
+    "FuelMap": "350kW.vmap"
   }
 }
\ No newline at end of file