diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/EngineSpeedTooHigh/vecto_vehicle-sample_9gears.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/EngineSpeedTooHigh/vecto_vehicle-sample_9gears.xml
index a80e78a55099dcbe72e36923992e9012e1c64bee..98818d2a51e24b8d7d2c7cf5bb64447802fa6a0c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/EngineSpeedTooHigh/vecto_vehicle-sample_9gears.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/EngineSpeedTooHigh/vecto_vehicle-sample_9gears.xml
@@ -24,6 +24,15 @@
 			<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
 			<PTOOtherElements>none</PTOOtherElements>
 		</PTO>
+		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+		<VocationalVehicle>false</VocationalVehicle>
+		<SleeperCab>false</SleeperCab>
+		<ADAS>
+			<EngineStopStart>false</EngineStopStart>
+			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
+		</ADAS>
 		<Components>
 			<Engine>
 				<Data id="ENG-gooZah3D">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser.xml
index cf96de01bd7c267570ea988e9ea83e002fd69fb0..28a2b3c3e3bdc345a6e612b96e441d6780ab2eec 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/CityBus_AT_Ser.xml
@@ -18,6 +18,15 @@
 		<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
 		<PTOOtherElements>none</PTOOtherElements>
 	</PTO>
+    <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+    <VocationalVehicle>false</VocationalVehicle>
+    <SleeperCab>false</SleeperCab>
+    <ADAS>
+      <EngineStopStart>false</EngineStopStart>
+      <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+      <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+      <PredictiveCruiseControl>none</PredictiveCruiseControl>
+    </ADAS>
     <Components>
       <Engine>
         <Data id="ENG-175kW6.8lEngine">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Tractor_4x2_vehicle-class-5_Generic vehicle.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Tractor_4x2_vehicle-class-5_Generic vehicle.xml
index 634a24cbb62a2e16e975759659a5a4970944769e..0737f918d4eb8891d02581b209f89fabb10314af 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Tractor_4x2_vehicle-class-5_Generic vehicle.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/GenericVehicle/Tractor_4x2_vehicle-class-5_Generic vehicle.xml	
@@ -23,6 +23,15 @@
       <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
       <PTOOtherElements>none</PTOOtherElements>
     </PTO>
+    <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+    <VocationalVehicle>false</VocationalVehicle>
+    <SleeperCab>false</SleeperCab>
+    <ADAS>
+      <EngineStopStart>false</EngineStopStart>
+      <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+      <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+      <PredictiveCruiseControl>none</PredictiveCruiseControl>
+    </ADAS>
     <Components>
       <Engine>
         <Data id="ENG-GenericEngine">
diff --git a/VectoCore/VectoCoreTest/TestData/Jobs/Tractor_4x2_vehicle-class-5_Generic vehicle.xml b/VectoCore/VectoCoreTest/TestData/Jobs/Tractor_4x2_vehicle-class-5_Generic vehicle.xml
index 3356681805bc32dd3dc6b96c2db2d7b4f3c2ef5d..f6ae4770fa30836f0caf5a1f7bd30d976412973f 100644
--- a/VectoCore/VectoCoreTest/TestData/Jobs/Tractor_4x2_vehicle-class-5_Generic vehicle.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Jobs/Tractor_4x2_vehicle-class-5_Generic vehicle.xml	
@@ -19,6 +19,15 @@
       <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
       <PTOOtherElements>none</PTOOtherElements>
     </PTO>
+    <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+    <VocationalVehicle>false</VocationalVehicle>
+    <SleeperCab>false</SleeperCab>
+    <ADAS>
+      <EngineStopStart>false</EngineStopStart>
+      <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+      <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+      <PredictiveCruiseControl>none</PredictiveCruiseControl>
+    </ADAS>
     <Components>
       <Engine>
         <Data id="ENG-GenericEngine">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/Tractor_4x2_vehicle-class-5_5_t_0.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/Tractor_4x2_vehicle-class-5_5_t_0.xml
index ce04b525026f38e8b9f9f4587473eb6d1fc231b6..14fa4aaa716a059300457753979ffa92b9420cce 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/Tractor_4x2_vehicle-class-5_5_t_0.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/Tractor_4x2_vehicle-class-5_5_t_0.xml
@@ -19,6 +19,15 @@
       <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
       <PTOOtherElements>none</PTOOtherElements>
     </PTO>
+    <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+    <VocationalVehicle>false</VocationalVehicle>
+    <SleeperCab>false</SleeperCab>
+    <ADAS>
+      <EngineStopStart>false</EngineStopStart>
+      <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+      <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+      <PredictiveCruiseControl>none</PredictiveCruiseControl>
+    </ADAS>
     <Components>
       <Engine>
         <Data id="ENG-350kW_IVT_12l">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample.xml
