diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel_WHR.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel_WHR.xml
index 91bab9b4360305bb441c96c280422a7418060686..3ad971998907d9cf2fdf3eaa20a74a0651a76543 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel_WHR.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel_WHR.xml
@@ -5,7 +5,7 @@
 	xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
 	xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
 	xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
-	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3_DF"
+	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3_DF"
 	xmlns:di="http://www.w3.org/2000/09/xmldsig#"
 	xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_FurtherDev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
 	>
@@ -35,7 +35,7 @@
 		</TorqueLimits>
 		<Components xsi:type="VehicleComponentsType">
 			<Engine>
-				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3_DF">
+				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3_DF">
 					<Manufacturer>Generic Engine Manufacturer</Manufacturer>
 					<Model>Generic 40t Long Haul Truck Engine</Model>
 					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -45,7 +45,11 @@
 					<RatedSpeed>2200</RatedSpeed>
 					<RatedPower>380000</RatedPower>
 					<MaxEngineTorque>2300</MaxEngineTorque>
-					<WHRType>electrical only</WHRType>
+					<WHRType>
+						<MechanicalOutputICE>false</MechanicalOutputICE>
+						<MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+						<ElectricalOutput>true</ElectricalOutput>
+					</WHRType>
 					<Mode>
 						<IdlingSpeed>560</IdlingSpeed>
 						<FullLoadAndDragCurve>
@@ -68,11 +72,13 @@
 							<CFRegPer>1.0000</CFRegPer>
 							<CFNCV>1.0000</CFNCV>
 							<WHRCorrectionFactors>
+							<Electrical>
 								<Urban>1.0097</Urban>
 								<Rural>1.0000</Rural>
 								<Motorway>1.0000</Motorway>
 								<BFColdHot>1.0000</BFColdHot>
 								<CFRegPer>1.0000</CFRegPer>
+							</Electrical>
 							</WHRCorrectionFactors>
 							<FuelConsumptionMap>
 								<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"  electricPower="200.00" />
@@ -334,11 +340,13 @@
 							<CFRegPer>1.0000</CFRegPer>
 							<CFNCV>1.0000</CFNCV>
 							<WHRCorrectionFactors>
-								<Urban>1.0097</Urban>
-								<Rural>1.0000</Rural>
-								<Motorway>1.0000</Motorway>
-								<BFColdHot>1.0000</BFColdHot>
-								<CFRegPer>1.0000</CFRegPer>
+								<Electrical>
+									<Urban>1.0097</Urban>
+									<Rural>1.0000</Rural>
+									<Motorway>1.0000</Motorway>
+									<BFColdHot>1.0000</BFColdHot>
+									<CFRegPer>1.0000</CFRegPer>
+								</Electrical>
 							</WHRCorrectionFactors>
 							<FuelConsumptionMap>
 								<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"  electricPower="200.00" />
@@ -477,7 +485,7 @@
 					<AppVersion>3.0.1</AppVersion>
 					<TransmissionType>AMT</TransmissionType>
 					<MainCertificationMethod>Standard values</MainCertificationMethod>
-					<Gears>
+					<Gears xsi:type="GearsDeclarationType">
 						<Gear number="1">
 							<Ratio>14.930</Ratio>
 							<MaxTorque>1900</MaxTorque>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel_WHR.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel_WHR.xml
index 367ef3e98e8d94fa1efd01f5378efd69a4ac7a38..3c2063351b71ac6407320d44f028eade6402121b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel_WHR.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel_WHR.xml
@@ -5,7 +5,7 @@
 	xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
 	xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
 	xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
-	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3_DF"
+	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3_DF"
 	xmlns:di="http://www.w3.org/2000/09/xmldsig#"
 	xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_FurtherDev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
 	>
@@ -35,7 +35,7 @@
 		</TorqueLimits>
 		<Components xsi:type="VehicleComponentsType">
 			<Engine>
-				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3_DF">
+				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3_DF">
 					<Manufacturer>Generic Engine Manufacturer</Manufacturer>
 					<Model>Generic 40t Long Haul Truck Engine</Model>
 					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -45,7 +45,11 @@
 					<RatedSpeed>2200</RatedSpeed>
 					<RatedPower>380000</RatedPower>
 					<MaxEngineTorque>2300</MaxEngineTorque>
-					<WHRType>electrical only</WHRType>
+					<WHRType>
+						<MechanicalOutputICE>false</MechanicalOutputICE>
+						<MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+						<ElectricalOutput>true</ElectricalOutput>
+					</WHRType>
 					<Mode>
 						<IdlingSpeed>560</IdlingSpeed>
 						<FullLoadAndDragCurve>
@@ -68,11 +72,13 @@
 							<CFRegPer>1.0000</CFRegPer>
 							<CFNCV>1.0000</CFNCV>
 							<WHRCorrectionFactors>
-								<Urban>1.0097</Urban>
-								<Rural>1.0000</Rural>
-								<Motorway>1.0000</Motorway>
-								<BFColdHot>1.0000</BFColdHot>
-								<CFRegPer>1.0000</CFRegPer>
+								<Electrical>
+									<Urban>1.0097</Urban>
+									<Rural>1.0000</Rural>
+									<Motorway>1.0000</Motorway>
+									<BFColdHot>1.0000</BFColdHot>
+									<CFRegPer>1.0000</CFRegPer>
+								</Electrical>
 							</WHRCorrectionFactors>
 							<FuelConsumptionMap>
 								<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"  electricPower="200.00" />
@@ -333,7 +339,7 @@
 					<AppVersion>3.0.1</AppVersion>
 					<TransmissionType>AMT</TransmissionType>
 					<MainCertificationMethod>Standard values</MainCertificationMethod>
-					<Gears>
+					<Gears xsi:type="GearsDeclarationType">
 						<Gear number="1">
 							<Ratio>14.930</Ratio>
 							<MaxTorque>1900</MaxTorque>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeSingleFuel_WHR.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeSingleFuel_WHR.xml
index 208680fe555f1e1a3ecca474a92c9b7956955e6d..6c3c2e6a0ad675c4373303c597dd5b9e0658b9d9 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeSingleFuel_WHR.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeSingleFuel_WHR.xml
@@ -6,7 +6,7 @@
 	xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
 	xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
 	xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
-	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3_DF"
+	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3_DF"
 	xmlns:di="http://www.w3.org/2000/09/xmldsig#"
 	xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_FurtherDev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
 	>
@@ -45,7 +45,7 @@
 		</v2.1:TorqueLimits>
 		<Components xsi:type="v2.0:VehicleComponentsType">
 			<Engine xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="EngineComponentDeclarationType">
-				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3_DF">
+				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3_DF">
 					<Manufacturer>Generic Engine Manufacturer</Manufacturer>
 					<Model>Generic 40t Long Haul Truck Engine</Model>
 					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -55,7 +55,11 @@
 					<RatedSpeed>2200</RatedSpeed>
 					<RatedPower>380000</RatedPower>
 					<MaxEngineTorque>2300</MaxEngineTorque>
-					<WHRType>electrical only</WHRType>
+					<WHRType>
+						<MechanicalOutputICE>false</MechanicalOutputICE>
+						<MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+						<ElectricalOutput>true</ElectricalOutput>
+					</WHRType>
 					<Mode>
 						<IdlingSpeed>560</IdlingSpeed>
 						<FullLoadAndDragCurve>
@@ -78,11 +82,13 @@
 							<CFRegPer>1.0000</CFRegPer>
 							<CFNCV>1.0000</CFNCV>
 							<WHRCorrectionFactors>
+							<Electrical>
 								<Urban>1.0097</Urban>
 								<Rural>1.0000</Rural>
 								<Motorway>1.0000</Motorway>
 								<BFColdHot>1.0000</BFColdHot>
 								<CFRegPer>1.0000</CFRegPer>
+							</Electrical>
 							</WHRCorrectionFactors>
 							<FuelConsumptionMap>
 								<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"  electricPower="200.00" />
@@ -221,7 +227,7 @@
 					<AppVersion>3.0.1</AppVersion>
 					<TransmissionType>AMT</TransmissionType>
 					<MainCertificationMethod>Standard values</MainCertificationMethod>
-					<Gears>
+					<Gears xsi:type="GearsDeclarationType">
 						<Gear number="1">
 							<Ratio>14.930</Ratio>
 							<MaxTorque>1900</MaxTorque>