index e96fe1c8b151dfe2bc26c8140568bf54dc828a0e..56aad96784ed0bd2ff185a79b9132c91784d8efb 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample.xml
@@ -24,6 +24,15 @@
 			<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
 			<PTOOtherElements>none</PTOOtherElements>
 		</PTO>
+		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+		<VocationalVehicle>false</VocationalVehicle>
+		<SleeperCab>false</SleeperCab>
+		<ADAS>
+			<EngineStopStart>false</EngineStopStart>
+			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
+		</ADAS>
 		<Components>
 			<Engine>
 				<Data id="ENG-gooZah3D">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_AT.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_AT.xml
index 7f5e85d08ac6ae772f08a6fb0f701c164e88a6c4..702947e038f9b38abeff8186712817288a266d77 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_AT.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_AT.xml
@@ -18,6 +18,15 @@
 			<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
 			<PTOOtherElements>none</PTOOtherElements>
 		</PTO>
+		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+		<VocationalVehicle>false</VocationalVehicle>
+		<SleeperCab>false</SleeperCab>
+		<ADAS>
+			<EngineStopStart>false</EngineStopStart>
+			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
+		</ADAS>
 		<Components>
 			<Engine>
 				<Data id="ENG-Generic220kW7.7lEngine">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL.xml
index c59b865a3367ac5148f33ea799c250ee1bc32251..98ecc6a0e1dc43894389ab5d1f0dba3a1d4f0ade 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL.xml
@@ -24,6 +24,15 @@
 			<PTOShaftsGearWheels>only the drive shaft of the PTO</PTOShaftsGearWheels>
 			<PTOOtherElements>multi-disc clutch</PTOOtherElements>
 		</PTO>
+		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+		<VocationalVehicle>false</VocationalVehicle>
+		<SleeperCab>false</SleeperCab>
+		<ADAS>
+			<EngineStopStart>false</EngineStopStart>
+			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
+		</ADAS>
 		<TorqueLimits>
 			<Entry gear="6" maxTorque="1800" />
 			<Entry gear="1" maxTorque="2500" />
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_certificationOptions.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_certificationOptions.xml
index 1e4fd4c089675d27533a99e67aa190c2303031cd..6cc98897c7daa5b4ea15cad83fa7bfd3237f348e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_certificationOptions.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_certificationOptions.xml
@@ -24,6 +24,15 @@
 			<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
 			<PTOOtherElements>none</PTOOtherElements>
 		</PTO>
+		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+		<VocationalVehicle>false</VocationalVehicle>
+		<SleeperCab>false</SleeperCab>
+		<ADAS>
+			<EngineStopStart>false</EngineStopStart>
+			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
+		</ADAS>
 		<Components>
 			<Engine>
 				<Data id="ENG-gooZah3D">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_noAirdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_noAirdrag.xml
index db13b8c5b1d9c9421796ec0926a2fb9fec1ac936..cd2eb30df69e9b7cb1b40183bfb5317f50538877 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_noAirdrag.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_noAirdrag.xml
@@ -24,6 +24,15 @@
 			<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
 			<PTOOtherElements>none</PTOOtherElements>
 		</PTO>
+		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+		<VocationalVehicle>false</VocationalVehicle>
+		<SleeperCab>false</SleeperCab>
+		<ADAS>
+			<EngineStopStart>false</EngineStopStart>
+			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
+		</ADAS>
 		<Components>
 			<Engine>
 				<Data id="ENG-gooZah3D">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_torqueLimits.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_torqueLimits.xml
index 7461745d95221d9289536c66b4e77ae218498d26..09f860af295d433375a2dc507ca8abcf76ff8b5b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_torqueLimits.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_torqueLimits.xml
@@ -24,10 +24,19 @@
 			<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
 			<PTOOtherElements>none</PTOOtherElements>
 		</PTO>
+		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+		<VocationalVehicle>false</VocationalVehicle>
+		<SleeperCab>false</SleeperCab>
+		<ADAS>
+			<EngineStopStart>false</EngineStopStart>
+			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
+		</ADAS>
 		<TorqueLimits>
 			<Entry gear="1" maxTorque="2000"/>
 			<Entry gear="2" maxTorque="2000"/>
-      <Entry gear="11" maxTorque="2000"/>
+			<Entry gear="11" maxTorque="2000"/>
 			<Entry gear="12" maxTorque="1500"/>
 		</TorqueLimits>
 		<Components>