diff --git a/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_4x2_vehicle-class-5_EURO6_2018_DF.xml b/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_4x2_vehicle-class-5_EURO6_2018_DF.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7c66a8cb6981296a381bc92761ececfaaf2e378e
--- /dev/null
+++ b/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_4x2_vehicle-class-5_EURO6_2018_DF.xml
@@ -0,0 +1,701 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 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.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.2.0.xsd">
+	<v2.0:Vehicle id="VEH-Class5_df" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+		<Manufacturer>Generic Vendor</Manufacturer>
+		<ManufacturerAddress>N.A.</ManufacturerAddress>
+		<Model>N.A.</Model>
+		<VIN>N/A</VIN>
+		<Date>2017-07-06T15:06:08.3093609Z</Date>
+		<LegislativeClass>N3</LegislativeClass>
+		<VehicleCategory>Tractor</VehicleCategory>
+		<AxleConfiguration>4x2</AxleConfiguration>
+		<CurbMassChassis>8229</CurbMassChassis>
+		<GrossVehicleMass>18000</GrossVehicleMass>
+		<IdlingSpeed>600</IdlingSpeed>
+		<RetarderType>Transmission Output Retarder</RetarderType>
+		<RetarderRatio>1.000</RetarderRatio>
+		<AngledriveType>None</AngledriveType>
+		<v2.1:PTO xsi:type="PTOType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+			<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+			<PTOOtherElements>none</PTOOtherElements>
+		</v2.1:PTO>
+		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+		<VocationalVehicle>false</VocationalVehicle>
+		<NgTankSystem>Liquefied</NgTankSystem>
+		<SleeperCab>false</SleeperCab>
+		<ADAS xsi:type="AdvancedDriverAssistantSystemsType">
+			<EngineStopStart>false</EngineStopStart>
+			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
+		</ADAS>
+		<v2.1:Components xsi:type="VehicleComponentsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+			<Engine>
+				<v2.0:Data id="ENG-N.A." xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+					<Manufacturer>Generic Vendor</Manufacturer>
+					<Model>N.A.</Model>
+					<CertificationNumber>ENG-N.A.</CertificationNumber>
+					<Date>2017-07-06T15:06:08.3103609Z</Date>
+					<AppVersion>VectoCore</AppVersion>
+					<Displacement>12740</Displacement>
+					<RatedSpeed>1736</RatedSpeed>
+					<RatedPower>325032</RatedPower>
+					<MaxEngineTorque>2134</MaxEngineTorque>
+					<WHRType>
+						<MechanicalOutputICE>false</MechanicalOutputICE>
+						<MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+						<ElectricalOutput>false</ElectricalOutput>
+					</WHRType>
+					<Mode>
+						<IdlingSpeed>600</IdlingSpeed>
+						<FullLoadAndDragCurve>
+							<Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00"/>
+							<Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00"/>
+							<Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00"/>
+							<Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00"/>
+							<Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00"/>
+							<Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00"/>
+							<Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00"/>
+							<Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00"/>
+							<Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00"/>
+							<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00"/>
+						</FullLoadAndDragCurve>
+						<Fuel type="NG CI">
+							<WHTCUrban>1.0000</WHTCUrban>
+							<WHTCRural>1.0000</WHTCRural>
+							<WHTCMotorway>1.0000</WHTCMotorway>
+							<BFColdHot>1.0000</BFColdHot>
+							<CFRegPer>1.0000</CFRegPer>
+							<CFNCV>1.0000</CFNCV>
+							<FuelConsumptionMap>
+								<Entry engineSpeed="600.00" torque="-139.00" fuelConsumption="0.00"/>
+								<Entry engineSpeed="600.00" torque="0.00" fuelConsumption="1355.00"/>
+								<Entry engineSpeed="600.00" torque="186.00" fuelConsumption="3118.00"/>
+								<Entry engineSpeed="600.00" torque="371.00" fuelConsumption="5105.00"/>
+								<Entry engineSpeed="600.00" torque="557.00" fuelConsumption="7522.00"/>
+								<Entry engineSpeed="600.00" torque="743.00" fuelConsumption="9298.00"/>
+								<Entry engineSpeed="600.00" torque="928.00" fuelConsumption="11208.00"/>
+								<Entry engineSpeed="600.00" torque="1114.00" fuelConsumption="13370.00"/>
+								<Entry engineSpeed="600.00" torque="1190.00" fuelConsumption="14252.00"/>
+								<Entry engineSpeed="800.00" torque="-144.00" fuelConsumption="0.00"/>
+								<Entry engineSpeed="800.00" torque="0.00" fuelConsumption="1745.00"/>
+								<Entry engineSpeed="800.00" torque="186.00" fuelConsumption="3979.00"/>
+								<Entry engineSpeed="800.00" torque="371.00" fuelConsumption="6824.00"/>
+								<Entry engineSpeed="800.00" torque="557.00" fuelConsumption="9340.00"/>
+								<Entry engineSpeed="800.00" torque="743.00" fuelConsumption="12150.00"/>
+								<Entry engineSpeed="800.00" torque="928.00" fuelConsumption="14870.00"/>
+								<Entry engineSpeed="800.00" torque="1114.00" fuelConsumption="17863.00"/>
+								<Entry engineSpeed="800.00" torque="1300.00" fuelConsumption="20822.00"/>
+								<Entry engineSpeed="800.00" torque="1486.00" fuelConsumption="23769.00"/>
+								<Entry engineSpeed="800.00" torque="1663.00" fuelConsumption="26838.00"/>
+								<Entry engineSpeed="1000.00" torque="-153.00" fuelConsumption="0.00"/>
+								<Entry engineSpeed="1000.00" torque="0.00" fuelConsumption="2660.00"/>
+								<Entry engineSpeed="1000.00" torque="186.00" fuelConsumption="5536.00"/>
+								<Entry engineSpeed="1000.00" torque="371.00" fuelConsumption="8540.00"/>
+								<Entry engineSpeed="1000.00" torque="557.00" fuelConsumption="11470.00"/>
+								<Entry engineSpeed="1000.00" torque="743.00" fuelConsumption="14823.00"/>
+								<Entry engineSpeed="1000.00" torque="928.00" fuelConsumption="18443.00"/>
+								<Entry engineSpeed="1000.00" torque="1114.00" fuelConsumption="21847.00"/>
+								<Entry engineSpeed="1000.00" torque="1300.00" fuelConsumption="25256.00"/>
+								<Entry engineSpeed="1000.00" torque="1486.00" fuelConsumption="28936.00"/>
+								<Entry engineSpeed="1000.00" torque="1671.00" fuelConsumption="32592.00"/>
+								<Entry engineSpeed="1000.00" torque="1857.00" fuelConsumption="36545.00"/>
+								<Entry engineSpeed="1000.00" torque="2043.00" fuelConsumption="40964.00"/>
+								<Entry engineSpeed="1000.00" torque="2135.00" fuelConsumption="43486.00"/>
+								<Entry engineSpeed="1200.00" torque="-166.00" fuelConsumption="0.00"/>
+								<Entry engineSpeed="1200.00" torque="0.00" fuelConsumption="3070.00"/>
+								<Entry engineSpeed="1200.00" torque="186.00" fuelConsumption="6404.00"/>
+								<Entry engineSpeed="1200.00" torque="371.00" fuelConsumption="9889.00"/>
+								<Entry engineSpeed="1200.00" torque="557.00" fuelConsumption="13598.00"/>
+								<Entry engineSpeed="1200.00" torque="743.00" fuelConsumption="17748.00"/>
+								<Entry engineSpeed="1200.00" torque="928.00" fuelConsumption="21984.00"/>
+								<Entry engineSpeed="1200.00" torque="1114.00" fuelConsumption="26164.00"/>
+								<Entry engineSpeed="1200.00" torque="1300.00" fuelConsumption="30111.00"/>
+								<Entry engineSpeed="1200.00" torque="1486.00" fuelConsumption="34354.00"/>
+								<Entry engineSpeed="1200.00" torque="1671.00" fuelConsumption="38709.00"/>
+								<Entry engineSpeed="1200.00" torque="1857.00" fuelConsumption="43559.00"/>
+								<Entry engineSpeed="1200.00" torque="2043.00" fuelConsumption="48079.00"/>
+								<Entry engineSpeed="1200.00" torque="2135.00" fuelConsumption="51003.00"/>
+								<Entry engineSpeed="1400.00" torque="-188.00" fuelConsumption="0.00"/>
+								<Entry engineSpeed="1400.00" torque="0.00" fuelConsumption="3998.00"/>
+								<Entry engineSpeed="1400.00" torque="186.00" fuelConsumption="7561.00"/>
+								<Entry engineSpeed="1400.00" torque="371.00" fuelConsumption="11813.00"/>
+								<Entry engineSpeed="1400.00" torque="557.00" fuelConsumption="16270.00"/>
+								<Entry engineSpeed="1400.00" torque="743.00" fuelConsumption="20694.00"/>
+								<Entry engineSpeed="1400.00" torque="928.00" fuelConsumption="25155.00"/>
+								<Entry engineSpeed="1400.00" torque="1114.00" fuelConsumption="30209.00"/>
+								<Entry engineSpeed="1400.00" torque="1300.00" fuelConsumption="35046.00"/>
+								<Entry engineSpeed="1400.00" torque="1486.00" fuelConsumption="40105.00"/>
+								<Entry engineSpeed="1400.00" torque="1671.00" fuelConsumption="45916.00"/>
+								<Entry engineSpeed="1400.00" torque="1857.00" fuelConsumption="51762.00"/>
+								<Entry engineSpeed="1400.00" torque="2043.00" fuelConsumption="56704.00"/>
+								<Entry engineSpeed="1400.00" torque="2135.00" fuelConsumption="59772.00"/>
+								<Entry engineSpeed="1600.00" torque="-218.00" fuelConsumption="0.00"/>
+								<Entry engineSpeed="1600.00" torque="0.00" fuelConsumption="4836.00"/>
+								<Entry engineSpeed="1600.00" torque="186.00" fuelConsumption="8977.00"/>
+								<Entry engineSpeed="1600.00" torque="371.00" fuelConsumption="13777.00"/>
+								<Entry engineSpeed="1600.00" torque="557.00" fuelConsumption="18687.00"/>
+								<Entry engineSpeed="1600.00" torque="743.00" fuelConsumption="24042.00"/>
+								<Entry engineSpeed="1600.00" torque="928.00" fuelConsumption="29369.00"/>
+								<Entry engineSpeed="1600.00" torque="1114.00" fuelConsumption="34584.00"/>
+								<Entry engineSpeed="1600.00" torque="1300.00" fuelConsumption="40342.00"/>
+								<Entry engineSpeed="1600.00" torque="1486.00" fuelConsumption="46194.00"/>
+								<Entry engineSpeed="1600.00" torque="1671.00" fuelConsumption="52942.00"/>
+								<Entry engineSpeed="1600.00" torque="1857.00" fuelConsumption="59343.00"/>
+								<Entry engineSpeed="1600.00" torque="1930.00" fuelConsumption="61762.00"/>
+								<Entry engineSpeed="1800.00" torque="-245.00" fuelConsumption="0.00"/>
+								<Entry engineSpeed="1800.00" torque="0.00" fuelConsumption="5951.00"/>
+								<Entry engineSpeed="1800.00" torque="186.00" fuelConsumption="10935.00"/>
+								<Entry engineSpeed="1800.00" torque="371.00" fuelConsumption="16081.00"/>
+								<Entry engineSpeed="1800.00" torque="557.00" fuelConsumption="21721.00"/>
+								<Entry engineSpeed="1800.00" torque="743.00" fuelConsumption="28319.00"/>
+								<Entry engineSpeed="1800.00" torque="928.00" fuelConsumption="33776.00"/>
+								<Entry engineSpeed="1800.00" torque="1114.00" fuelConsumption="39998.00"/>
+								<Entry engineSpeed="1800.00" torque="1300.00" fuelConsumption="46656.00"/>
+								<Entry engineSpeed="1800.00" torque="1486.00" fuelConsumption="53328.00"/>
+								<Entry engineSpeed="1800.00" torque="1671.00" fuelConsumption="60497.00"/>
+								<Entry engineSpeed="1800.00" torque="1724.00" fuelConsumption="62741.00"/>
+								<Entry engineSpeed="2000.00" torque="-279.00" fuelConsumption="0.00"/>
+								<Entry engineSpeed="2000.00" torque="0.00" fuelConsumption="8474.00"/>
+								<Entry engineSpeed="2000.00" torque="186.00" fuelConsumption="13762.00"/>
+								<Entry engineSpeed="2000.00" torque="371.00" fuelConsumption="19178.00"/>
+								<Entry engineSpeed="2000.00" torque="557.00" fuelConsumption="25139.00"/>
+								<Entry engineSpeed="2000.00" torque="743.00" fuelConsumption="31743.00"/>
+								<Entry engineSpeed="2000.00" torque="928.00" fuelConsumption="39773.00"/>
+								<Entry engineSpeed="2000.00" torque="1114.00" fuelConsumption="47369.00"/>
+								<Entry engineSpeed="2000.00" torque="1255.00" fuelConsumption="52568.00"/>
+								<Entry engineSpeed="2100.00" torque="-297.00" fuelConsumption="0.00"/>
+								<Entry engineSpeed="2100.00" torque="0.00" fuelConsumption="9721.00"/>
+								<Entry engineSpeed="2100.00" torque="186.00" fuelConsumption="15164.00"/>
+								<Entry engineSpeed="2100.00" torque="371.00" fuelConsumption="20794.00"/>
+								<Entry engineSpeed="2100.00" torque="557.00" fuelConsumption="26846.00"/>
+								<Entry engineSpeed="2100.00" torque="743.00" fuelConsumption="33162.00"/>
+								<Entry engineSpeed="2100.00" torque="928.00" fuelConsumption="42378.00"/>
+								<Entry engineSpeed="2100.00" torque="1021.00" fuelConsumption="47030.00"/>
+								<Entry engineSpeed="2200.00" torque="-315.00" fuelConsumption="0.00"/>
+								<Entry engineSpeed="2200.00" torque="0.00" fuelConsumption="12483.00"/>
+							</FuelConsumptionMap>
+						</Fuel>
+						<Fuel type="Diesel CI">
+							<WHTCUrban>1.0000</WHTCUrban>
+							<WHTCRural>1.0000</WHTCRural>
+							<WHTCMotorway>1.0000</WHTCMotorway>
+							<BFColdHot>1.0000</BFColdHot>
+							<CFRegPer>1.0000</CFRegPer>
+							<CFNCV>1.0000</CFNCV>
+							<FuelConsumptionMap>
+								<Entry engineSpeed="600.00" torque="-139.00" fuelConsumption="0.00"/>
+								<Entry engineSpeed="600.00" torque="0.00" fuelConsumption="135.00"/>
+								<Entry engineSpeed="600.00" torque="186.00" fuelConsumption="311.00"/>
+								<Entry engineSpeed="600.00" torque="371.00" fuelConsumption="510.00"/>
+								<Entry engineSpeed="600.00" torque="557.00" fuelConsumption="752.00"/>
+								<Entry engineSpeed="600.00" torque="743.00" fuelConsumption="929.00"/>
+								<Entry engineSpeed="600.00" torque="928.00" fuelConsumption="1120.00"/>
+								<Entry engineSpeed="600.00" torque="1114.00" fuelConsumption="1337.00"/>
+								<Entry engineSpeed="600.00" torque="1190.00" fuelConsumption="1425.00"/>
+								<Entry engineSpeed="800.00" torque="-144.00" fuelConsumption="0.00"/>
+								<Entry engineSpeed="800.00" torque="0.00" fuelConsumption="174.00"/>
+								<Entry engineSpeed="800.00" torque="186.00" fuelConsumption="397.00"/>
+								<Entry engineSpeed="800.00" torque="371.00" fuelConsumption="682.00"/>
+								<Entry engineSpeed="800.00" torque="557.00" fuelConsumption="934.00"/>
+								<Entry engineSpeed="800.00" torque="743.00" fuelConsumption="1215.00"/>
+								<Entry engineSpeed="800.00" torque="928.00" fuelConsumption="1487.00"/>
+								<Entry engineSpeed="800.00" torque="1114.00" fuelConsumption="1786.00"/>
+								<Entry engineSpeed="800.00" torque="1300.00" fuelConsumption="2082.00"/>
+								<Entry engineSpeed="800.00" torque="1486.00" fuelConsumption="2376.00"/>
+								<Entry engineSpeed="800.00" torque="1663.00" fuelConsumption="2683.00"/>
+								<Entry engineSpeed="1000.00" torque="-153.00" fuelConsumption="0.00"/>
+								<Entry engineSpeed="1000.00" torque="0.00" fuelConsumption="266.00"/>
+								<Entry engineSpeed="1000.00" torque="186.00" fuelConsumption="553.00"/>
+								<Entry engineSpeed="1000.00" torque="371.00" fuelConsumption="854.00"/>
+								<Entry engineSpeed="1000.00" torque="557.00" fuelConsumption="1147.00"/>
+								<Entry engineSpeed="1000.00" torque="743.00" fuelConsumption="1482.00"/>
+								<Entry engineSpeed="1000.00" torque="928.00" fuelConsumption="1844.00"/>
+								<Entry engineSpeed="1000.00" torque="1114.00" fuelConsumption="2184.00"/>
+								<Entry engineSpeed="1000.00" torque="1300.00" fuelConsumption="2525.00"/>
+								<Entry engineSpeed="1000.00" torque="1486.00" fuelConsumption="2893.00"/>
+								<Entry engineSpeed="1000.00" torque="1671.00" fuelConsumption="3259.00"/>
+								<Entry engineSpeed="1000.00" torque="1857.00" fuelConsumption="3654.00"/>
+								<Entry engineSpeed="1000.00" torque="2043.00" fuelConsumption="4096.00"/>
+								<Entry engineSpeed="1000.00" torque="2135.00" fuelConsumption="4348.00"/>
+								<Entry engineSpeed="1200.00" torque="-166.00" fuelConsumption="0.00"/>
+								<Entry engineSpeed="1200.00" torque="0.00" fuelConsumption="307.00"/>
+								<Entry engineSpeed="1200.00" torque="186.00" fuelConsumption="640.00"/>
+								<Entry engineSpeed="1200.00" torque="371.00" fuelConsumption="988.00"/>
+								<Entry engineSpeed="1200.00" torque="557.00" fuelConsumption="1359.00"/>
+								<Entry engineSpeed="1200.00" torque="743.00" fuelConsumption="1774.00"/>
+								<Entry engineSpeed="1200.00" torque="928.00" fuelConsumption="2198.00"/>
+								<Entry engineSpeed="1200.00" torque="1114.00" fuelConsumption="2616.00"/>
+								<Entry engineSpeed="1200.00" torque="1300.00" fuelConsumption="3011.00"/>
+								<Entry engineSpeed="1200.00" torque="1486.00" fuelConsumption="3435.00"/>
+								<Entry engineSpeed="1200.00" torque="1671.00" fuelConsumption="3870.00"/>
+								<Entry engineSpeed="1200.00" torque="1857.00" fuelConsumption="4355.00"/>
+								<Entry engineSpeed="1200.00" torque="2043.00" fuelConsumption="4807.00"/>
+								<Entry engineSpeed="1200.00" torque="2135.00" fuelConsumption="5100.00"/>
+								<Entry engineSpeed="1400.00" torque="-188.00" fuelConsumption="0.00"/>
+								<Entry engineSpeed="1400.00" torque="0.00" fuelConsumption="399.00"/>
+								<Entry engineSpeed="1400.00" torque="186.00" fuelConsumption="756.00"/>
+								<Entry engineSpeed="1400.00" torque="371.00" fuelConsumption="1181.00"/>
+								<Entry engineSpeed="1400.00" torque="557.00" fuelConsumption="1627.00"/>
+								<Entry engineSpeed="1400.00" torque="743.00" fuelConsumption="2069.00"/>
+								<Entry engineSpeed="1400.00" torque="928.00" fuelConsumption="2515.00"/>
+								<Entry engineSpeed="1400.00" torque="1114.00" fuelConsumption="3029.00"/>
+								<Entry engineSpeed="1400.00" torque="1300.00" fuelConsumption="3506.00"/>
+								<Entry engineSpeed="1400.00" torque="1486.00" fuelConsumption="4010.00"/>
+								<Entry engineSpeed="1400.00" torque="1671.00" fuelConsumption="4591.00"/>
+								<Entry engineSpeed="1400.00" torque="1857.00" fuelConsumption="5176.00"/>
+								<Entry engineSpeed="1400.00" torque="2043.00" fuelConsumption="5670.00"/>
+								<Entry engineSpeed="1400.00" torque="2135.00" fuelConsumption="5977.00"/>
+								<Entry engineSpeed="1600.00" torque="-218.00" fuelConsumption="0.00"/>
+								<Entry engineSpeed="1600.00" torque="0.00" fuelConsumption="483.00"/>
+								<Entry engineSpeed="1600.00" torque="186.00" fuelConsumption="897.00"/>
+								<Entry engineSpeed="1600.00" torque="371.00" fuelConsumption="1377.00"/>
+								<Entry engineSpeed="1600.00" torque="557.00" fuelConsumption="1868.00"/>
+								<Entry engineSpeed="1600.00" torque="743.00" fuelConsumption="2404.00"/>
+								<Entry engineSpeed="1600.00" torque="928.00" fuelConsumption="2936.00"/>
+								<Entry engineSpeed="1600.00" torque="1114.00" fuelConsumption="3458.00"/>
+								<Entry engineSpeed="1600.00" torque="1300.00" fuelConsumption="4034.00"/>
+								<Entry engineSpeed="1600.00" torque="1486.00" fuelConsumption="4619.00"/>
+								<Entry engineSpeed="1600.00" torque="1671.00" fuelConsumption="5294.00"/>
+								<Entry engineSpeed="1600.00" torque="1857.00" fuelConsumption="5934.00"/>
+								<Entry engineSpeed="1600.00" torque="1930.00" fuelConsumption="6176.00"/>
+								<Entry engineSpeed="1800.00" torque="-245.00" fuelConsumption="0.00"/>
+								<Entry engineSpeed="1800.00" torque="0.00" fuelConsumption="595.00"/>
+								<Entry engineSpeed="1800.00" torque="186.00" fuelConsumption="1093.00"/>
+								<Entry engineSpeed="1800.00" torque="371.00" fuelConsumption="1608.00"/>
+								<Entry engineSpeed="1800.00" torque="557.00" fuelConsumption="2172.00"/>
+								<Entry engineSpeed="1800.00" torque="743.00" fuelConsumption="2831.00"/>
+								<Entry engineSpeed="1800.00" torque="928.00" fuelConsumption="3377.00"/>
+								<Entry engineSpeed="1800.00" torque="1114.00" fuelConsumption="3998.00"/>
+								<Entry engineSpeed="1800.00" torque="1300.00" fuelConsumption="4666.00"/>
+								<Entry engineSpeed="1800.00" torque="1486.00" fuelConsumption="5332.00"/>
+								<Entry engineSpeed="1800.00" torque="1671.00" fuelConsumption="6049.00"/>
+								<Entry engineSpeed="1800.00" torque="1724.00" fuelConsumption="6274.00"/>
+								<Entry engineSpeed="2000.00" torque="-279.00" fuelConsumption="0.00"/>
+								<Entry engineSpeed="2000.00" torque="0.00" fuelConsumption="847.00"/>
+								<Entry engineSpeed="2000.00" torque="186.00" fuelConsumption="1376.00"/>
+								<Entry engineSpeed="2000.00" torque="371.00" fuelConsumption="1917.00"/>
+								<Entry engineSpeed="2000.00" torque="557.00" fuelConsumption="2513.00"/>
+								<Entry engineSpeed="2000.00" torque="743.00" fuelConsumption="3174.00"/>
+								<Entry engineSpeed="2000.00" torque="928.00" fuelConsumption="3977.00"/>
+								<Entry engineSpeed="2000.00" torque="1114.00" fuelConsumption="4736.00"/>
+								<Entry engineSpeed="2000.00" torque="1255.00" fuelConsumption="5256.00"/>
+								<Entry engineSpeed="2100.00" torque="-297.00" fuelConsumption="0.00"/>
+								<Entry engineSpeed="2100.00" torque="0.00" fuelConsumption="972.00"/>
+								<Entry engineSpeed="2100.00" torque="186.00" fuelConsumption="1516.00"/>
+								<Entry engineSpeed="2100.00" torque="371.00" fuelConsumption="2079.00"/>
+								<Entry engineSpeed="2100.00" torque="557.00" fuelConsumption="2684.00"/>
+								<Entry engineSpeed="2100.00" torque="743.00" fuelConsumption="3316.00"/>
+								<Entry engineSpeed="2100.00" torque="928.00" fuelConsumption="4237.00"/>
+								<Entry engineSpeed="2100.00" torque="1021.00" fuelConsumption="4703.00"/>
+								<Entry engineSpeed="2200.00" torque="-315.00" fuelConsumption="0.00"/>
+								<Entry engineSpeed="2200.00" torque="0.00" fuelConsumption="1248.00"/>
+							</FuelConsumptionMap>
+						</Fuel>
+					</Mode>
+				</v2.0:Data>
+				<Signature>
+					<Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
+						<Transforms>
+							<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
+							<Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						</Transforms>
+						<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<DigestValue/>
+					</Reference>
+				</Signature>
+			</Engine>
+			<Gearbox>
+				<Data id="GBX-N.A." xsi:type="GearboxDataDeclarationType">
+					<Manufacturer>Generic Vendor</Manufacturer>
+					<Model>N.A.</Model>
+					<CertificationNumber>GBX-N.A.</CertificationNumber>
+					<Date>2017-07-06T15:06:08.3133609Z</Date>
+					<AppVersion>VectoCore</AppVersion>
+					<TransmissionType>AMT</TransmissionType>
+					<MainCertificationMethod>Standard values</MainCertificationMethod>
+					<Gears xsi:type="GearsDeclarationType">
+						<Gear number="1">
+							<Ratio>14.930</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="2">
+							<Ratio>11.640</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="3">
+							<Ratio>9.020</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="4">
+							<Ratio>7.040</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="5">
+							<Ratio>5.640</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="6">
+							<Ratio>4.400</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="7">
+							<Ratio>3.390</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="8">
+							<Ratio>2.650</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="9">
+							<Ratio>2.050</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="10">
+							<Ratio>1.600</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="11">
+							<Ratio>1.280</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="12">
+							<Ratio>1.000</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="200.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-250.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="250.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="200.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="200.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-845.00" torqueLoss="17.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="17.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="845.00" torqueLoss="17.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="200.00"/>
+							</TorqueLossMap>
+						</Gear>
+					</Gears>
+				</Data>
+				<Signature>
+					<Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
+						<Transforms>
+							<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
+							<Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						</Transforms>
+						<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<DigestValue/>
+					</Reference>
+				</Signature>
+			</Gearbox>
+			<Retarder>
+				<Data id="RET-N.A." xsi:type="RetarderDataDeclarationType">
+					<Manufacturer>Generic Vendor</Manufacturer>
+					<Model>N.A.</Model>
+					<CertificationNumber>N/A</CertificationNumber>
+					<Date>2017-07-06T15:06:08.3133609Z</Date>
+					<AppVersion>VectoCore</AppVersion>
+					<CertificationMethod>Standard values</CertificationMethod>
+					<RetarderLossMap>
+						<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+						<Entry retarderSpeed="100.00" torqueLoss="10.00"/>
+						<Entry retarderSpeed="200.00" torqueLoss="10.10"/>
+						<Entry retarderSpeed="300.00" torqueLoss="10.20"/>
+						<Entry retarderSpeed="400.00" torqueLoss="10.30"/>
+						<Entry retarderSpeed="500.00" torqueLoss="10.50"/>
+						<Entry retarderSpeed="600.00" torqueLoss="10.70"/>
+						<Entry retarderSpeed="700.00" torqueLoss="11.00"/>
+						<Entry retarderSpeed="800.00" torqueLoss="11.30"/>
+						<Entry retarderSpeed="900.00" torqueLoss="11.60"/>
+						<Entry retarderSpeed="1000.00" torqueLoss="12.00"/>
+						<Entry retarderSpeed="1100.00" torqueLoss="12.40"/>
+						<Entry retarderSpeed="1200.00" torqueLoss="12.90"/>
+						<Entry retarderSpeed="1300.00" torqueLoss="13.40"/>
+						<Entry retarderSpeed="1400.00" torqueLoss="13.90"/>
+						<Entry retarderSpeed="1500.00" torqueLoss="14.50"/>
+						<Entry retarderSpeed="1600.00" torqueLoss="15.10"/>
+						<Entry retarderSpeed="1700.00" torqueLoss="15.80"/>
+						<Entry retarderSpeed="1800.00" torqueLoss="16.50"/>
+						<Entry retarderSpeed="1900.00" torqueLoss="17.20"/>
+						<Entry retarderSpeed="2000.00" torqueLoss="18.00"/>
+						<Entry retarderSpeed="2100.00" torqueLoss="18.80"/>
+						<Entry retarderSpeed="2200.00" torqueLoss="19.70"/>
+						<Entry retarderSpeed="2300.00" torqueLoss="20.60"/>
+						<Entry retarderSpeed="2400.00" torqueLoss="21.50"/>
+						<Entry retarderSpeed="2500.00" torqueLoss="22.50"/>
+						<Entry retarderSpeed="2600.00" torqueLoss="23.50"/>
+						<Entry retarderSpeed="2700.00" torqueLoss="24.60"/>
+						<Entry retarderSpeed="2800.00" torqueLoss="25.70"/>
+						<Entry retarderSpeed="2900.00" torqueLoss="26.80"/>
+						<Entry retarderSpeed="3000.00" torqueLoss="28.00"/>
+					</RetarderLossMap>
+				</Data>
+				<Signature>
+					<Reference URI="#RET-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
+						<Transforms>
+							<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
+							<Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						</Transforms>
+						<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<DigestValue/>
+					</Reference>
+				</Signature>
+			</Retarder>
+			<Axlegear>
+				<Data id="AXLGEAR-2.640" xsi:type="AxlegearDataDeclarationType">
+					<Manufacturer>Generic Vendor</Manufacturer>
+					<Model>N.A.</Model>
+					<CertificationNumber>AXLGEAR-2.640</CertificationNumber>
+					<Date>2017-07-06T15:06:08.3153609Z</Date>
+					<AppVersion>VectoCore</AppVersion>
+					<LineType>Single portal axle</LineType>
+					<Ratio>2.640</Ratio>
+					<CertificationMethod>Standard values</CertificationMethod>
+					<TorqueLossMap>
+						<Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+						<Entry inputSpeed="0.00" inputTorque="-50.00" torqueLoss="2.00"/>
+						<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="0.00"/>
+						<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="2.00"/>
+						<Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+						<Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+						<Entry inputSpeed="5000.00" inputTorque="-50.00" torqueLoss="2.00"/>
+						<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="0.00"/>
+						<Entry inputSpeed="5000.00" inputTorque="50.00" torqueLoss="2.00"/>
+						<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+					</TorqueLossMap>
+				</Data>
+				<Signature>
+					<Reference URI="#AXLGEAR-2.640" xmlns="http://www.w3.org/2000/09/xmldsig#">
+						<Transforms>
+							<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
+							<Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						</Transforms>
+						<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<DigestValue/>
+					</Reference>
+				</Signature>
+			</Axlegear>
+			<AxleWheels>
+				<Data xsi:type="AxleWheelsDataDeclarationType">
+					<Axles>
+						<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+							<AxleType>VehicleNonDriven</AxleType>
+							<TwinTyres>false</TwinTyres>
+							<Steered>true</Steered>
+							<Tyre>
+								<Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
+									<Manufacturer>Generic Vendor</Manufacturer>
+									<Model>315/70 R22.5</Model>
+									<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
+									<Date>2017-07-06T15:06:08.3153609Z</Date>
+									<AppVersion>VectoCore</AppVersion>
+									<Dimension>315/70 R22.5</Dimension>
+									<RRCDeclared>0.0051</RRCDeclared>
+									<FzISO>33350</FzISO>
+								</Data>
+								<Signature>
+									<Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
+										<Transforms>
+											<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
+											<Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+										</Transforms>
+										<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+										<DigestValue/>
+									</Reference>
+								</Signature>
+							</Tyre>
+						</Axle>
+						<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+							<AxleType>VehicleDriven</AxleType>
+							<TwinTyres>true</TwinTyres>
+							<Steered>false</Steered>
+							<Tyre>
+								<Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
+									<Manufacturer>Generic Vendor</Manufacturer>
+									<Model>315/70 R22.5</Model>
+									<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
+									<Date>2017-07-06T15:06:08.3153609Z</Date>
+									<AppVersion>VectoCore</AppVersion>
+									<Dimension>315/70 R22.5</Dimension>
+									<RRCDeclared>0.0061</RRCDeclared>
+									<FzISO>33350</FzISO>
+								</Data>
+								<Signature>
+									<Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
+										<Transforms>
+											<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
+											<Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+										</Transforms>
+										<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+										<DigestValue/>
+									</Reference>
+								</Signature>
+							</Tyre>
+						</Axle>
+					</Axles>
+				</Data>
+			</AxleWheels>
+			<Auxiliaries>
+				<Data xsi:type="AuxiliariesDataDeclarationType">
+					<Fan>
+						<Technology>Crankshaft mounted - Electronically controlled visco clutch</Technology>
+					</Fan>
+					<SteeringPump>
+						<Technology>Fixed displacement</Technology>
+					</SteeringPump>
+					<ElectricSystem>
+						<Technology>Standard technology</Technology>
+					</ElectricSystem>
+					<PneumaticSystem>
+						<Technology>Small</Technology>
+					</PneumaticSystem>
+					<HVAC>
+						<Technology>None</Technology>
+					</HVAC>
+				</Data>
+			</Auxiliaries>
+			<AirDrag>
+				<Data id="Airdrag-N.A." xsi:type="AirDragDataDeclarationType">
+					<Manufacturer>Generic Vendor</Manufacturer>
+					<Model>N.A.</Model>
+					<CertificationNumber>N.A.</CertificationNumber>
+					<Date>2017-07-06T15:06:08.3163609Z</Date>
+					<AppVersion>VectoCore</AppVersion>
+					<CdxA_0>5.45</CdxA_0>
+					<TransferredCdxA>5.45</TransferredCdxA>
+					<DeclaredCdxA>5.45</DeclaredCdxA>
+				</Data>
+				<Signature>
+					<Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
+						<Transforms>
+							<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
+							<Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						</Transforms>
+						<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<DigestValue/>
+					</Reference>
+				</Signature>
+			</AirDrag>
+		</v2.1:Components>
+	</v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_4x2_vehicle-class-5_EURO6_2018_WHR_el.xml b/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_4x2_vehicle-class-5_EURO6_2018_WHR_el.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4572515ca251a378596050c669cfe5624b42660f
--- /dev/null
+++ b/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_4x2_vehicle-class-5_EURO6_2018_WHR_el.xml
@@ -0,0 +1,593 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 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.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.2.0.xsd">
+	<v2.0:Vehicle id="VEH-Class5_whr-el" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+		<Manufacturer>Generic Vendor</Manufacturer>
+		<ManufacturerAddress>N.A.</ManufacturerAddress>
+		<Model>N.A.</Model>
+		<VIN>N/A</VIN>
+		<Date>2017-07-06T15:06:08.3093609Z</Date>
+		<LegislativeClass>N3</LegislativeClass>
+		<VehicleCategory>Tractor</VehicleCategory>
+		<AxleConfiguration>4x2</AxleConfiguration>
+		<CurbMassChassis>8229</CurbMassChassis>
+		<GrossVehicleMass>18000</GrossVehicleMass>
+		<IdlingSpeed>600</IdlingSpeed>
+		<RetarderType>Transmission Output Retarder</RetarderType>
+		<RetarderRatio>1.000</RetarderRatio>
+		<AngledriveType>None</AngledriveType>
+		<v2.1:PTO xsi:type="PTOType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+			<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+			<PTOOtherElements>none</PTOOtherElements>
+		</v2.1:PTO>
+		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+		<VocationalVehicle>false</VocationalVehicle>
+		<SleeperCab>false</SleeperCab>
+		<ADAS xsi:type="AdvancedDriverAssistantSystemsType">
+			<EngineStopStart>false</EngineStopStart>
+			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
+		</ADAS>
+		<v2.1:Components xsi:type="VehicleComponentsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+			<Engine>
+				<v2.0:Data id="ENG-N.A." xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+					<Manufacturer>Generic Vendor</Manufacturer>
+					<Model>N.A.</Model>
+					<CertificationNumber>ENG-N.A.</CertificationNumber>
+					<Date>2017-07-06T15:06:08.3103609Z</Date>
+					<AppVersion>VectoCore</AppVersion>
+					<Displacement>12740</Displacement>
+					<RatedSpeed>1736</RatedSpeed>
+					<RatedPower>325032</RatedPower>
+					<MaxEngineTorque>2134</MaxEngineTorque>
+					<WHRType>
+						<MechanicalOutputICE>false</MechanicalOutputICE>
+						<MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+						<ElectricalOutput>true</ElectricalOutput>
+					</WHRType>
+					<Mode>
+						<IdlingSpeed>600</IdlingSpeed>
+						<FullLoadAndDragCurve>
+							<Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00"/>
+							<Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00"/>
+							<Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00"/>
+							<Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00"/>
+							<Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00"/>
+							<Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00"/>
+							<Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00"/>
+							<Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00"/>
+							<Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00"/>
+							<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00"/>
+						</FullLoadAndDragCurve>
+						<Fuel type="Diesel CI">
+							<WHTCUrban>1.0000</WHTCUrban>
+							<WHTCRural>1.0000</WHTCRural>
+							<WHTCMotorway>1.0000</WHTCMotorway>
+							<BFColdHot>1.0000</BFColdHot>
+							<CFRegPer>1.0000</CFRegPer>
+							<CFNCV>1.0000</CFNCV>
+							<WHRCorrectionFactors>
+								<Electrical>
+									<Urban>1.0000</Urban>
+									<Rural>1.0000</Rural>
+									<Motorway>1.0000</Motorway>
+									<BFColdHot>1.0000</BFColdHot>
+									<CFRegPer>1.0000</CFRegPer>
+								</Electrical>
+							</WHRCorrectionFactors>
+							<FuelConsumptionMap>
+								<Entry engineSpeed="600.00" torque="-139.00" fuelConsumption="0.00" electricPower="500.00"/>
+								<Entry engineSpeed="600.00" torque="0.00" fuelConsumption="1355.00" electricPower="500.00"/>
+								<Entry engineSpeed="600.00" torque="186.00" fuelConsumption="3118.00" electricPower="500.00"/>
+								<Entry engineSpeed="600.00" torque="371.00" fuelConsumption="5105.00" electricPower="500.00"/>
+								<Entry engineSpeed="600.00" torque="557.00" fuelConsumption="7522.00" electricPower="500.00"/>
+								<Entry engineSpeed="600.00" torque="743.00" fuelConsumption="9298.00" electricPower="500.00"/>
+								<Entry engineSpeed="600.00" torque="928.00" fuelConsumption="11208.00" electricPower="500.00"/>
+								<Entry engineSpeed="600.00" torque="1114.00" fuelConsumption="13370.00" electricPower="500.00"/>
+								<Entry engineSpeed="600.00" torque="1190.00" fuelConsumption="14252.00" electricPower="500.00"/>
+								<Entry engineSpeed="800.00" torque="-144.00" fuelConsumption="0.00" electricPower="500.00"/>
+								<Entry engineSpeed="800.00" torque="0.00" fuelConsumption="1745.00" electricPower="500.00"/>
+								<Entry engineSpeed="800.00" torque="186.00" fuelConsumption="3979.00" electricPower="500.00"/>
+								<Entry engineSpeed="800.00" torque="371.00" fuelConsumption="6824.00" electricPower="500.00"/>
+								<Entry engineSpeed="800.00" torque="557.00" fuelConsumption="9340.00" electricPower="500.00"/>
+								<Entry engineSpeed="800.00" torque="743.00" fuelConsumption="12150.00" electricPower="500.00"/>
+								<Entry engineSpeed="800.00" torque="928.00" fuelConsumption="14870.00" electricPower="500.00"/>
+								<Entry engineSpeed="800.00" torque="1114.00" fuelConsumption="17863.00" electricPower="500.00"/>
+								<Entry engineSpeed="800.00" torque="1300.00" fuelConsumption="20822.00" electricPower="500.00"/>
+								<Entry engineSpeed="800.00" torque="1486.00" fuelConsumption="23769.00" electricPower="500.00"/>
+								<Entry engineSpeed="800.00" torque="1663.00" fuelConsumption="26838.00" electricPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="-153.00" fuelConsumption="0.00" electricPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="0.00" fuelConsumption="2660.00" electricPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="186.00" fuelConsumption="5536.00" electricPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="371.00" fuelConsumption="8540.00" electricPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="557.00" fuelConsumption="11470.00" electricPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="743.00" fuelConsumption="14823.00" electricPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="928.00" fuelConsumption="18443.00" electricPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="1114.00" fuelConsumption="21847.00" electricPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="1300.00" fuelConsumption="25256.00" electricPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="1486.00" fuelConsumption="28936.00" electricPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="1671.00" fuelConsumption="32592.00" electricPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="1857.00" fuelConsumption="36545.00" electricPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="2043.00" fuelConsumption="40964.00" electricPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="2135.00" fuelConsumption="43486.00" electricPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="-166.00" fuelConsumption="0.00" electricPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="0.00" fuelConsumption="3070.00" electricPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="186.00" fuelConsumption="6404.00" electricPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="371.00" fuelConsumption="9889.00" electricPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="557.00" fuelConsumption="13598.00" electricPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="743.00" fuelConsumption="17748.00" electricPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="928.00" fuelConsumption="21984.00" electricPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="1114.00" fuelConsumption="26164.00" electricPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="1300.00" fuelConsumption="30111.00" electricPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="1486.00" fuelConsumption="34354.00" electricPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="1671.00" fuelConsumption="38709.00" electricPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="1857.00" fuelConsumption="43559.00" electricPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="2043.00" fuelConsumption="48079.00" electricPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="2135.00" fuelConsumption="51003.00" electricPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="-188.00" fuelConsumption="0.00" electricPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="0.00" fuelConsumption="3998.00" electricPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="186.00" fuelConsumption="7561.00" electricPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="371.00" fuelConsumption="11813.00" electricPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="557.00" fuelConsumption="16270.00" electricPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="743.00" fuelConsumption="20694.00" electricPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="928.00" fuelConsumption="25155.00" electricPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="1114.00" fuelConsumption="30209.00" electricPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="1300.00" fuelConsumption="35046.00" electricPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="1486.00" fuelConsumption="40105.00" electricPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="1671.00" fuelConsumption="45916.00" electricPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="1857.00" fuelConsumption="51762.00" electricPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="2043.00" fuelConsumption="56704.00" electricPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="2135.00" fuelConsumption="59772.00" electricPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="-218.00" fuelConsumption="0.00" electricPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="0.00" fuelConsumption="4836.00" electricPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="186.00" fuelConsumption="8977.00" electricPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="371.00" fuelConsumption="13777.00" electricPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="557.00" fuelConsumption="18687.00" electricPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="743.00" fuelConsumption="24042.00" electricPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="928.00" fuelConsumption="29369.00" electricPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="1114.00" fuelConsumption="34584.00" electricPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="1300.00" fuelConsumption="40342.00" electricPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="1486.00" fuelConsumption="46194.00" electricPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="1671.00" fuelConsumption="52942.00" electricPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="1857.00" fuelConsumption="59343.00" electricPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="1930.00" fuelConsumption="61762.00" electricPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="-245.00" fuelConsumption="0.00" electricPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="0.00" fuelConsumption="5951.00" electricPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="186.00" fuelConsumption="10935.00" electricPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="371.00" fuelConsumption="16081.00" electricPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="557.00" fuelConsumption="21721.00" electricPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="743.00" fuelConsumption="28319.00" electricPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="928.00" fuelConsumption="33776.00" electricPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="1114.00" fuelConsumption="39998.00" electricPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="1300.00" fuelConsumption="46656.00" electricPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="1486.00" fuelConsumption="53328.00" electricPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="1671.00" fuelConsumption="60497.00" electricPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="1724.00" fuelConsumption="62741.00" electricPower="500.00"/>
+								<Entry engineSpeed="2000.00" torque="-279.00" fuelConsumption="0.00" electricPower="500.00"/>
+								<Entry engineSpeed="2000.00" torque="0.00" fuelConsumption="8474.00" electricPower="500.00"/>
+								<Entry engineSpeed="2000.00" torque="186.00" fuelConsumption="13762.00" electricPower="500.00"/>
+								<Entry engineSpeed="2000.00" torque="371.00" fuelConsumption="19178.00" electricPower="500.00"/>
+								<Entry engineSpeed="2000.00" torque="557.00" fuelConsumption="25139.00" electricPower="500.00"/>
+								<Entry engineSpeed="2000.00" torque="743.00" fuelConsumption="31743.00" electricPower="500.00"/>
+								<Entry engineSpeed="2000.00" torque="928.00" fuelConsumption="39773.00" electricPower="500.00"/>
+								<Entry engineSpeed="2000.00" torque="1114.00" fuelConsumption="47369.00" electricPower="500.00"/>
+								<Entry engineSpeed="2000.00" torque="1255.00" fuelConsumption="52568.00" electricPower="500.00"/>
+								<Entry engineSpeed="2100.00" torque="-297.00" fuelConsumption="0.00" electricPower="500.00"/>
+								<Entry engineSpeed="2100.00" torque="0.00" fuelConsumption="9721.00" electricPower="500.00"/>
+								<Entry engineSpeed="2100.00" torque="186.00" fuelConsumption="15164.00" electricPower="500.00"/>
+								<Entry engineSpeed="2100.00" torque="371.00" fuelConsumption="20794.00" electricPower="500.00"/>
+								<Entry engineSpeed="2100.00" torque="557.00" fuelConsumption="26846.00" electricPower="500.00"/>
+								<Entry engineSpeed="2100.00" torque="743.00" fuelConsumption="33162.00" electricPower="500.00"/>
+								<Entry engineSpeed="2100.00" torque="928.00" fuelConsumption="42378.00" electricPower="500.00"/>
+								<Entry engineSpeed="2100.00" torque="1021.00" fuelConsumption="47030.00" electricPower="500.00"/>
+								<Entry engineSpeed="2200.00" torque="-315.00" fuelConsumption="0.00" electricPower="500.00"/>
+								<Entry engineSpeed="2200.00" torque="0.00" fuelConsumption="12483.00" electricPower="500.00"/>
+							</FuelConsumptionMap>
+						</Fuel>
+					</Mode>
+				</v2.0:Data>
+				<Signature>
+					<Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
+						<Transforms>
+							<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
+							<Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						</Transforms>
+						<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<DigestValue/>
+					</Reference>
+				</Signature>
+			</Engine>
+			<Gearbox>
+				<Data id="GBX-N.A." xsi:type="GearboxDataDeclarationType">
+					<Manufacturer>Generic Vendor</Manufacturer>
+					<Model>N.A.</Model>
+					<CertificationNumber>GBX-N.A.</CertificationNumber>
+					<Date>2017-07-06T15:06:08.3133609Z</Date>
+					<AppVersion>VectoCore</AppVersion>
+					<TransmissionType>AMT</TransmissionType>
+					<MainCertificationMethod>Standard values</MainCertificationMethod>
+					<Gears xsi:type="GearsDeclarationType">
+						<Gear number="1">
+							<Ratio>14.930</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="2">
+							<Ratio>11.640</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="3">
+							<Ratio>9.020</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="4">
+							<Ratio>7.040</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="5">
+							<Ratio>5.640</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="6">
+							<Ratio>4.400</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="7">
+							<Ratio>3.390</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="8">
+							<Ratio>2.650</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="9">
+							<Ratio>2.050</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="10">
+							<Ratio>1.600</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="11">
+							<Ratio>1.280</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="12">
+							<Ratio>1.000</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="200.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-250.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="250.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="200.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="200.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-845.00" torqueLoss="17.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="17.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="845.00" torqueLoss="17.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="200.00"/>
+							</TorqueLossMap>
+						</Gear>
+					</Gears>
+				</Data>
+				<Signature>
+					<Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
+						<Transforms>
+							<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
+							<Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						</Transforms>
+						<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<DigestValue/>
+					</Reference>
+				</Signature>
+			</Gearbox>
+			<Retarder>
+				<Data id="RET-N.A." xsi:type="RetarderDataDeclarationType">
+					<Manufacturer>Generic Vendor</Manufacturer>
+					<Model>N.A.</Model>
+					<CertificationNumber>N/A</CertificationNumber>
+					<Date>2017-07-06T15:06:08.3133609Z</Date>
+					<AppVersion>VectoCore</AppVersion>
+					<CertificationMethod>Standard values</CertificationMethod>
+					<RetarderLossMap>
+						<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+						<Entry retarderSpeed="100.00" torqueLoss="10.00"/>
+						<Entry retarderSpeed="200.00" torqueLoss="10.10"/>
+						<Entry retarderSpeed="300.00" torqueLoss="10.20"/>
+						<Entry retarderSpeed="400.00" torqueLoss="10.30"/>
+						<Entry retarderSpeed="500.00" torqueLoss="10.50"/>
+						<Entry retarderSpeed="600.00" torqueLoss="10.70"/>
+						<Entry retarderSpeed="700.00" torqueLoss="11.00"/>
+						<Entry retarderSpeed="800.00" torqueLoss="11.30"/>
+						<Entry retarderSpeed="900.00" torqueLoss="11.60"/>
+						<Entry retarderSpeed="1000.00" torqueLoss="12.00"/>
+						<Entry retarderSpeed="1100.00" torqueLoss="12.40"/>
+						<Entry retarderSpeed="1200.00" torqueLoss="12.90"/>
+						<Entry retarderSpeed="1300.00" torqueLoss="13.40"/>
+						<Entry retarderSpeed="1400.00" torqueLoss="13.90"/>
+						<Entry retarderSpeed="1500.00" torqueLoss="14.50"/>
+						<Entry retarderSpeed="1600.00" torqueLoss="15.10"/>
+						<Entry retarderSpeed="1700.00" torqueLoss="15.80"/>
+						<Entry retarderSpeed="1800.00" torqueLoss="16.50"/>
+						<Entry retarderSpeed="1900.00" torqueLoss="17.20"/>
+						<Entry retarderSpeed="2000.00" torqueLoss="18.00"/>
+						<Entry retarderSpeed="2100.00" torqueLoss="18.80"/>
+						<Entry retarderSpeed="2200.00" torqueLoss="19.70"/>
+						<Entry retarderSpeed="2300.00" torqueLoss="20.60"/>
+						<Entry retarderSpeed="2400.00" torqueLoss="21.50"/>
+						<Entry retarderSpeed="2500.00" torqueLoss="22.50"/>
+						<Entry retarderSpeed="2600.00" torqueLoss="23.50"/>
+						<Entry retarderSpeed="2700.00" torqueLoss="24.60"/>
+						<Entry retarderSpeed="2800.00" torqueLoss="25.70"/>
+						<Entry retarderSpeed="2900.00" torqueLoss="26.80"/>
+						<Entry retarderSpeed="3000.00" torqueLoss="28.00"/>
+					</RetarderLossMap>
+				</Data>
+				<Signature>
+					<Reference URI="#RET-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
+						<Transforms>
+							<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
+							<Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						</Transforms>
+						<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<DigestValue/>
+					</Reference>
+				</Signature>
+			</Retarder>
+			<Axlegear>
+				<Data id="AXLGEAR-2.640" xsi:type="AxlegearDataDeclarationType">
+					<Manufacturer>Generic Vendor</Manufacturer>
+					<Model>N.A.</Model>
+					<CertificationNumber>AXLGEAR-2.640</CertificationNumber>
+					<Date>2017-07-06T15:06:08.3153609Z</Date>
+					<AppVersion>VectoCore</AppVersion>
+					<LineType>Single portal axle</LineType>
+					<Ratio>2.640</Ratio>
+					<CertificationMethod>Standard values</CertificationMethod>
+					<TorqueLossMap>
+						<Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+						<Entry inputSpeed="0.00" inputTorque="-50.00" torqueLoss="2.00"/>
+						<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="0.00"/>
+						<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="2.00"/>
+						<Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+						<Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+						<Entry inputSpeed="5000.00" inputTorque="-50.00" torqueLoss="2.00"/>
+						<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="0.00"/>
+						<Entry inputSpeed="5000.00" inputTorque="50.00" torqueLoss="2.00"/>
+						<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+					</TorqueLossMap>
+				</Data>
+				<Signature>
+					<Reference URI="#AXLGEAR-2.640" xmlns="http://www.w3.org/2000/09/xmldsig#">
+						<Transforms>
+							<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
+							<Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						</Transforms>
+						<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<DigestValue/>
+					</Reference>
+				</Signature>
+			</Axlegear>
+			<AxleWheels>
+				<Data xsi:type="AxleWheelsDataDeclarationType">
+					<Axles>
+						<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+							<AxleType>VehicleNonDriven</AxleType>
+							<TwinTyres>false</TwinTyres>
+							<Steered>true</Steered>
+							<Tyre>
+								<Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
+									<Manufacturer>Generic Vendor</Manufacturer>
+									<Model>315/70 R22.5</Model>
+									<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
+									<Date>2017-07-06T15:06:08.3153609Z</Date>
+									<AppVersion>VectoCore</AppVersion>
+									<Dimension>315/70 R22.5</Dimension>
+									<RRCDeclared>0.0051</RRCDeclared>
+									<FzISO>33350</FzISO>
+								</Data>
+								<Signature>
+									<Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
+										<Transforms>
+											<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
+											<Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+										</Transforms>
+										<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+										<DigestValue/>
+									</Reference>
+								</Signature>
+							</Tyre>
+						</Axle>
+						<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+							<AxleType>VehicleDriven</AxleType>
+							<TwinTyres>true</TwinTyres>
+							<Steered>false</Steered>
+							<Tyre>
+								<Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
+									<Manufacturer>Generic Vendor</Manufacturer>
+									<Model>315/70 R22.5</Model>
+									<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
+									<Date>2017-07-06T15:06:08.3153609Z</Date>
+									<AppVersion>VectoCore</AppVersion>
+									<Dimension>315/70 R22.5</Dimension>
+									<RRCDeclared>0.0061</RRCDeclared>
+									<FzISO>33350</FzISO>
+								</Data>
+								<Signature>
+									<Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
+										<Transforms>
+											<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
+											<Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+										</Transforms>
+										<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+										<DigestValue/>
+									</Reference>
+								</Signature>
+							</Tyre>
+						</Axle>
+					</Axles>
+				</Data>
+			</AxleWheels>
+			<Auxiliaries>
+				<Data xsi:type="AuxiliariesDataDeclarationType">
+					<Fan>
+						<Technology>Crankshaft mounted - Electronically controlled visco clutch</Technology>
+					</Fan>
+					<SteeringPump>
+						<Technology>Fixed displacement</Technology>
+					</SteeringPump>
+					<ElectricSystem>
+						<Technology>Standard technology</Technology>
+					</ElectricSystem>
+					<PneumaticSystem>
+						<Technology>Small</Technology>
+					</PneumaticSystem>
+					<HVAC>
+						<Technology>None</Technology>
+					</HVAC>
+				</Data>
+			</Auxiliaries>
+			<AirDrag>
+				<Data id="Airdrag-N.A." xsi:type="AirDragDataDeclarationType">
+					<Manufacturer>Generic Vendor</Manufacturer>
+					<Model>N.A.</Model>
+					<CertificationNumber>N.A.</CertificationNumber>
+					<Date>2017-07-06T15:06:08.3163609Z</Date>
+					<AppVersion>VectoCore</AppVersion>
+					<CdxA_0>5.45</CdxA_0>
+					<TransferredCdxA>5.45</TransferredCdxA>
+					<DeclaredCdxA>5.45</DeclaredCdxA>
+				</Data>
+				<Signature>
+					<Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
+						<Transforms>
+							<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
+							<Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						</Transforms>
+						<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<DigestValue/>
+					</Reference>
+				</Signature>
+			</AirDrag>
+		</v2.1:Components>
+	</v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_4x2_vehicle-class-5_EURO6_2018_WHR_mech.xml b/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_4x2_vehicle-class-5_EURO6_2018_WHR_mech.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b1bb88455971c6f321f170b92001c2aea28d7b5d
--- /dev/null
+++ b/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_4x2_vehicle-class-5_EURO6_2018_WHR_mech.xml
@@ -0,0 +1,593 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 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.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.2.0.xsd">
+	<v2.0:Vehicle id="VEH-Class5_whr-mech" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+		<Manufacturer>Generic Vendor</Manufacturer>
+		<ManufacturerAddress>N.A.</ManufacturerAddress>
+		<Model>N.A.</Model>
+		<VIN>N/A</VIN>
+		<Date>2017-07-06T15:06:08.3093609Z</Date>
+		<LegislativeClass>N3</LegislativeClass>
+		<VehicleCategory>Tractor</VehicleCategory>
+		<AxleConfiguration>4x2</AxleConfiguration>
+		<CurbMassChassis>8229</CurbMassChassis>
+		<GrossVehicleMass>18000</GrossVehicleMass>
+		<IdlingSpeed>600</IdlingSpeed>
+		<RetarderType>Transmission Output Retarder</RetarderType>
+		<RetarderRatio>1.000</RetarderRatio>
+		<AngledriveType>None</AngledriveType>
+		<v2.1:PTO xsi:type="PTOType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+			<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
+			<PTOOtherElements>none</PTOOtherElements>
+		</v2.1:PTO>
+		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+		<VocationalVehicle>false</VocationalVehicle>
+		<SleeperCab>false</SleeperCab>
+		<ADAS xsi:type="AdvancedDriverAssistantSystemsType">
+			<EngineStopStart>false</EngineStopStart>
+			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
+		</ADAS>
+		<v2.1:Components xsi:type="VehicleComponentsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+			<Engine>
+				<v2.0:Data id="ENG-N.A." xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+					<Manufacturer>Generic Vendor</Manufacturer>
+					<Model>N.A.</Model>
+					<CertificationNumber>ENG-N.A.</CertificationNumber>
+					<Date>2017-07-06T15:06:08.3103609Z</Date>
+					<AppVersion>VectoCore</AppVersion>
+					<Displacement>12740</Displacement>
+					<RatedSpeed>1736</RatedSpeed>
+					<RatedPower>325032</RatedPower>
+					<MaxEngineTorque>2134</MaxEngineTorque>
+					<WHRType>
+						<MechanicalOutputICE>false</MechanicalOutputICE>
+						<MechanicalOutputDrivetrain>true</MechanicalOutputDrivetrain>
+						<ElectricalOutput>false</ElectricalOutput>
+					</WHRType>
+					<Mode>
+						<IdlingSpeed>600</IdlingSpeed>
+						<FullLoadAndDragCurve>
+							<Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00"/>
+							<Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00"/>
+							<Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00"/>
+							<Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00"/>
+							<Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00"/>
+							<Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00"/>
+							<Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00"/>
+							<Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00"/>
+							<Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00"/>
+							<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00"/>
+						</FullLoadAndDragCurve>
+						<Fuel type="Diesel CI">
+							<WHTCUrban>1.0000</WHTCUrban>
+							<WHTCRural>1.0000</WHTCRural>
+							<WHTCMotorway>1.0000</WHTCMotorway>
+							<BFColdHot>1.0000</BFColdHot>
+							<CFRegPer>1.0000</CFRegPer>
+							<CFNCV>1.0000</CFNCV>
+							<WHRCorrectionFactors>
+								<Mechanical>
+									<Urban>1.0000</Urban>
+									<Rural>1.0000</Rural>
+									<Motorway>1.0000</Motorway>
+									<BFColdHot>1.0000</BFColdHot>
+									<CFRegPer>1.0000</CFRegPer>
+								</Mechanical>
+							</WHRCorrectionFactors>
+							<FuelConsumptionMap>
+								<Entry engineSpeed="600.00" torque="-139.00" fuelConsumption="0.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="600.00" torque="0.00" fuelConsumption="1355.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="600.00" torque="186.00" fuelConsumption="3118.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="600.00" torque="371.00" fuelConsumption="5105.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="600.00" torque="557.00" fuelConsumption="7522.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="600.00" torque="743.00" fuelConsumption="9298.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="600.00" torque="928.00" fuelConsumption="11208.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="600.00" torque="1114.00" fuelConsumption="13370.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="600.00" torque="1190.00" fuelConsumption="14252.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="800.00" torque="-144.00" fuelConsumption="0.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="800.00" torque="0.00" fuelConsumption="1745.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="800.00" torque="186.00" fuelConsumption="3979.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="800.00" torque="371.00" fuelConsumption="6824.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="800.00" torque="557.00" fuelConsumption="9340.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="800.00" torque="743.00" fuelConsumption="12150.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="800.00" torque="928.00" fuelConsumption="14870.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="800.00" torque="1114.00" fuelConsumption="17863.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="800.00" torque="1300.00" fuelConsumption="20822.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="800.00" torque="1486.00" fuelConsumption="23769.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="800.00" torque="1663.00" fuelConsumption="26838.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="-153.00" fuelConsumption="0.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="0.00" fuelConsumption="2660.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="186.00" fuelConsumption="5536.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="371.00" fuelConsumption="8540.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="557.00" fuelConsumption="11470.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="743.00" fuelConsumption="14823.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="928.00" fuelConsumption="18443.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="1114.00" fuelConsumption="21847.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="1300.00" fuelConsumption="25256.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="1486.00" fuelConsumption="28936.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="1671.00" fuelConsumption="32592.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="1857.00" fuelConsumption="36545.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="2043.00" fuelConsumption="40964.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1000.00" torque="2135.00" fuelConsumption="43486.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="-166.00" fuelConsumption="0.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="0.00" fuelConsumption="3070.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="186.00" fuelConsumption="6404.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="371.00" fuelConsumption="9889.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="557.00" fuelConsumption="13598.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="743.00" fuelConsumption="17748.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="928.00" fuelConsumption="21984.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="1114.00" fuelConsumption="26164.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="1300.00" fuelConsumption="30111.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="1486.00" fuelConsumption="34354.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="1671.00" fuelConsumption="38709.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="1857.00" fuelConsumption="43559.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="2043.00" fuelConsumption="48079.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1200.00" torque="2135.00" fuelConsumption="51003.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="-188.00" fuelConsumption="0.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="0.00" fuelConsumption="3998.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="186.00" fuelConsumption="7561.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="371.00" fuelConsumption="11813.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="557.00" fuelConsumption="16270.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="743.00" fuelConsumption="20694.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="928.00" fuelConsumption="25155.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="1114.00" fuelConsumption="30209.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="1300.00" fuelConsumption="35046.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="1486.00" fuelConsumption="40105.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="1671.00" fuelConsumption="45916.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="1857.00" fuelConsumption="51762.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="2043.00" fuelConsumption="56704.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1400.00" torque="2135.00" fuelConsumption="59772.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="-218.00" fuelConsumption="0.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="0.00" fuelConsumption="4836.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="186.00" fuelConsumption="8977.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="371.00" fuelConsumption="13777.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="557.00" fuelConsumption="18687.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="743.00" fuelConsumption="24042.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="928.00" fuelConsumption="29369.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="1114.00" fuelConsumption="34584.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="1300.00" fuelConsumption="40342.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="1486.00" fuelConsumption="46194.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="1671.00" fuelConsumption="52942.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="1857.00" fuelConsumption="59343.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1600.00" torque="1930.00" fuelConsumption="61762.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="-245.00" fuelConsumption="0.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="0.00" fuelConsumption="5951.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="186.00" fuelConsumption="10935.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="371.00" fuelConsumption="16081.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="557.00" fuelConsumption="21721.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="743.00" fuelConsumption="28319.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="928.00" fuelConsumption="33776.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="1114.00" fuelConsumption="39998.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="1300.00" fuelConsumption="46656.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="1486.00" fuelConsumption="53328.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="1671.00" fuelConsumption="60497.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="1800.00" torque="1724.00" fuelConsumption="62741.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="2000.00" torque="-279.00" fuelConsumption="0.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="2000.00" torque="0.00" fuelConsumption="8474.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="2000.00" torque="186.00" fuelConsumption="13762.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="2000.00" torque="371.00" fuelConsumption="19178.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="2000.00" torque="557.00" fuelConsumption="25139.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="2000.00" torque="743.00" fuelConsumption="31743.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="2000.00" torque="928.00" fuelConsumption="39773.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="2000.00" torque="1114.00" fuelConsumption="47369.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="2000.00" torque="1255.00" fuelConsumption="52568.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="2100.00" torque="-297.00" fuelConsumption="0.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="2100.00" torque="0.00" fuelConsumption="9721.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="2100.00" torque="186.00" fuelConsumption="15164.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="2100.00" torque="371.00" fuelConsumption="20794.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="2100.00" torque="557.00" fuelConsumption="26846.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="2100.00" torque="743.00" fuelConsumption="33162.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="2100.00" torque="928.00" fuelConsumption="42378.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="2100.00" torque="1021.00" fuelConsumption="47030.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="2200.00" torque="-315.00" fuelConsumption="0.00" mechanicalPower="500.00"/>
+								<Entry engineSpeed="2200.00" torque="0.00" fuelConsumption="12483.00" mechanicalPower="500.00"/>
+							</FuelConsumptionMap>
+						</Fuel>
+					</Mode>
+				</v2.0:Data>
+				<Signature>
+					<Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
+						<Transforms>
+							<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
+							<Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						</Transforms>
+						<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<DigestValue/>
+					</Reference>
+				</Signature>
+			</Engine>
+			<Gearbox>
+				<Data id="GBX-N.A." xsi:type="GearboxDataDeclarationType">
+					<Manufacturer>Generic Vendor</Manufacturer>
+					<Model>N.A.</Model>
+					<CertificationNumber>GBX-N.A.</CertificationNumber>
+					<Date>2017-07-06T15:06:08.3133609Z</Date>
+					<AppVersion>VectoCore</AppVersion>
+					<TransmissionType>AMT</TransmissionType>
+					<MainCertificationMethod>Standard values</MainCertificationMethod>
+					<Gears xsi:type="GearsDeclarationType">
+						<Gear number="1">
+							<Ratio>14.930</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="2">
+							<Ratio>11.640</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="3">
+							<Ratio>9.020</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="4">
+							<Ratio>7.040</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="5">
+							<Ratio>5.640</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="6">
+							<Ratio>4.400</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="7">
+							<Ratio>3.390</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="8">
+							<Ratio>2.650</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="9">
+							<Ratio>2.050</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="10">
+							<Ratio>1.600</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="11">
+							<Ratio>1.280</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="400.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="400.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="12">
+							<Ratio>1.000</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="200.00"/>
+								<Entry inputSpeed="0.00" inputTorque="-250.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="250.00" torqueLoss="5.00"/>
+								<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="200.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-10000.00" torqueLoss="200.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="-845.00" torqueLoss="17.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="17.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="845.00" torqueLoss="17.00"/>
+								<Entry inputSpeed="5000.00" inputTorque="10000.00" torqueLoss="200.00"/>
+							</TorqueLossMap>
+						</Gear>
+					</Gears>
+				</Data>
+				<Signature>
+					<Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
+						<Transforms>
+							<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
+							<Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						</Transforms>
+						<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<DigestValue/>
+					</Reference>
+				</Signature>
+			</Gearbox>
+			<Retarder>
+				<Data id="RET-N.A." xsi:type="RetarderDataDeclarationType">
+					<Manufacturer>Generic Vendor</Manufacturer>
+					<Model>N.A.</Model>
+					<CertificationNumber>N/A</CertificationNumber>
+					<Date>2017-07-06T15:06:08.3133609Z</Date>
+					<AppVersion>VectoCore</AppVersion>
+					<CertificationMethod>Standard values</CertificationMethod>
+					<RetarderLossMap>
+						<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
+						<Entry retarderSpeed="100.00" torqueLoss="10.00"/>
+						<Entry retarderSpeed="200.00" torqueLoss="10.10"/>
+						<Entry retarderSpeed="300.00" torqueLoss="10.20"/>
+						<Entry retarderSpeed="400.00" torqueLoss="10.30"/>
+						<Entry retarderSpeed="500.00" torqueLoss="10.50"/>
+						<Entry retarderSpeed="600.00" torqueLoss="10.70"/>
+						<Entry retarderSpeed="700.00" torqueLoss="11.00"/>
+						<Entry retarderSpeed="800.00" torqueLoss="11.30"/>
+						<Entry retarderSpeed="900.00" torqueLoss="11.60"/>
+						<Entry retarderSpeed="1000.00" torqueLoss="12.00"/>
+						<Entry retarderSpeed="1100.00" torqueLoss="12.40"/>
+						<Entry retarderSpeed="1200.00" torqueLoss="12.90"/>
+						<Entry retarderSpeed="1300.00" torqueLoss="13.40"/>
+						<Entry retarderSpeed="1400.00" torqueLoss="13.90"/>
+						<Entry retarderSpeed="1500.00" torqueLoss="14.50"/>
+						<Entry retarderSpeed="1600.00" torqueLoss="15.10"/>
+						<Entry retarderSpeed="1700.00" torqueLoss="15.80"/>
+						<Entry retarderSpeed="1800.00" torqueLoss="16.50"/>
+						<Entry retarderSpeed="1900.00" torqueLoss="17.20"/>
+						<Entry retarderSpeed="2000.00" torqueLoss="18.00"/>
+						<Entry retarderSpeed="2100.00" torqueLoss="18.80"/>
+						<Entry retarderSpeed="2200.00" torqueLoss="19.70"/>
+						<Entry retarderSpeed="2300.00" torqueLoss="20.60"/>
+						<Entry retarderSpeed="2400.00" torqueLoss="21.50"/>
+						<Entry retarderSpeed="2500.00" torqueLoss="22.50"/>
+						<Entry retarderSpeed="2600.00" torqueLoss="23.50"/>
+						<Entry retarderSpeed="2700.00" torqueLoss="24.60"/>
+						<Entry retarderSpeed="2800.00" torqueLoss="25.70"/>
+						<Entry retarderSpeed="2900.00" torqueLoss="26.80"/>
+						<Entry retarderSpeed="3000.00" torqueLoss="28.00"/>
+					</RetarderLossMap>
+				</Data>
+				<Signature>
+					<Reference URI="#RET-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
+						<Transforms>
+							<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
+							<Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						</Transforms>
+						<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<DigestValue/>
+					</Reference>
+				</Signature>
+			</Retarder>
+			<Axlegear>
+				<Data id="AXLGEAR-2.640" xsi:type="AxlegearDataDeclarationType">
+					<Manufacturer>Generic Vendor</Manufacturer>
+					<Model>N.A.</Model>
+					<CertificationNumber>AXLGEAR-2.640</CertificationNumber>
+					<Date>2017-07-06T15:06:08.3153609Z</Date>
+					<AppVersion>VectoCore</AppVersion>
+					<LineType>Single portal axle</LineType>
+					<Ratio>2.640</Ratio>
+					<CertificationMethod>Standard values</CertificationMethod>
+					<TorqueLossMap>
+						<Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+						<Entry inputSpeed="0.00" inputTorque="-50.00" torqueLoss="2.00"/>
+						<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="0.00"/>
+						<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="2.00"/>
+						<Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+						<Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+						<Entry inputSpeed="5000.00" inputTorque="-50.00" torqueLoss="2.00"/>
+						<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="0.00"/>
+						<Entry inputSpeed="5000.00" inputTorque="50.00" torqueLoss="2.00"/>
+						<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+					</TorqueLossMap>
+				</Data>
+				<Signature>
+					<Reference URI="#AXLGEAR-2.640" xmlns="http://www.w3.org/2000/09/xmldsig#">
+						<Transforms>
+							<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
+							<Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						</Transforms>
+						<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<DigestValue/>
+					</Reference>
+				</Signature>
+			</Axlegear>
+			<AxleWheels>
+				<Data xsi:type="AxleWheelsDataDeclarationType">
+					<Axles>
+						<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+							<AxleType>VehicleNonDriven</AxleType>
+							<TwinTyres>false</TwinTyres>
+							<Steered>true</Steered>
+							<Tyre>
+								<Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
+									<Manufacturer>Generic Vendor</Manufacturer>
+									<Model>315/70 R22.5</Model>
+									<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
+									<Date>2017-07-06T15:06:08.3153609Z</Date>
+									<AppVersion>VectoCore</AppVersion>
+									<Dimension>315/70 R22.5</Dimension>
+									<RRCDeclared>0.0051</RRCDeclared>
+									<FzISO>33350</FzISO>
+								</Data>
+								<Signature>
+									<Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
+										<Transforms>
+											<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
+											<Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+										</Transforms>
+										<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+										<DigestValue/>
+									</Reference>
+								</Signature>
+							</Tyre>
+						</Axle>
+						<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+							<AxleType>VehicleDriven</AxleType>
+							<TwinTyres>true</TwinTyres>
+							<Steered>false</Steered>
+							<Tyre>
+								<Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
+									<Manufacturer>Generic Vendor</Manufacturer>
+									<Model>315/70 R22.5</Model>
+									<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
+									<Date>2017-07-06T15:06:08.3153609Z</Date>
+									<AppVersion>VectoCore</AppVersion>
+									<Dimension>315/70 R22.5</Dimension>
+									<RRCDeclared>0.0061</RRCDeclared>
+									<FzISO>33350</FzISO>
+								</Data>
+								<Signature>
+									<Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
+										<Transforms>
+											<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
+											<Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+										</Transforms>
+										<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+										<DigestValue/>
+									</Reference>
+								</Signature>
+							</Tyre>
+						</Axle>
+					</Axles>
+				</Data>
+			</AxleWheels>
+			<Auxiliaries>
+				<Data xsi:type="AuxiliariesDataDeclarationType">
+					<Fan>
+						<Technology>Crankshaft mounted - Electronically controlled visco clutch</Technology>
+					</Fan>
+					<SteeringPump>
+						<Technology>Fixed displacement</Technology>
+					</SteeringPump>
+					<ElectricSystem>
+						<Technology>Standard technology</Technology>
+					</ElectricSystem>
+					<PneumaticSystem>
+						<Technology>Small</Technology>
+					</PneumaticSystem>
+					<HVAC>
+						<Technology>None</Technology>
+					</HVAC>
+				</Data>
+			</Auxiliaries>
+			<AirDrag>
+				<Data id="Airdrag-N.A." xsi:type="AirDragDataDeclarationType">
+					<Manufacturer>Generic Vendor</Manufacturer>
+					<Model>N.A.</Model>
+					<CertificationNumber>N.A.</CertificationNumber>
+					<Date>2017-07-06T15:06:08.3163609Z</Date>
+					<AppVersion>VectoCore</AppVersion>
+					<CdxA_0>5.45</CdxA_0>
+					<TransferredCdxA>5.45</TransferredCdxA>
+					<DeclaredCdxA>5.45</DeclaredCdxA>
+				</Data>
+				<Signature>
+					<Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
+						<Transforms>
+							<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments"/>
+							<Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+						</Transforms>
+						<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<DigestValue/>
+					</Reference>
+				</Signature>
+			</AirDrag>
+		</v2.1:Components>
+	</v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCommon/VectoCommon/Exceptions/VectoExceptions.cs b/VectoCommon/VectoCommon/Exceptions/VectoExceptions.cs
index eca67ccfb1ae03c38411dcaad5eb89a95fdb8ed7..725d24157b2643680f26704af197cef722c91c27 100644
--- a/VectoCommon/VectoCommon/Exceptions/VectoExceptions.cs
+++ b/VectoCommon/VectoCommon/Exceptions/VectoExceptions.cs
@@ -66,6 +66,15 @@ namespace TUGraz.VectoCommon.Exceptions
 		}
 	}
 
+	public class VectoXMLException : VectoException
+	{
+		protected VectoXMLException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+		public VectoXMLException(string message) : base(message) { }
+		public VectoXMLException(string message, Exception innerException) : base(message, innerException) { }
+		public VectoXMLException(string message, params object[] args) : base(message, args) { }
+		public VectoXMLException(string message, Exception inner, params object[] args) : base(message, inner, args) { }
+	}
+
 	/// <summary>
 	/// Exception when an Input/Output related error occured.
 	/// </summary>
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
index 385979fd8da9c379b8b350f304ad838022c6c950..d1bd0cce20862520ffb1dd02ac5895cb88396a1f 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
@@ -19,7 +19,7 @@ namespace TUGraz.VectoCommon.Resources {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class XMLNames {
@@ -1113,6 +1113,42 @@ namespace TUGraz.VectoCommon.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to electricPower.
+        /// </summary>
+        public static string Engine_FuelConsumptionMap_WHRElPower_Attr {
+            get {
+                return ResourceManager.GetString("Engine_FuelConsumptionMap_WHRElPower_Attr", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to mechanicalPower.
+        /// </summary>
+        public static string Engine_FuelConsumptionMap_WHRMechPower_Attr {
+            get {
+                return ResourceManager.GetString("Engine_FuelConsumptionMap_WHRMechPower_Attr", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Mode.
+        /// </summary>
+        public static string Engine_FuelModes {
+            get {
+                return ResourceManager.GetString("Engine_FuelModes", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Fuel.
+        /// </summary>
+        public static string Engine_FuelModes_Fuel {
+            get {
+                return ResourceManager.GetString("Engine_FuelModes_Fuel", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to FuelType.
         /// </summary>
@@ -1203,6 +1239,141 @@ namespace TUGraz.VectoCommon.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to ElectricalOutput.
+        /// </summary>
+        public static string Engine_WHR_ElectricalOutput {
+            get {
+                return ResourceManager.GetString("Engine_WHR_ElectricalOutput", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to MechanicalOutputICE.
+        /// </summary>
+        public static string Engine_WHR_MechanicalOutputICE {
+            get {
+                return ResourceManager.GetString("Engine_WHR_MechanicalOutputICE", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to MechanicalOutputDrivetrain.
+        /// </summary>
+        public static string Engine_WHR_MechanicalOutputIDrivetrain {
+            get {
+                return ResourceManager.GetString("Engine_WHR_MechanicalOutputIDrivetrain", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to WHRCorrection.
+        /// </summary>
+        public static string Engine_WHRCorrectionFactor {
+            get {
+                return ResourceManager.GetString("Engine_WHRCorrectionFactor", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to WHRCorrectionFactors.
+        /// </summary>
+        public static string Engine_WHRCorrectionFactors {
+            get {
+                return ResourceManager.GetString("Engine_WHRCorrectionFactors", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to BFColdHot.
+        /// </summary>
+        public static string Engine_WHRCorrectionFactors_BFColdHot {
+            get {
+                return ResourceManager.GetString("Engine_WHRCorrectionFactors_BFColdHot", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to CFRegPer.
+        /// </summary>
+        public static string Engine_WHRCorrectionFactors_CFRegPer {
+            get {
+                return ResourceManager.GetString("Engine_WHRCorrectionFactors_CFRegPer", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Electrical.
+        /// </summary>
+        public static string Engine_WHRCorrectionFactors_Electrical {
+            get {
+                return ResourceManager.GetString("Engine_WHRCorrectionFactors_Electrical", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Mechanical.
+        /// </summary>
+        public static string Engine_WHRCorrectionFactors_Mechanical {
+            get {
+                return ResourceManager.GetString("Engine_WHRCorrectionFactors_Mechanical", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Motorway.
+        /// </summary>
+        public static string Engine_WHRCorrectionFactors_Motorway {
+            get {
+                return ResourceManager.GetString("Engine_WHRCorrectionFactors_Motorway", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rural.
+        /// </summary>
+        public static string Engine_WHRCorrectionFactors_Rural {
+            get {
+                return ResourceManager.GetString("Engine_WHRCorrectionFactors_Rural", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Urban.
+        /// </summary>
+        public static string Engine_WHRCorrectionFactors_Urban {
+            get {
+                return ResourceManager.GetString("Engine_WHRCorrectionFactors_Urban", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to WHRMap.
+        /// </summary>
+        public static string Engine_WHRMap {
+            get {
+                return ResourceManager.GetString("Engine_WHRMap", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Entry.
+        /// </summary>
+        public static string Engine_WHRMap_Entry {
+            get {
+                return ResourceManager.GetString("Engine_WHRMap_Entry", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to WHRType.
+        /// </summary>
+        public static string Engine_WHRType {
+            get {
+                return ResourceManager.GetString("Engine_WHRType", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to WHTCEngineering.
         /// </summary>
@@ -2409,6 +2580,15 @@ namespace TUGraz.VectoCommon.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to EcoRoll.
+        /// </summary>
+        public static string Vehicle_ADAS_EcoRoll {
+            get {
+                return ResourceManager.GetString("Vehicle_ADAS_EcoRoll", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to EcoRollWithEngineStop.
         /// </summary>
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx
index 2f8334f99b9891d32a42093efba35c2ea9b0b433..970e333b56ac4bd5b8f7e76416749c4fc2641438 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.resx
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx
@@ -975,7 +975,67 @@
   <data name="Vehicle_MaxNetPower2" xml:space="preserve">
     <value>MaxNetPower2</value>
   </data>
-  <data name="Vehicle_ADAS" xml:space="preserve">
+<data name="Engine_FuelModes" xml:space="preserve">
+    <value>Mode</value>
+  </data>
+<data name="Engine_FuelModes_Fuel" xml:space="preserve">
+    <value>Fuel</value>
+  </data>
+<data name="Engine_WHRCorrectionFactors_Urban" xml:space="preserve">
+    <value>Urban</value>
+  </data>
+<data name="Engine_WHRCorrectionFactors_Rural" xml:space="preserve">
+    <value>Rural</value>
+  </data>
+<data name="Engine_WHRCorrectionFactors_Motorway" xml:space="preserve">
+    <value>Motorway</value>
+  </data>
+<data name="Engine_WHRCorrectionFactors_BFColdHot" xml:space="preserve">
+    <value>BFColdHot</value>
+  </data>
+<data name="Engine_WHRCorrectionFactors_CFRegPer" xml:space="preserve">
+    <value>CFRegPer</value>
+  </data>
+<data name="Engine_WHRType" xml:space="preserve">
+    <value>WHRType</value>
+  </data>
+<data name="Engine_WHRCorrectionFactors_Mechanical" xml:space="preserve">
+    <value>Mechanical</value>
+  </data>
+<data name="Engine_FuelConsumptionMap_WHRMechPower_Attr" xml:space="preserve">
+    <value>mechanicalPower</value>
+  </data>
+<data name="Engine_WHR_MechanicalOutputICE" xml:space="preserve">
+    <value>MechanicalOutputICE</value>
+  </data>
+<data name="Engine_WHR_MechanicalOutputIDrivetrain" xml:space="preserve">
+    <value>MechanicalOutputDrivetrain</value>
+  </data>
+<data name="Engine_WHR_ElectricalOutput" xml:space="preserve">
+    <value>ElectricalOutput</value>
+  </data>
+<data name="Engine_WHRCorrectionFactors" xml:space="preserve">
+    <value>WHRCorrectionFactors</value>
+  </data>
+<data name="Engine_WHRCorrectionFactors_Electrical" xml:space="preserve">
+    <value>Electrical</value>
+  </data>
+<data name="Engine_FuelConsumptionMap_WHRElPower_Attr" xml:space="preserve">
+    <value>electricPower</value>
+  </data>
+<data name="Vehicle_ADAS_EcoRoll" xml:space="preserve">
+    <value>EcoRoll</value>
+  </data>
+<data name="Engine_WHRCorrectionFactor" xml:space="preserve">
+    <value>WHRCorrection</value>
+  </data>
+<data name="Engine_WHRMap_Entry" xml:space="preserve">
+    <value>Entry</value>
+  </data>
+<data name="Engine_WHRMap" xml:space="preserve">
+    <value>WHRMap</value>
+  </data>
+<data name="Vehicle_ADAS" xml:space="preserve">
     <value>ADAS</value>
   </data>
   <data name="Vehicle_ADAS_PCC" xml:space="preserve">
diff --git a/VectoCommon/VectoCommon/Utils/EnumerableExtensionMethods.cs b/VectoCommon/VectoCommon/Utils/EnumerableExtensionMethods.cs
index f54fb57c083c5b065e50f189791fc6b74d053bf1..da6c24e21ffc1f3ed7bf856ab50ea9045779b3c7 100644
--- a/VectoCommon/VectoCommon/Utils/EnumerableExtensionMethods.cs
+++ b/VectoCommon/VectoCommon/Utils/EnumerableExtensionMethods.cs
@@ -39,6 +39,9 @@ namespace TUGraz.VectoCommon.Utils
 {
 	public static class EnumerableExtensionMethods
 	{
+		public static string Join<T>(this IEnumerable<T> list, string separator = ", ") =>
+			string.Join(separator, list ?? Enumerable.Empty<T>());
+
 		public static T[] Slice<T>(this T[] source, int start, int end)
 		{
 			if (start < 0)
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ADC.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ADC.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5e1df42c655a57f5b7af58991947fd71d5b41809
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ADC.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:ADC>
+        <Data xsi:type="ADCDataDeclarationType" id="ADC-123">
+            <Manufacturer>Generic Vendor</Manufacturer>
+            <Model>ADC 20</Model>
+            <CertificationNumber>ADC-20-CERT</CertificationNumber>
+            <Date>2021-11-18T14:09:17.2810263Z</Date>
+            <AppVersion>VectoCore</AppVersion>
+            <Ratio>0.035</Ratio>
+            <CertificationMethod>Option 1</CertificationMethod>
+            <TorqueLossMap>
+			    <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+				<Entry inputSpeed="4000.00" inputTorque="-680.00" torqueLoss="31.00" />
+				<Entry inputSpeed="4000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+				<Entry inputSpeed="4000.00" inputTorque="680.00" torqueLoss="31.00" />
+				<Entry inputSpeed="4000.00" inputTorque="60000.00" torqueLoss="2000.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+				<Entry inputSpeed="4000.00" inputTorque="-60000.00" torqueLoss="2000.00" />
+
+                <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+
+            </TorqueLossMap>
+			<!-- <FooBarElement></FooBarElement> -->
+        </Data>
+     </tns:ADC>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ADC_hashed.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ADC_hashed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bfe23808f16045ac27c39d8769e228d813cb00fe
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ADC_hashed.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:ADC>
+        <Data xsi:type="ADCDataDeclarationType" id="ADC-123">
+            <Manufacturer>Generic Vendor</Manufacturer>
+            <Model>ADC 20</Model>
+            <CertificationNumber>ADC-20-CERT</CertificationNumber>
+            <Date>2022-03-15T09:44:59.5844849Z</Date>
+            <AppVersion>VectoCore</AppVersion>
+            <Ratio>0.035</Ratio>
+            <CertificationMethod>Option 1</CertificationMethod>
+            <TorqueLossMap>
+                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                <Entry inputSpeed="4000.00" inputTorque="-680.00" torqueLoss="31.00" />
+                <Entry inputSpeed="4000.00" inputTorque="0.00" torqueLoss="31.00" />
+                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                <Entry inputSpeed="4000.00" inputTorque="680.00" torqueLoss="31.00" />
+                <Entry inputSpeed="4000.00" inputTorque="60000.00" torqueLoss="2000.00" />
+                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                <Entry inputSpeed="4000.00" inputTorque="-60000.00" torqueLoss="2000.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+            </TorqueLossMap>
+            <!-- <FooBarElement></FooBarElement> -->
+        </Data>
+        <Signature>
+            <di:Reference URI="#ADC-123">
+                <di:Transforms>
+                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </di:Transforms>
+                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <di:DigestValue>EMAHEupP8X1sCjh85U3SZX8pv/gWKvL/GhgRGfr+0xU=</di:DigestValue>
+            </di:Reference>
+        </Signature>
+    </tns:ADC>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Angledrive.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Angledrive.xml
new file mode 100644
index 0000000000000000000000000000000000000000..80b342837d3cd62361f57cbf20d59a9d19d0d4c5
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Angledrive.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:Angledrive>
+        <v2.0:Data xsi:type="AngledriveDataDeclarationType" id="ANGL-asdf">           
+         <Manufacturer>Generic Vendor</Manufacturer>
+         <Model>Generic Model</Model>
+         <CertificationNumber>ANGL-1234</CertificationNumber>
+         <Date>2021-11-18T14:09:17.2810263Z</Date>
+         <AppVersion>aaaaa</AppVersion>
+         <Ratio>1.123</Ratio>
+         <CertificationMethod>Option 1</CertificationMethod>
+		<TorqueLossMap>
+			<Entry inputSpeed="800.00" inputTorque="0.00" torqueLoss="10.00" />
+			<Entry inputSpeed="800.00" inputTorque="1200.00" torqueLoss="100.00" />
+			<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00" />
+			<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00" />
+			<Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00" />
+			<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00" />
+			<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00" />
+			<Entry inputSpeed="800.00" inputTorque="-1200.00" torqueLoss="100.00" />
+
+			<Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00" />
+
+		</TorqueLossMap>
+        </v2.0:Data>
+
+    </tns:Angledrive>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Angledrive_hashed.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Angledrive_hashed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..12c3f7a2fe2473def12d5e86693be569670ee696
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Angledrive_hashed.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:Angledrive>
+        <v2.0:Data xsi:type="AngledriveDataDeclarationType" id="ANGL-asdf">
+            <v2.0:Manufacturer>Generic Vendor</v2.0:Manufacturer>
+            <v2.0:Model>Generic Model</v2.0:Model>
+            <v2.0:CertificationNumber>ANGL-1234</v2.0:CertificationNumber>
+            <v2.0:Date>2022-03-15T08:07:47.3247043Z</v2.0:Date>
+            <v2.0:AppVersion>aaaaa</v2.0:AppVersion>
+            <v2.0:Ratio>1.123</v2.0:Ratio>
+            <v2.0:CertificationMethod>Option 1</v2.0:CertificationMethod>
+            <v2.0:TorqueLossMap>
+                <v2.0:Entry inputSpeed="800.00" inputTorque="0.00" torqueLoss="10.00" />
+                <v2.0:Entry inputSpeed="800.00" inputTorque="1200.00" torqueLoss="100.00" />
+                <v2.0:Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00" />
+                <v2.0:Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00" />
+                <v2.0:Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00" />
+                <v2.0:Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00" />
+                <v2.0:Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00" />
+                <v2.0:Entry inputSpeed="800.00" inputTorque="-1200.00" torqueLoss="100.00" />
+                <v2.0:Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00" />
+            </v2.0:TorqueLossMap>
+        </v2.0:Data>
+        <v2.0:Signature>
+            <di:Reference URI="#ANGL-asdf">
+                <di:Transforms>
+                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </di:Transforms>
+                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <di:DigestValue>asw2ba3MdPZnNCJLjaSzGfqKGWAn8RaZPUPaTyMB0Qg=</di:DigestValue>
+            </di:Reference>
+        </v2.0:Signature>
+    </tns:Angledrive>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Axlegear.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Axlegear.xml
new file mode 100644
index 0000000000000000000000000000000000000000..42de7b65f1c04694d321fd6374309c33836e86e9
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Axlegear.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:Axlegear>
+        <v2.0:Data xsi:type="AxlegearDataDeclarationType" id="AXL-asdf">            
+         <Manufacturer>Generic Vendor</Manufacturer>
+         <Model>Generic Model</Model>
+         <CertificationNumber>AXL-AXL_12</CertificationNumber>
+         <Date>2021-11-18T14:23:31.4958567Z</Date>
+         <AppVersion>VectoCore</AppVersion>
+         <LineType>Single portal axle</LineType>
+         <Ratio>1.000</Ratio>
+         <CertificationMethod>Measured</CertificationMethod>
+         <TorqueLossMap>
+		 	<Entry inputSpeed="4000.00" inputTorque="-788.10" torqueLoss="31.10" />
+			<Entry inputSpeed="4000.00" inputTorque="0.11" torqueLoss="31.10" />
+			<Entry inputSpeed="0.00" inputTorque="-50000.10" torqueLoss="2000.10" />
+			<Entry inputSpeed="0.00" inputTorque="50000.10" torqueLoss="2000.10" />
+			<Entry inputSpeed="4000.00" inputTorque="-60000.10" torqueLoss="2000.10" />
+			<Entry inputSpeed="5000.00" inputTorque="-50000.10" torqueLoss="2000.10" />
+			<Entry inputSpeed="4000.00" inputTorque="788.10" torqueLoss="31.10" />
+			<Entry inputSpeed="5000.00" inputTorque="780.10" torqueLoss="31.10" />
+			<Entry inputSpeed="5000.00" inputTorque="50000.10" torqueLoss="2000.10" />
+			<Entry inputSpeed="0.00" inputTorque="-125.10" torqueLoss="5.10" />
+			<Entry inputSpeed="0.00" inputTorque="0.10" torqueLoss="5.10" />
+			<Entry inputSpeed="0.00" inputTorque="125.10" torqueLoss="5.10" />
+			<Entry inputSpeed="5000.00" inputTorque="-780.10" torqueLoss="31.10" />
+			<Entry inputSpeed="5000.00" inputTorque="0.10" torqueLoss="31.10" />
+			<Entry inputSpeed="4000.00" inputTorque="60000.10" torqueLoss="2000.10" />
+		</TorqueLossMap>
+        </v2.0:Data>
+    </tns:Axlegear>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Axlegear_hashed.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Axlegear_hashed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5873a17603c4a0e0cb3b1980329195a8e64aba56
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Axlegear_hashed.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:Axlegear>
+        <Data xsi:type="AxlegearDataDeclarationType" id="AXL-asdf">
+            <Manufacturer>Generic Vendor</Manufacturer>
+            <Model>Generic Model</Model>
+            <CertificationNumber>AXL-AXL_12</CertificationNumber>
+            <Date>2022-03-15T07:56:55.9921729Z</Date>
+            <AppVersion>VectoCore</AppVersion>
+            <LineType>Single portal axle</LineType>
+            <Ratio>1.000</Ratio>
+            <CertificationMethod>Measured</CertificationMethod>
+            <TorqueLossMap>
+                <Entry inputSpeed="4000.00" inputTorque="-788.10" torqueLoss="31.10" />
+                <Entry inputSpeed="4000.00" inputTorque="0.11" torqueLoss="31.10" />
+                <Entry inputSpeed="0.00" inputTorque="-50000.10" torqueLoss="2000.10" />
+                <Entry inputSpeed="0.00" inputTorque="50000.10" torqueLoss="2000.10" />
+                <Entry inputSpeed="4000.00" inputTorque="-60000.10" torqueLoss="2000.10" />
+                <Entry inputSpeed="5000.00" inputTorque="-50000.10" torqueLoss="2000.10" />
+                <Entry inputSpeed="4000.00" inputTorque="788.10" torqueLoss="31.10" />
+                <Entry inputSpeed="5000.00" inputTorque="780.10" torqueLoss="31.10" />
+                <Entry inputSpeed="5000.00" inputTorque="50000.10" torqueLoss="2000.10" />
+                <Entry inputSpeed="0.00" inputTorque="-125.10" torqueLoss="5.10" />
+                <Entry inputSpeed="0.00" inputTorque="0.10" torqueLoss="5.10" />
+                <Entry inputSpeed="0.00" inputTorque="125.10" torqueLoss="5.10" />
+                <Entry inputSpeed="5000.00" inputTorque="-780.10" torqueLoss="31.10" />
+                <Entry inputSpeed="5000.00" inputTorque="0.10" torqueLoss="31.10" />
+                <Entry inputSpeed="4000.00" inputTorque="60000.10" torqueLoss="2000.10" />
+            </TorqueLossMap>
+        </Data>
+        <Signature>
+            <di:Reference URI="#AXL-asdf">
+                <di:Transforms>
+                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </di:Transforms>
+                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <di:DigestValue>qHzQhldCbAWKb/fZNpesx4TUa3NkLWySQUK4L8Ahapk=</di:DigestValue>
+            </di:Reference>
+        </Signature>
+    </tns:Axlegear>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/BatterySystem_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/BatterySystem_1.xml
new file mode 100644
index 0000000000000000000000000000000000000000..421463d9a5c8dca077d2b1b929e67e8eae2b93e6
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/BatterySystem_1.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:BatterySystem>
+        <Data xsi:type="BatterySystemDataType" id="BAT-asdf">
+            <Manufacturer>a</Manufacturer>
+            <Model>a</Model>
+            <CertificationNumber>token</CertificationNumber>
+            <Date>2021-11-18T14:11:51.3452323Z</Date>
+            <AppVersion>aaaaa</AppVersion>
+            <CertificationMethod>Measured</CertificationMethod>
+            <BatteryType>HPBS</BatteryType>
+            <RatedCapacity>72.00</RatedCapacity>
+            <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+            <JunctionboxIncluded>true</JunctionboxIncluded>
+            <TestingTemperature>20</TestingTemperature>
+            <OCV>
+				<Entry SoC="88" OCV="640.00" />
+				<Entry SoC="89" OCV="641.00" />
+                <Entry SoC="0" OCV="620.00" />
+                <Entry SoC="100" OCV="640.00" />
+            </OCV>
+            <InternalResistance>
+				<Entry SoC="88" R_2="14.00" R_10="14.00" R_20="16.00" />
+                <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00" />
+				<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00" />
+				<Entry SoC="88" R_2="13.00" R_10="14.00" R_20="16.00" />
+            </InternalResistance>
+            <CurrentLimits>
+				<Entry SoC="88" maxChargingCurrent="21.00" maxDischargingCurrent="50.00" />
+                <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00" />
+				<Entry SoC="88" maxChargingCurrent="20.00" maxDischargingCurrent="50.00" />
+                <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00" />
+
+            </CurrentLimits>
+        </Data>
+       
+    </tns:BatterySystem>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/BatterySystem_1_hashed.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/BatterySystem_1_hashed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a44059c68d34d1fdd4226621bd62181ad1705768
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/BatterySystem_1_hashed.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:BatterySystem>
+        <v2.3:Data xsi:type="BatterySystemDataType" id="BAT-asdf">
+            <v2.3:Manufacturer>a</v2.3:Manufacturer>
+            <v2.3:Model>a</v2.3:Model>
+            <v2.3:CertificationNumber>token</v2.3:CertificationNumber>
+            <v2.3:Date>2022-03-15T08:08:02.3716173Z</v2.3:Date>
+            <v2.3:AppVersion>aaaaa</v2.3:AppVersion>
+            <v2.3:CertificationMethod>Measured</v2.3:CertificationMethod>
+            <v2.3:BatteryType>HPBS</v2.3:BatteryType>
+            <v2.3:RatedCapacity>72.00</v2.3:RatedCapacity>
+            <v2.3:ConnectorsSubsystemsIncluded>true</v2.3:ConnectorsSubsystemsIncluded>
+            <v2.3:JunctionboxIncluded>true</v2.3:JunctionboxIncluded>
+            <v2.3:TestingTemperature>20</v2.3:TestingTemperature>
+            <v2.3:OCV>
+                <v2.3:Entry SoC="88" OCV="640.00" />
+                <v2.3:Entry SoC="89" OCV="641.00" />
+                <v2.3:Entry SoC="0" OCV="620.00" />
+                <v2.3:Entry SoC="100" OCV="640.00" />
+            </v2.3:OCV>
+            <v2.3:InternalResistance>
+                <v2.3:Entry SoC="88" R_2="14.00" R_10="14.00" R_20="16.00" />
+                <v2.3:Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00" />
+                <v2.3:Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00" />
+                <v2.3:Entry SoC="88" R_2="13.00" R_10="14.00" R_20="16.00" />
+            </v2.3:InternalResistance>
+            <v2.3:CurrentLimits>
+                <v2.3:Entry SoC="88" maxChargingCurrent="21.00" maxDischargingCurrent="50.00" />
+                <v2.3:Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00" />
+                <v2.3:Entry SoC="88" maxChargingCurrent="20.00" maxDischargingCurrent="50.00" />
+                <v2.3:Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00" />
+            </v2.3:CurrentLimits>
+        </v2.3:Data>
+        <v2.3:Signature>
+            <di:Reference URI="#BAT-asdf">
+                <di:Transforms>
+                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </di:Transforms>
+                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <di:DigestValue>BQ4EAWXDJzzw5Vg2DvTKN4PP/gXDBwuFUdPuRnFoVZc=</di:DigestValue>
+            </di:Reference>
+        </v2.3:Signature>
+    </tns:BatterySystem>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/CapacitorSystem_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/CapacitorSystem_1.xml
new file mode 100644
index 0000000000000000000000000000000000000000..630d0683feeb2c6be78c17e7ddc8923fe4c8d10b
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/CapacitorSystem_1.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:CapacitorSystem>
+        <Data xsi:type="v2.3:CapacitorSystemDataType" id="CAP-asdf">
+            <Manufacturer>a</Manufacturer>
+            <Model>a</Model>
+            <CertificationNumber>token</CertificationNumber>
+            <Date>2021-11-18T14:14:06.0791626Z</Date>
+            <AppVersion>aaaaa</AppVersion>
+            <CertificationMethod>Measured</CertificationMethod>
+            <Capacitance>1.00</Capacitance>
+            <InternalResistance>23.45</InternalResistance>
+            <MinVoltage>3.55</MinVoltage>
+            <MaxVoltage>30.45</MaxVoltage>
+            <MaxChargingCurrent>100.00</MaxChargingCurrent>
+            <MaxDischargingCurrent>99.45</MaxDischargingCurrent>
+            <TestingTemperature>30</TestingTemperature>
+        </Data>
+    </tns:CapacitorSystem>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/CapacitorSystem_1_hashed.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/CapacitorSystem_1_hashed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ba7cc3df2b95bfaccb9b3ce342e081c3a5c31279
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/CapacitorSystem_1_hashed.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:CapacitorSystem>
+        <v2.3:Data xsi:type="v2.3:CapacitorSystemDataType" id="CAP-asdf">
+            <v2.3:Manufacturer>a</v2.3:Manufacturer>
+            <v2.3:Model>a</v2.3:Model>
+            <v2.3:CertificationNumber>token</v2.3:CertificationNumber>
+            <v2.3:Date>2022-03-15T08:08:17.841244Z</v2.3:Date>
+            <v2.3:AppVersion>aaaaa</v2.3:AppVersion>
+            <v2.3:CertificationMethod>Measured</v2.3:CertificationMethod>
+            <v2.3:Capacitance>1.00</v2.3:Capacitance>
+            <v2.3:InternalResistance>23.45</v2.3:InternalResistance>
+            <v2.3:MinVoltage>3.55</v2.3:MinVoltage>
+            <v2.3:MaxVoltage>30.45</v2.3:MaxVoltage>
+            <v2.3:MaxChargingCurrent>100.00</v2.3:MaxChargingCurrent>
+            <v2.3:MaxDischargingCurrent>99.45</v2.3:MaxDischargingCurrent>
+            <v2.3:TestingTemperature>30</v2.3:TestingTemperature>
+        </v2.3:Data>
+        <v2.3:Signature>
+            <di:Reference URI="#CAP-asdf">
+                <di:Transforms>
+                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </di:Transforms>
+                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <di:DigestValue>eyp7l0REvKF7yJKRvv9O8jR2xi0ozKYtWjYSNCwkJN0=</di:DigestValue>
+            </di:Reference>
+        </v2.3:Signature>
+    </tns:CapacitorSystem>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ElectricMachineSystem-IHPC_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ElectricMachineSystem-IHPC_1.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9810c7ba03a7ea18c38f12dd91e45981381dfbb5
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ElectricMachineSystem-IHPC_1.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:ElectricMachineSystem>
+        <Data xsi:type="ElectricMachineSystemIHPCMeasuredDataDeclarationType" id="EM-asdf">
+            <Manufacturer>a</Manufacturer>
+            <Model>a</Model>
+            <CertificationNumber>token</CertificationNumber>
+            <Date>2021-11-18T14:22:33.399635Z</Date>
+            <AppVersion>aaaaa</AppVersion>
+            <ElectricMachineType>ASM</ElectricMachineType>
+            <CertificationMethod>Measured</CertificationMethod>
+            <R85RatedPower>1</R85RatedPower>
+            <RotationalInertia>0.10</RotationalInertia>
+            <DcDcConverterIncluded>true</DcDcConverterIncluded>
+            <IHPCType>IHPC Type 1</IHPCType>
+ 
+			<VoltageLevel>
+				<Voltage>500</Voltage>
+				<ContinuousTorque>200.00</ContinuousTorque>
+				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+				<OverloadTorque>400.00</OverloadTorque>
+				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+				<OverloadDuration>30.00</OverloadDuration>
+				<MaxTorqueCurve>
+					<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+					<Entry outShaftSpeed="5000.00" maxTorque="100.00" minTorque="-100.00"/>
+					<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+
+				</MaxTorqueCurve>
+				<PowerMap gear="1">
+					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+
+					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+				</PowerMap>
+				<PowerMap gear="3">
+					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+				</PowerMap>
+				<PowerMap gear="2">
+					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+				</PowerMap>
+
+			</VoltageLevel>
+			<VoltageLevel>
+                <Voltage>400</Voltage>
+                <ContinuousTorque>200.00</ContinuousTorque>
+				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+				<OverloadTorque>400.00</OverloadTorque>
+				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+				<OverloadDuration>30.00</OverloadDuration>
+                <MaxTorqueCurve>
+					<Entry outShaftSpeed="4001.00" maxTorque="101.00" minTorque="-100.00"/>
+                    <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+                    <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+
+                </MaxTorqueCurve>
+                <PowerMap gear="1">
+				    <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+                    <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+                    <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+                    <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+                </PowerMap>
+				<PowerMap gear="3">
+					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+				</PowerMap>
+                <PowerMap gear="2">
+				    <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+                    <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+                    <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+                    <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+                </PowerMap>
+
+            </VoltageLevel>
+			
+			
+			<VoltageLevel>
+                <Voltage>600</Voltage>
+                <ContinuousTorque>200.00</ContinuousTorque>
+				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+				<OverloadTorque>400.00</OverloadTorque>
+				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+				<OverloadDuration>30.00</OverloadDuration>
+                <MaxTorqueCurve>
+				    <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+					<Entry outShaftSpeed="4001.00" maxTorque="101.00" minTorque="-100.00"/>
+				
+                    <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+
+                </MaxTorqueCurve>
+
+                <PowerMap gear="2">
+					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+                    <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+                    <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+                    <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+                    <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+                </PowerMap>
+				<PowerMap gear="1">
+					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+                    <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+                    <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+                    <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+                    <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+
+                </PowerMap>
+				<PowerMap gear="3">
+					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+
+					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+				</PowerMap>
+            </VoltageLevel>
+            <DragCurve>
+			    <Entry outShaftSpeed="4000.00" dragTorque="30.00" />
+                <Entry outShaftSpeed="0.00" dragTorque="10.00" />
+
+				<Entry outShaftSpeed="5000.00" dragTorque="30.00" />
+            </DragCurve>
+            <Conditioning>
+				<Entry coolantTempInlet="50" coolingPower="5000" />
+                <Entry coolantTempInlet="30" coolingPower="5000" />
+
+				<Entry coolantTempInlet="60" coolingPower="5000" />
+            </Conditioning>
+        </Data>
+     </tns:ElectricMachineSystem>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ElectricMachineSystem-IHPC_1_hashed.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ElectricMachineSystem-IHPC_1_hashed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c04491d58e4ba97fe5360e49daf8bd4c7c4161f0
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ElectricMachineSystem-IHPC_1_hashed.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:ElectricMachineSystem>
+        <v2.3:Data xsi:type="ElectricMachineSystemIHPCMeasuredDataDeclarationType" id="EM-asdf">
+            <v2.3:Manufacturer>a</v2.3:Manufacturer>
+            <v2.3:Model>a</v2.3:Model>
+            <v2.3:CertificationNumber>token</v2.3:CertificationNumber>
+            <v2.3:Date>2022-03-15T08:10:07.0963495Z</v2.3:Date>
+            <v2.3:AppVersion>aaaaa</v2.3:AppVersion>
+            <v2.3:ElectricMachineType>ASM</v2.3:ElectricMachineType>
+            <v2.3:CertificationMethod>Measured</v2.3:CertificationMethod>
+            <v2.3:R85RatedPower>1</v2.3:R85RatedPower>
+            <v2.3:RotationalInertia>0.10</v2.3:RotationalInertia>
+            <v2.3:DcDcConverterIncluded>true</v2.3:DcDcConverterIncluded>
+            <v2.3:IHPCType>IHPC Type 1</v2.3:IHPCType>
+            <v2.3:VoltageLevel>
+                <v2.3:Voltage>500</v2.3:Voltage>
+                <v2.3:ContinuousTorque>200.00</v2.3:ContinuousTorque>
+                <v2.3:TestSpeedContinuousTorque>2000.00</v2.3:TestSpeedContinuousTorque>
+                <v2.3:OverloadTorque>400.00</v2.3:OverloadTorque>
+                <v2.3:TestSpeedOverloadTorque>2000.00</v2.3:TestSpeedOverloadTorque>
+                <v2.3:OverloadDuration>30.00</v2.3:OverloadDuration>
+                <v2.3:MaxTorqueCurve>
+                    <v2.3:Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00" />
+                    <v2.3:Entry outShaftSpeed="5000.00" maxTorque="100.00" minTorque="-100.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00" />
+                </v2.3:MaxTorqueCurve>
+                <v2.3:PowerMap gear="1">
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00" />
+                    <v2.3:Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00" />
+                    <v2.3:Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00" />
+                </v2.3:PowerMap>
+                <v2.3:PowerMap gear="3">
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00" />
+                    <v2.3:Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00" />
+                </v2.3:PowerMap>
+                <v2.3:PowerMap gear="2">
+                    <v2.3:Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00" />
+                    <v2.3:Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00" />
+                </v2.3:PowerMap>
+            </v2.3:VoltageLevel>
+            <v2.3:VoltageLevel>
+                <v2.3:Voltage>400</v2.3:Voltage>
+                <v2.3:ContinuousTorque>200.00</v2.3:ContinuousTorque>
+                <v2.3:TestSpeedContinuousTorque>2000.00</v2.3:TestSpeedContinuousTorque>
+                <v2.3:OverloadTorque>400.00</v2.3:OverloadTorque>
+                <v2.3:TestSpeedOverloadTorque>2000.00</v2.3:TestSpeedOverloadTorque>
+                <v2.3:OverloadDuration>30.00</v2.3:OverloadDuration>
+                <v2.3:MaxTorqueCurve>
+                    <v2.3:Entry outShaftSpeed="4001.00" maxTorque="101.00" minTorque="-100.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00" />
+                </v2.3:MaxTorqueCurve>
+                <v2.3:PowerMap gear="1">
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00" />
+                    <v2.3:Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00" />
+                </v2.3:PowerMap>
+                <v2.3:PowerMap gear="3">
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00" />
+                    <v2.3:Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00" />
+                    <v2.3:Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00" />
+                </v2.3:PowerMap>
+                <v2.3:PowerMap gear="2">
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00" />
+                    <v2.3:Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00" />
+                </v2.3:PowerMap>
+            </v2.3:VoltageLevel>
+            <v2.3:VoltageLevel>
+                <v2.3:Voltage>600</v2.3:Voltage>
+                <v2.3:ContinuousTorque>200.00</v2.3:ContinuousTorque>
+                <v2.3:TestSpeedContinuousTorque>2000.00</v2.3:TestSpeedContinuousTorque>
+                <v2.3:OverloadTorque>400.00</v2.3:OverloadTorque>
+                <v2.3:TestSpeedOverloadTorque>2000.00</v2.3:TestSpeedOverloadTorque>
+                <v2.3:OverloadDuration>30.00</v2.3:OverloadDuration>
+                <v2.3:MaxTorqueCurve>
+                    <v2.3:Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00" />
+                    <v2.3:Entry outShaftSpeed="4001.00" maxTorque="101.00" minTorque="-100.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00" />
+                </v2.3:MaxTorqueCurve>
+                <v2.3:PowerMap gear="2">
+                    <v2.3:Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00" />
+                </v2.3:PowerMap>
+                <v2.3:PowerMap gear="1">
+                    <v2.3:Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00" />
+                    <v2.3:Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00" />
+                </v2.3:PowerMap>
+                <v2.3:PowerMap gear="3">
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00" />
+                    <v2.3:Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00" />
+                    <v2.3:Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00" />
+                </v2.3:PowerMap>
+            </v2.3:VoltageLevel>
+            <v2.3:DragCurve>
+                <v2.3:Entry outShaftSpeed="4000.00" dragTorque="30.00" />
+                <v2.3:Entry outShaftSpeed="0.00" dragTorque="10.00" />
+                <v2.3:Entry outShaftSpeed="5000.00" dragTorque="30.00" />
+            </v2.3:DragCurve>
+            <v2.3:Conditioning>
+                <v2.3:Entry coolantTempInlet="50" coolingPower="5000" />
+                <v2.3:Entry coolantTempInlet="30" coolingPower="5000" />
+                <v2.3:Entry coolantTempInlet="60" coolingPower="5000" />
+            </v2.3:Conditioning>
+        </v2.3:Data>
+        <v2.3:Signature>
+            <di:Reference URI="#EM-asdf">
+                <di:Transforms>
+                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </di:Transforms>
+                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <di:DigestValue>1QFIO45UcfZm2R4Lb5gwrs2UooC9FuCng1QDZvWvlm0=</di:DigestValue>
+            </di:Reference>
+        </v2.3:Signature>
+    </tns:ElectricMachineSystem>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ElectricMachineSystem_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ElectricMachineSystem_1.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d35041134cf7869729bbd1cf27acec4b018f12ee
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ElectricMachineSystem_1.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+	<tns:ElectricMachineSystem >
+		<Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-asdf">
+			<Manufacturer>a</Manufacturer>
+			<Model>a</Model>
+			<CertificationNumber>token</CertificationNumber>
+			<Date>2021-11-18T14:20:11.60244Z</Date>
+			<AppVersion>aaaaa</AppVersion>
+			<ElectricMachineType>ASM</ElectricMachineType>
+			<CertificationMethod>Measured</CertificationMethod>
+			<R85RatedPower>1</R85RatedPower>
+			<RotationalInertia>0.10</RotationalInertia>
+			<DcDcConverterIncluded>true</DcDcConverterIncluded>
+			<IHPCType>None</IHPCType>
+			<VoltageLevel>
+				<Voltage>600</Voltage>
+				<ContinuousTorque>200.00</ContinuousTorque>
+				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+				<OverloadTorque>400.00</OverloadTorque>
+				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+				<OverloadDuration>30.00</OverloadDuration>
+				<MaxTorqueCurve>
+					<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+					<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+				</MaxTorqueCurve>
+				<PowerMap>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+				</PowerMap>
+			</VoltageLevel>		
+			<VoltageLevel>
+				<Voltage>400</Voltage>
+				<ContinuousTorque>200.00</ContinuousTorque>
+				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+				<OverloadTorque>400.00</OverloadTorque>
+				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+				<OverloadDuration>30.00</OverloadDuration>
+				<MaxTorqueCurve>
+					<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+					<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+				</MaxTorqueCurve>
+				<PowerMap>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+				</PowerMap>
+			</VoltageLevel>
+
+			<DragCurve>
+				<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+				<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+			</DragCurve>
+			<Conditioning>
+				<Entry coolantTempInlet="60" coolingPower="6000"/>
+				<Entry coolantTempInlet="30" coolingPower="5000"/>
+			</Conditioning>
+		</Data>
+	</tns:ElectricMachineSystem>
+</tns:VectoInputDeclaration>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ElectricMachineSystem_1_hashed.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ElectricMachineSystem_1_hashed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3c95dbdb0e0fe84c35c4657d1b90075ae97ae3c4
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ElectricMachineSystem_1_hashed.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:ElectricMachineSystem>
+        <v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-asdf">
+            <v2.3:Manufacturer>a</v2.3:Manufacturer>
+            <v2.3:Model>a</v2.3:Model>
+            <v2.3:CertificationNumber>token</v2.3:CertificationNumber>
+            <v2.3:Date>2022-03-15T08:08:39.6384573Z</v2.3:Date>
+            <v2.3:AppVersion>aaaaa</v2.3:AppVersion>
+            <v2.3:ElectricMachineType>ASM</v2.3:ElectricMachineType>
+            <v2.3:CertificationMethod>Measured</v2.3:CertificationMethod>
+            <v2.3:R85RatedPower>1</v2.3:R85RatedPower>
+            <v2.3:RotationalInertia>0.10</v2.3:RotationalInertia>
+            <v2.3:DcDcConverterIncluded>true</v2.3:DcDcConverterIncluded>
+            <v2.3:IHPCType>None</v2.3:IHPCType>
+            <v2.3:VoltageLevel>
+                <v2.3:Voltage>600</v2.3:Voltage>
+                <v2.3:ContinuousTorque>200.00</v2.3:ContinuousTorque>
+                <v2.3:TestSpeedContinuousTorque>2000.00</v2.3:TestSpeedContinuousTorque>
+                <v2.3:OverloadTorque>400.00</v2.3:OverloadTorque>
+                <v2.3:TestSpeedOverloadTorque>2000.00</v2.3:TestSpeedOverloadTorque>
+                <v2.3:OverloadDuration>30.00</v2.3:OverloadDuration>
+                <v2.3:MaxTorqueCurve>
+                    <v2.3:Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00" />
+                </v2.3:MaxTorqueCurve>
+                <v2.3:PowerMap>
+                    <v2.3:Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00" />
+                </v2.3:PowerMap>
+            </v2.3:VoltageLevel>
+            <v2.3:VoltageLevel>
+                <v2.3:Voltage>400</v2.3:Voltage>
+                <v2.3:ContinuousTorque>200.00</v2.3:ContinuousTorque>
+                <v2.3:TestSpeedContinuousTorque>2000.00</v2.3:TestSpeedContinuousTorque>
+                <v2.3:OverloadTorque>400.00</v2.3:OverloadTorque>
+                <v2.3:TestSpeedOverloadTorque>2000.00</v2.3:TestSpeedOverloadTorque>
+                <v2.3:OverloadDuration>30.00</v2.3:OverloadDuration>
+                <v2.3:MaxTorqueCurve>
+                    <v2.3:Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00" />
+                </v2.3:MaxTorqueCurve>
+                <v2.3:PowerMap>
+                    <v2.3:Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00" />
+                </v2.3:PowerMap>
+            </v2.3:VoltageLevel>
+            <v2.3:DragCurve>
+                <v2.3:Entry outShaftSpeed="4000.00" dragTorque="30.00" />
+                <v2.3:Entry outShaftSpeed="0.00" dragTorque="10.00" />
+            </v2.3:DragCurve>
+            <v2.3:Conditioning>
+                <v2.3:Entry coolantTempInlet="60" coolingPower="6000" />
+                <v2.3:Entry coolantTempInlet="30" coolingPower="5000" />
+            </v2.3:Conditioning>
+        </v2.3:Data>
+        <v2.3:Signature>
+            <di:Reference URI="#EM-asdf">
+                <di:Transforms>
+                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </di:Transforms>
+                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <di:DigestValue>iMvpgVyPQywA/+J7wpyV99cb6FL/Pcu+DSoSyqTdpqY=</di:DigestValue>
+            </di:Reference>
+        </v2.3:Signature>
+    </tns:ElectricMachineSystem>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ElectricMachineSystem_StdValues.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ElectricMachineSystem_StdValues.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4be78747996ee66782561eb30c8e1407b796e5ad
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ElectricMachineSystem_StdValues.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+	<tns:ElectricMachineSystem>
+		<Data xsi:type="ElectricMachineSystemStandardValuesDataDeclarationType" id="EM-asdf">
+			<Manufacturer>a</Manufacturer>
+			<Model>a</Model>
+			<CertificationNumber>token</CertificationNumber>
+			<Date>2021-11-18T14:21:25.8564983Z</Date>
+			<AppVersion>aaaaa</AppVersion>
+			<ElectricMachineType>ASM</ElectricMachineType>
+			<CertificationMethod>Standard values</CertificationMethod>
+			<R85RatedPower>1</R85RatedPower>
+			<RotationalInertia>0.10</RotationalInertia>
+			<DcDcConverterIncluded>true</DcDcConverterIncluded>
+			<IHPCType>None</IHPCType>
+			<VoltageLevel>
+				<ContinuousTorque>200.00</ContinuousTorque>
+				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+				<OverloadTorque>400.00</OverloadTorque>
+				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+				<OverloadDuration>30.00</OverloadDuration>
+				<MaxTorqueCurve>
+					<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+					<Entry outShaftSpeed="4000.00" maxTorque="101.00" minTorque="-100.00"/>
+					<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+				</MaxTorqueCurve>
+				<PowerMap>
+					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+				</PowerMap>
+			</VoltageLevel>
+			<DragCurve>
+				<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+				<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+			</DragCurve>
+		</Data>
+	</tns:ElectricMachineSystem>
+</tns:VectoInputDeclaration>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ElectricMachineSystem_StdValues_hashed.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ElectricMachineSystem_StdValues_hashed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4cc74b22ff09045b913932b1091b4cabb1327130
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/ElectricMachineSystem_StdValues_hashed.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:ElectricMachineSystem>
+        <v2.3:Data xsi:type="ElectricMachineSystemStandardValuesDataDeclarationType" id="EM-asdf">
+            <v2.3:Manufacturer>a</v2.3:Manufacturer>
+            <v2.3:Model>a</v2.3:Model>
+            <v2.3:CertificationNumber>token</v2.3:CertificationNumber>
+            <v2.3:Date>2022-03-15T08:09:42.8676852Z</v2.3:Date>
+            <v2.3:AppVersion>aaaaa</v2.3:AppVersion>
+            <v2.3:ElectricMachineType>ASM</v2.3:ElectricMachineType>
+            <v2.3:CertificationMethod>Standard values</v2.3:CertificationMethod>
+            <v2.3:R85RatedPower>1</v2.3:R85RatedPower>
+            <v2.3:RotationalInertia>0.10</v2.3:RotationalInertia>
+            <v2.3:DcDcConverterIncluded>true</v2.3:DcDcConverterIncluded>
+            <v2.3:IHPCType>None</v2.3:IHPCType>
+            <v2.3:VoltageLevel>
+                <v2.3:ContinuousTorque>200.00</v2.3:ContinuousTorque>
+                <v2.3:TestSpeedContinuousTorque>2000.00</v2.3:TestSpeedContinuousTorque>
+                <v2.3:OverloadTorque>400.00</v2.3:OverloadTorque>
+                <v2.3:TestSpeedOverloadTorque>2000.00</v2.3:TestSpeedOverloadTorque>
+                <v2.3:OverloadDuration>30.00</v2.3:OverloadDuration>
+                <v2.3:MaxTorqueCurve>
+                    <v2.3:Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" maxTorque="101.00" minTorque="-100.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00" />
+                </v2.3:MaxTorqueCurve>
+                <v2.3:PowerMap>
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00" />
+                </v2.3:PowerMap>
+            </v2.3:VoltageLevel>
+            <v2.3:DragCurve>
+                <v2.3:Entry outShaftSpeed="4000.00" dragTorque="30.00" />
+                <v2.3:Entry outShaftSpeed="0.00" dragTorque="10.00" />
+            </v2.3:DragCurve>
+        </v2.3:Data>
+        <v2.3:Signature>
+            <di:Reference URI="#EM-asdf">
+                <di:Transforms>
+                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </di:Transforms>
+                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <di:DigestValue>4JNjQii+2r1TfReOX1OsUW+lnqlnZ/6F1zT0oXACs6A=</di:DigestValue>
+            </di:Reference>
+        </v2.3:Signature>
+    </tns:ElectricMachineSystem>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Engine.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Engine.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2754145c14694b06406727c68e978b65ffbb5d23
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Engine.xml
@@ -0,0 +1,429 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+	<tns:Engine>
+		<v2.0:Data id="ENG-gooZah3D" xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+			<Manufacturer>Generic Engine Manufacturer</Manufacturer>
+			<Model>Generic 40t Long Haul Truck Engine</Model>
+			<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+			<Date>2017-02-15T11:00:00Z</Date>
+			<AppVersion>VectoEngine x.y</AppVersion>
+			<Displacement>12730</Displacement>
+			<RatedSpeed>2200</RatedSpeed>
+			<RatedPower>380000</RatedPower>
+			<MaxEngineTorque>2300</MaxEngineTorque>
+			<WHRType>
+				<MechanicalOutputICE>false</MechanicalOutputICE>
+				<MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+				<ElectricalOutput>false</ElectricalOutput>
+			</WHRType>
+			<Mode>
+				<IdlingSpeed>570</IdlingSpeed>
+				<FullLoadAndDragCurve>
+					<Entry engineSpeed="800.30" maxTorque="1791.00" dragTorque="-149.00" />
+					<Entry engineSpeed="1000.30" maxTorque="2300.00" dragTorque="-160.00" />
+					<Entry engineSpeed="1200.30" maxTorque="2300.00" dragTorque="-179.00" />
+					<Entry engineSpeed="1400.30" maxTorque="2300.00" dragTorque="-203.00" />
+					<Entry engineSpeed="560.30" maxTorque="1180.00" dragTorque="-149.00" />
+					<Entry engineSpeed="600.30" maxTorque="1282.00" dragTorque="-148.00" />
+
+					<Entry engineSpeed="1600.30" maxTorque="2079.00" dragTorque="-235.00" />
+					<Entry engineSpeed="1800.30" maxTorque="1857.00" dragTorque="-264.00" />
+					<Entry engineSpeed="2000.30" maxTorque="1352.00" dragTorque="-301.00" />
+					<Entry engineSpeed="2100.30" maxTorque="1100.00" dragTorque="-320.00" />
+				</FullLoadAndDragCurve>
+				<Fuel type="Ethanol CI">
+					<WHTCUrban>4.0097</WHTCUrban>
+					<WHTCRural>4.0035</WHTCRural>
+					<WHTCMotorway>4.0200</WHTCMotorway>
+					<BFColdHot>4.0000</BFColdHot>
+					<CFRegPer>4.0000</CFRegPer>
+					<CFNCV>4.0000</CFNCV>
+					<FuelConsumptionMap>
+						<Entry engineSpeed="560.40" torque="200.00" fuelConsumption="3197.00" />
+						<Entry engineSpeed="560.40" torque="400.00" fuelConsumption="5295.00" />
+						<Entry engineSpeed="560.40" torque="600.00" fuelConsumption="7615.00" />
+						<Entry engineSpeed="560.40" torque="800.00" fuelConsumption="9375.00" />
+						<Entry engineSpeed="560.40" torque="1000.00" fuelConsumption="11239.00" />
+
+						<Entry engineSpeed="560.40" torque="-149.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="560.40" torque="0.00" fuelConsumption="1256.00" />
+
+						<Entry engineSpeed="560.40" torque="1180.00" fuelConsumption="12869.00" />
+						<Entry engineSpeed="600.40" torque="-148.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="600.40" torque="0.00" fuelConsumption="1459.00" />
+						<Entry engineSpeed="600.40" torque="200.00" fuelConsumption="3358.00" />
+						<Entry engineSpeed="600.40" torque="400.00" fuelConsumption="5498.00" />
+						<Entry engineSpeed="600.40" torque="600.00" fuelConsumption="8101.00" />
+						<Entry engineSpeed="600.40" torque="800.00" fuelConsumption="10014.00" />
+						<Entry engineSpeed="600.40" torque="1000.00" fuelConsumption="12071.00" />
+						<Entry engineSpeed="600.40" torque="1200.00" fuelConsumption="14201.00" />
+						<Entry engineSpeed="600.40" torque="1282.00" fuelConsumption="15304.00" />
+						<Entry engineSpeed="800.40" torque="-149.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="800.40" torque="0.00" fuelConsumption="1879.00" />
+						<Entry engineSpeed="800.40" torque="200.00" fuelConsumption="4286.00" />
+						<Entry engineSpeed="800.40" torque="400.00" fuelConsumption="7021.00" />
+						<Entry engineSpeed="800.40" torque="600.00" fuelConsumption="10059.00" />
+						<Entry engineSpeed="800.40" torque="800.00" fuelConsumption="13086.00" />
+						<Entry engineSpeed="800.40" torque="1000.00" fuelConsumption="16015.00" />
+						<Entry engineSpeed="800.40" torque="1200.00" fuelConsumption="19239.00" />
+						<Entry engineSpeed="800.40" torque="1400.00" fuelConsumption="22426.00" />
+						<Entry engineSpeed="800.40" torque="1600.00" fuelConsumption="25483.00" />
+						<Entry engineSpeed="800.40" torque="1791.00" fuelConsumption="28905.00" />
+						<Entry engineSpeed="1000.40" torque="-160.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="1000.40" torque="0.00" fuelConsumption="2865.00" />
+						<Entry engineSpeed="1000.40" torque="200.00" fuelConsumption="5963.00" />
+						<Entry engineSpeed="1000.40" torque="400.00" fuelConsumption="9198.00" />
+						<Entry engineSpeed="1000.40" torque="600.00" fuelConsumption="12354.00" />
+						<Entry engineSpeed="1000.40" torque="800.00" fuelConsumption="15965.00" />
+						<Entry engineSpeed="1000.40" torque="1000.00" fuelConsumption="19864.00" />
+						<Entry engineSpeed="1000.40" torque="1200.00" fuelConsumption="23530.00" />
+						<Entry engineSpeed="1000.40" torque="1400.00" fuelConsumption="27202.00" />
+						<Entry engineSpeed="1000.40" torque="1600.00" fuelConsumption="31165.00" />
+						<Entry engineSpeed="1000.40" torque="1800.00" fuelConsumption="35103.00" />
+						<Entry engineSpeed="1000.40" torque="2000.00" fuelConsumption="39360.00" />
+						<Entry engineSpeed="1000.40" torque="2200.00" fuelConsumption="44120.00" />
+						<Entry engineSpeed="1000.40" torque="2300.00" fuelConsumption="46836.00" />
+						<Entry engineSpeed="1200.40" torque="-179.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="1200.40" torque="0.00" fuelConsumption="3307.00" />
+						<Entry engineSpeed="1200.40" torque="200.00" fuelConsumption="6897.00" />
+						<Entry engineSpeed="1200.40" torque="400.00" fuelConsumption="10651.00" />
+						<Entry engineSpeed="1200.40" torque="600.00" fuelConsumption="14645.00" />
+						<Entry engineSpeed="1200.40" torque="800.00" fuelConsumption="19115.00" />
+						<Entry engineSpeed="1200.40" torque="1000.00" fuelConsumption="23677.00" />
+						<Entry engineSpeed="1200.40" torque="1200.00" fuelConsumption="28180.00" />
+						<Entry engineSpeed="1200.40" torque="1400.00" fuelConsumption="32431.00" />
+						<Entry engineSpeed="1200.40" torque="1600.00" fuelConsumption="36698.00" />
+						<Entry engineSpeed="1200.40" torque="1800.00" fuelConsumption="41691.00" />
+						<Entry engineSpeed="1200.40" torque="2000.00" fuelConsumption="46915.00" />
+						<Entry engineSpeed="1200.40" torque="2200.00" fuelConsumption="51783.00" />
+						<Entry engineSpeed="1200.40" torque="2300.00" fuelConsumption="54932.00" />
+						<Entry engineSpeed="1400.40" torque="-203.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="1400.40" torque="0.00" fuelConsumption="4306.00" />
+						<Entry engineSpeed="1400.40" torque="200.00" fuelConsumption="8143.00" />
+						<Entry engineSpeed="1400.40" torque="400.00" fuelConsumption="12723.00" />
+						<Entry engineSpeed="1400.40" torque="600.00" fuelConsumption="17523.00" />
+						<Entry engineSpeed="1400.40" torque="800.00" fuelConsumption="22288.00" />
+						<Entry engineSpeed="1400.40" torque="1000.00" fuelConsumption="27093.00" />
+						<Entry engineSpeed="1400.40" torque="1200.00" fuelConsumption="32536.00" />
+						<Entry engineSpeed="1400.40" torque="1400.00" fuelConsumption="37746.00" />
+						<Entry engineSpeed="1400.40" torque="1600.00" fuelConsumption="43194.00" />
+						<Entry engineSpeed="1400.40" torque="1800.00" fuelConsumption="49453.00" />
+						<Entry engineSpeed="1400.40" torque="2000.00" fuelConsumption="55830.00" />
+						<Entry engineSpeed="1400.40" torque="2200.00" fuelConsumption="61072.00" />
+						<Entry engineSpeed="1400.40" torque="2300.00" fuelConsumption="64377.00" />
+						<Entry engineSpeed="1600.40" torque="-235.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="1600.40" torque="0.00" fuelConsumption="5209.00" />
+						<Entry engineSpeed="1600.40" torque="200.00" fuelConsumption="9669.00" />
+						<Entry engineSpeed="1600.40" torque="400.00" fuelConsumption="14838.00" />
+						<Entry engineSpeed="1600.40" torque="600.00" fuelConsumption="20127.00" />
+						<Entry engineSpeed="1600.40" torque="800.00" fuelConsumption="25894.00" />
+						<Entry engineSpeed="1600.40" torque="1000.00" fuelConsumption="31631.00" />
+						<Entry engineSpeed="1600.40" torque="1200.00" fuelConsumption="37248.00" />
+						<Entry engineSpeed="1600.40" torque="1400.00" fuelConsumption="42826.00" />
+						<Entry engineSpeed="1600.40" torque="1600.00" fuelConsumption="49752.00" />
+						<Entry engineSpeed="1600.40" torque="1800.00" fuelConsumption="57020.00" />
+						<Entry engineSpeed="1600.40" torque="2000.00" fuelConsumption="63914.00" />
+						<Entry engineSpeed="1600.40" torque="2079.00" fuelConsumption="66520.00" />
+						<Entry engineSpeed="1800.40" torque="-264.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="1800.40" torque="0.00" fuelConsumption="6409.00" />
+						<Entry engineSpeed="1800.40" torque="200.00" fuelConsumption="11777.00" />
+						<Entry engineSpeed="1800.40" torque="400.00" fuelConsumption="17320.00" />
+						<Entry engineSpeed="1800.40" torque="600.00" fuelConsumption="23394.00" />
+						<Entry engineSpeed="1800.40" torque="800.00" fuelConsumption="30501.00" />
+						<Entry engineSpeed="1800.40" torque="1000.00" fuelConsumption="36378.00" />
+						<Entry engineSpeed="1800.40" torque="1200.00" fuelConsumption="43079.00" />
+						<Entry engineSpeed="1800.40" torque="1400.00" fuelConsumption="49796.00" />
+						<Entry engineSpeed="1800.40" torque="1600.00" fuelConsumption="57436.00" />
+						<Entry engineSpeed="1800.40" torque="1800.00" fuelConsumption="65157.00" />
+						<Entry engineSpeed="1800.40" torque="1857.00" fuelConsumption="67574.00" />
+						<Entry engineSpeed="2000.40" torque="-301.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="2000.40" torque="0.00" fuelConsumption="9127.00" />
+						<Entry engineSpeed="2000.40" torque="200.00" fuelConsumption="14822.00" />
+						<Entry engineSpeed="2000.40" torque="400.00" fuelConsumption="20655.00" />
+						<Entry engineSpeed="2000.40" torque="600.00" fuelConsumption="27076.00" />
+						<Entry engineSpeed="2000.40" torque="800.00" fuelConsumption="34188.00" />
+						<Entry engineSpeed="2000.40" torque="1000.00" fuelConsumption="42837.00" />
+						<Entry engineSpeed="2000.40" torque="1200.00" fuelConsumption="51018.00" />
+						<Entry engineSpeed="2000.40" torque="1352.00" fuelConsumption="56618.00" />
+						<Entry engineSpeed="2100.40" torque="-320.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="2100.40" torque="0.00" fuelConsumption="10470.00" />
+						<Entry engineSpeed="2100.40" torque="200.00" fuelConsumption="16332.00" />
+						<Entry engineSpeed="2100.40" torque="400.00" fuelConsumption="22396.00" />
+						<Entry engineSpeed="2100.40" torque="600.00" fuelConsumption="28914.00" />
+						<Entry engineSpeed="2100.40" torque="800.00" fuelConsumption="35717.00" />
+						<Entry engineSpeed="2100.40" torque="1000.00" fuelConsumption="45643.00" />
+						<Entry engineSpeed="2100.40" torque="1100.00" fuelConsumption="50653.00" />
+					</FuelConsumptionMap>
+				</Fuel>
+				<Fuel type="Diesel CI">
+					<WHTCUrban>3.0097</WHTCUrban>
+					<WHTCRural>3.0035</WHTCRural>
+					<WHTCMotorway>3.0200</WHTCMotorway>
+					<BFColdHot>3.0000</BFColdHot>
+					<CFRegPer>3.0000</CFRegPer>
+					<CFNCV>3.0000</CFNCV>
+					<FuelConsumptionMap>
+						<Entry engineSpeed="800.30" torque="200.00" fuelConsumption="4286.00" />
+						<Entry engineSpeed="800.30" torque="400.00" fuelConsumption="7021.00" />
+						<Entry engineSpeed="800.30" torque="600.00" fuelConsumption="10059.00" />
+						<Entry engineSpeed="800.30" torque="800.00" fuelConsumption="13086.00" />
+						<Entry engineSpeed="800.30" torque="1000.00" fuelConsumption="16015.00" />
+						<Entry engineSpeed="800.30" torque="1200.00" fuelConsumption="19239.00" />
+						<Entry engineSpeed="800.30" torque="1400.00" fuelConsumption="22426.00" />
+						<Entry engineSpeed="800.30" torque="1600.00" fuelConsumption="25483.00" />
+						<Entry engineSpeed="800.30" torque="1791.00" fuelConsumption="28905.00" />
+						<Entry engineSpeed="560.30" torque="-149.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="560.30" torque="0.00" fuelConsumption="1256.00" />
+						<Entry engineSpeed="560.30" torque="200.00" fuelConsumption="3197.00" />
+						<Entry engineSpeed="560.30" torque="400.00" fuelConsumption="5295.00" />
+						<Entry engineSpeed="560.30" torque="600.00" fuelConsumption="7615.00" />
+						<Entry engineSpeed="560.30" torque="800.00" fuelConsumption="9375.00" />
+						<Entry engineSpeed="560.30" torque="1000.00" fuelConsumption="11239.00" />
+						<Entry engineSpeed="560.30" torque="1180.00" fuelConsumption="12869.00" />
+						<Entry engineSpeed="600.30" torque="-148.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="600.30" torque="0.00" fuelConsumption="1459.00" />
+						<Entry engineSpeed="600.30" torque="200.00" fuelConsumption="3358.00" />
+						<Entry engineSpeed="600.30" torque="400.00" fuelConsumption="5498.00" />
+						<Entry engineSpeed="600.30" torque="600.00" fuelConsumption="8101.00" />
+						<Entry engineSpeed="600.30" torque="800.00" fuelConsumption="10014.00" />
+						<Entry engineSpeed="600.30" torque="1000.00" fuelConsumption="12071.00" />
+						<Entry engineSpeed="600.30" torque="1200.00" fuelConsumption="14201.00" />
+						<Entry engineSpeed="600.30" torque="1282.00" fuelConsumption="15304.00" />
+						<Entry engineSpeed="800.30" torque="-149.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="800.30" torque="0.00" fuelConsumption="1879.00" />
+
+						<Entry engineSpeed="1000.30" torque="-160.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="1000.30" torque="0.00" fuelConsumption="2865.00" />
+						<Entry engineSpeed="1000.30" torque="200.00" fuelConsumption="5963.00" />
+						<Entry engineSpeed="1000.30" torque="400.00" fuelConsumption="9198.00" />
+						<Entry engineSpeed="1000.30" torque="600.00" fuelConsumption="12354.00" />
+						<Entry engineSpeed="1000.30" torque="800.00" fuelConsumption="15965.00" />
+						<Entry engineSpeed="1000.30" torque="1000.00" fuelConsumption="19864.00" />
+						<Entry engineSpeed="1000.30" torque="1200.00" fuelConsumption="23530.00" />
+						<Entry engineSpeed="1000.30" torque="1400.00" fuelConsumption="27202.00" />
+						<Entry engineSpeed="1000.30" torque="1600.00" fuelConsumption="31165.00" />
+						<Entry engineSpeed="1000.30" torque="1800.00" fuelConsumption="35103.00" />
+						<Entry engineSpeed="1000.30" torque="2000.00" fuelConsumption="39360.00" />
+						<Entry engineSpeed="1000.30" torque="2200.00" fuelConsumption="44120.00" />
+						<Entry engineSpeed="1000.30" torque="2300.00" fuelConsumption="46836.00" />
+						<Entry engineSpeed="1200.30" torque="-179.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="1200.30" torque="0.00" fuelConsumption="3307.00" />
+						<Entry engineSpeed="1200.30" torque="200.00" fuelConsumption="6897.00" />
+						<Entry engineSpeed="1200.30" torque="400.00" fuelConsumption="10651.00" />
+						<Entry engineSpeed="1200.30" torque="600.00" fuelConsumption="14645.00" />
+						<Entry engineSpeed="1200.30" torque="800.00" fuelConsumption="19115.00" />
+						<Entry engineSpeed="1200.30" torque="1000.00" fuelConsumption="23677.00" />
+						<Entry engineSpeed="1200.30" torque="1200.00" fuelConsumption="28180.00" />
+						<Entry engineSpeed="1200.30" torque="1400.00" fuelConsumption="32431.00" />
+						<Entry engineSpeed="1200.30" torque="1600.00" fuelConsumption="36698.00" />
+						<Entry engineSpeed="1200.30" torque="1800.00" fuelConsumption="41691.00" />
+						<Entry engineSpeed="1200.30" torque="2000.00" fuelConsumption="46915.00" />
+						<Entry engineSpeed="1200.30" torque="2200.00" fuelConsumption="51783.00" />
+						<Entry engineSpeed="1200.30" torque="2300.00" fuelConsumption="54932.00" />
+						<Entry engineSpeed="1400.30" torque="-203.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="1400.30" torque="0.00" fuelConsumption="4306.00" />
+						<Entry engineSpeed="1400.30" torque="200.00" fuelConsumption="8143.00" />
+						<Entry engineSpeed="1400.30" torque="400.00" fuelConsumption="12723.00" />
+						<Entry engineSpeed="1400.30" torque="600.00" fuelConsumption="17523.00" />
+						<Entry engineSpeed="1400.30" torque="800.00" fuelConsumption="22288.00" />
+						<Entry engineSpeed="1400.30" torque="1000.00" fuelConsumption="27093.00" />
+						<Entry engineSpeed="1400.30" torque="1200.00" fuelConsumption="32536.00" />
+						<Entry engineSpeed="1400.30" torque="1400.00" fuelConsumption="37746.00" />
+						<Entry engineSpeed="1400.30" torque="1600.00" fuelConsumption="43194.00" />
+						<Entry engineSpeed="1400.30" torque="1800.00" fuelConsumption="49453.00" />
+						<Entry engineSpeed="1400.30" torque="2000.00" fuelConsumption="55830.00" />
+						<Entry engineSpeed="1400.30" torque="2200.00" fuelConsumption="61072.00" />
+						<Entry engineSpeed="1400.30" torque="2300.00" fuelConsumption="64377.00" />
+						<Entry engineSpeed="1600.30" torque="-235.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="1600.30" torque="0.00" fuelConsumption="5209.00" />
+						<Entry engineSpeed="1600.30" torque="200.00" fuelConsumption="9669.00" />
+						<Entry engineSpeed="1600.30" torque="400.00" fuelConsumption="14838.00" />
+						<Entry engineSpeed="1600.30" torque="600.00" fuelConsumption="20127.00" />
+						<Entry engineSpeed="1600.30" torque="800.00" fuelConsumption="25894.00" />
+						<Entry engineSpeed="1600.30" torque="1000.00" fuelConsumption="31631.00" />
+						<Entry engineSpeed="1600.30" torque="1200.00" fuelConsumption="37248.00" />
+						<Entry engineSpeed="1600.30" torque="1400.00" fuelConsumption="42826.00" />
+						<Entry engineSpeed="1600.30" torque="1600.00" fuelConsumption="49752.00" />
+						<Entry engineSpeed="1600.30" torque="1800.00" fuelConsumption="57020.00" />
+						<Entry engineSpeed="1600.30" torque="2000.00" fuelConsumption="63914.00" />
+						<Entry engineSpeed="1600.30" torque="2079.00" fuelConsumption="66520.00" />
+						<Entry engineSpeed="1800.30" torque="-264.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="1800.30" torque="0.00" fuelConsumption="6409.00" />
+						<Entry engineSpeed="1800.30" torque="200.00" fuelConsumption="11777.00" />
+						<Entry engineSpeed="1800.30" torque="400.00" fuelConsumption="17320.00" />
+						<Entry engineSpeed="1800.30" torque="600.00" fuelConsumption="23394.00" />
+						<Entry engineSpeed="1800.30" torque="800.00" fuelConsumption="30501.00" />
+						<Entry engineSpeed="1800.30" torque="1000.00" fuelConsumption="36378.00" />
+						<Entry engineSpeed="1800.30" torque="1200.00" fuelConsumption="43079.00" />
+						<Entry engineSpeed="1800.30" torque="1400.00" fuelConsumption="49796.00" />
+						<Entry engineSpeed="1800.30" torque="1600.00" fuelConsumption="57436.00" />
+						<Entry engineSpeed="1800.30" torque="1800.00" fuelConsumption="65157.00" />
+						<Entry engineSpeed="1800.30" torque="1857.00" fuelConsumption="67574.00" />
+						<Entry engineSpeed="2000.30" torque="-301.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="2000.30" torque="0.00" fuelConsumption="9127.00" />
+						<Entry engineSpeed="2000.30" torque="200.00" fuelConsumption="14822.00" />
+						<Entry engineSpeed="2000.30" torque="400.00" fuelConsumption="20655.00" />
+						<Entry engineSpeed="2000.30" torque="600.00" fuelConsumption="27076.00" />
+						<Entry engineSpeed="2000.30" torque="800.00" fuelConsumption="34188.00" />
+						<Entry engineSpeed="2000.30" torque="1000.00" fuelConsumption="42837.00" />
+						<Entry engineSpeed="2000.30" torque="1200.00" fuelConsumption="51018.00" />
+						<Entry engineSpeed="2000.30" torque="1352.00" fuelConsumption="56618.00" />
+						<Entry engineSpeed="2100.30" torque="-320.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="2100.30" torque="0.00" fuelConsumption="10470.00" />
+						<Entry engineSpeed="2100.30" torque="200.00" fuelConsumption="16332.00" />
+						<Entry engineSpeed="2100.30" torque="400.00" fuelConsumption="22396.00" />
+						<Entry engineSpeed="2100.30" torque="600.00" fuelConsumption="28914.00" />
+						<Entry engineSpeed="2100.30" torque="800.00" fuelConsumption="35717.00" />
+						<Entry engineSpeed="2100.30" torque="1000.00" fuelConsumption="45643.00" />
+						<Entry engineSpeed="2100.30" torque="1100.00" fuelConsumption="50653.00" />
+					</FuelConsumptionMap>
+				</Fuel>
+
+			</Mode>
+			<Mode>		
+				<IdlingSpeed>560</IdlingSpeed>
+				<FullLoadAndDragCurve>
+					<Entry engineSpeed="1000.10" maxTorque="2300.00" dragTorque="-160.00" />
+					<Entry engineSpeed="1200.10" maxTorque="2300.00" dragTorque="-179.00" />
+					<Entry engineSpeed="1400.10" maxTorque="2300.00" dragTorque="-203.00" />
+					<Entry engineSpeed="1600.10" maxTorque="2079.00" dragTorque="-235.00" />				
+					<Entry engineSpeed="560.10" maxTorque="1180.00" dragTorque="-149.00" />
+					<Entry engineSpeed="600.10" maxTorque="1282.00" dragTorque="-148.00" />
+					<Entry engineSpeed="800.10" maxTorque="1791.00" dragTorque="-149.00" />
+					<Entry engineSpeed="2000.10" maxTorque="1352.00" dragTorque="-301.00" />
+					<Entry engineSpeed="2100.10" maxTorque="1100.00" dragTorque="-320.00" />
+					<Entry engineSpeed="1800.10" maxTorque="1857.00" dragTorque="-264.00" />
+
+				</FullLoadAndDragCurve>
+				<Fuel type="Diesel CI">
+					<WHTCUrban>1.0097</WHTCUrban>
+					<WHTCRural>1.0035</WHTCRural>
+					<WHTCMotorway>1.0200</WHTCMotorway>
+					<BFColdHot>1.0000</BFColdHot>
+					<CFRegPer>1.0000</CFRegPer>
+					<CFNCV>1.0000</CFNCV>
+					<FuelConsumptionMap>
+						<Entry engineSpeed="560.10" torque="600.00" fuelConsumption="7615.00" />
+						<Entry engineSpeed="560.10" torque="800.00" fuelConsumption="9375.00" />
+						<Entry engineSpeed="560.10" torque="1000.00" fuelConsumption="11239.00" />
+						<Entry engineSpeed="560.10" torque="1180.00" fuelConsumption="12869.00" />
+						<Entry engineSpeed="560.10" torque="-149.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="560.10" torque="0.00" fuelConsumption="1256.00" />
+						<Entry engineSpeed="560.10" torque="200.00" fuelConsumption="3197.00" />
+						<Entry engineSpeed="560.10" torque="400.00" fuelConsumption="5295.00" />
+
+						<Entry engineSpeed="600.10" torque="-148.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="600.10" torque="0.00" fuelConsumption="1459.00" />
+						<Entry engineSpeed="600.10" torque="200.00" fuelConsumption="3358.00" />
+						<Entry engineSpeed="600.10" torque="400.00" fuelConsumption="5498.00" />
+						<Entry engineSpeed="600.10" torque="600.00" fuelConsumption="8101.00" />
+						<Entry engineSpeed="600.10" torque="800.00" fuelConsumption="10014.00" />
+						<Entry engineSpeed="600.10" torque="1000.00" fuelConsumption="12071.00" />
+						<Entry engineSpeed="600.10" torque="1200.00" fuelConsumption="14201.00" />
+						<Entry engineSpeed="600.10" torque="1282.00" fuelConsumption="15304.00" />
+						<Entry engineSpeed="800.10" torque="-149.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="800.10" torque="0.00" fuelConsumption="1879.00" />
+						<Entry engineSpeed="800.10" torque="200.00" fuelConsumption="4286.00" />
+						<Entry engineSpeed="800.10" torque="400.00" fuelConsumption="7021.00" />
+						<Entry engineSpeed="800.10" torque="600.00" fuelConsumption="10059.00" />
+						<Entry engineSpeed="800.10" torque="800.00" fuelConsumption="13086.00" />
+						<Entry engineSpeed="800.10" torque="1000.00" fuelConsumption="16015.00" />
+						<Entry engineSpeed="800.10" torque="1200.00" fuelConsumption="19239.00" />
+						<Entry engineSpeed="800.10" torque="1400.00" fuelConsumption="22426.00" />
+						<Entry engineSpeed="800.10" torque="1600.00" fuelConsumption="25483.00" />
+						<Entry engineSpeed="800.10" torque="1791.00" fuelConsumption="28905.00" />
+						<Entry engineSpeed="1000.10" torque="-160.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="1000.10" torque="0.00" fuelConsumption="2865.00" />
+						<Entry engineSpeed="1000.10" torque="200.00" fuelConsumption="5963.00" />
+						<Entry engineSpeed="1000.10" torque="400.00" fuelConsumption="9198.00" />
+						<Entry engineSpeed="1000.10" torque="600.00" fuelConsumption="12354.00" />
+						<Entry engineSpeed="1000.10" torque="800.00" fuelConsumption="15965.00" />
+						<Entry engineSpeed="1000.10" torque="1000.00" fuelConsumption="19864.00" />
+
+						<Entry engineSpeed="1200.10" torque="-179.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="1200.10" torque="0.00" fuelConsumption="3307.00" />
+						<Entry engineSpeed="1200.10" torque="200.00" fuelConsumption="6897.00" />
+						<Entry engineSpeed="1200.10" torque="400.00" fuelConsumption="10651.00" />
+						<Entry engineSpeed="1200.10" torque="600.00" fuelConsumption="14645.00" />
+						<Entry engineSpeed="1200.10" torque="800.00" fuelConsumption="19115.00" />
+						<Entry engineSpeed="1200.10" torque="1000.00" fuelConsumption="23677.00" />
+						<Entry engineSpeed="1200.10" torque="1200.00" fuelConsumption="28180.00" />
+						<Entry engineSpeed="1200.10" torque="1400.00" fuelConsumption="32431.00" />
+						<Entry engineSpeed="1200.10" torque="1600.00" fuelConsumption="36698.00" />
+						<Entry engineSpeed="1200.10" torque="1800.00" fuelConsumption="41691.00" />
+						<Entry engineSpeed="1200.10" torque="2000.00" fuelConsumption="46915.00" />
+						<Entry engineSpeed="1200.10" torque="2200.00" fuelConsumption="51783.00" />
+						<Entry engineSpeed="1200.10" torque="2300.00" fuelConsumption="54932.00" />
+						<Entry engineSpeed="1400.10" torque="-203.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="1400.10" torque="0.00" fuelConsumption="4306.00" />
+						<Entry engineSpeed="1400.10" torque="200.00" fuelConsumption="8143.00" />
+						<Entry engineSpeed="1400.10" torque="400.00" fuelConsumption="12723.00" />
+						<Entry engineSpeed="1400.10" torque="600.00" fuelConsumption="17523.00" />
+						<Entry engineSpeed="1400.10" torque="800.00" fuelConsumption="22288.00" />
+						<Entry engineSpeed="1400.10" torque="1000.00" fuelConsumption="27093.00" />
+						<Entry engineSpeed="1400.10" torque="1200.00" fuelConsumption="32536.00" />
+						<Entry engineSpeed="1400.10" torque="1400.00" fuelConsumption="37746.00" />
+						<Entry engineSpeed="1400.10" torque="1600.00" fuelConsumption="43194.00" />
+						<Entry engineSpeed="1400.10" torque="1800.00" fuelConsumption="49453.00" />
+						<Entry engineSpeed="1400.10" torque="2000.00" fuelConsumption="55830.00" />
+						<Entry engineSpeed="1400.10" torque="2200.00" fuelConsumption="61072.00" />
+						<Entry engineSpeed="1400.10" torque="2300.00" fuelConsumption="64377.00" />
+						<Entry engineSpeed="1600.10" torque="-235.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="1600.10" torque="0.00" fuelConsumption="5209.00" />
+						<Entry engineSpeed="1600.10" torque="200.00" fuelConsumption="9669.00" />
+						<Entry engineSpeed="1600.10" torque="400.00" fuelConsumption="14838.00" />
+						<Entry engineSpeed="1600.10" torque="600.00" fuelConsumption="20127.00" />
+						<Entry engineSpeed="1600.10" torque="800.00" fuelConsumption="25894.00" />
+						<Entry engineSpeed="1600.10" torque="1000.00" fuelConsumption="31631.00" />
+						<Entry engineSpeed="1600.10" torque="1200.00" fuelConsumption="37248.00" />
+						<Entry engineSpeed="1600.10" torque="1400.00" fuelConsumption="42826.00" />
+						<Entry engineSpeed="1600.10" torque="1600.00" fuelConsumption="49752.00" />
+						<Entry engineSpeed="1600.10" torque="1800.00" fuelConsumption="57020.00" />
+						<Entry engineSpeed="1600.10" torque="2000.00" fuelConsumption="63914.00" />
+						<Entry engineSpeed="1600.10" torque="2079.00" fuelConsumption="66520.00" />
+						<Entry engineSpeed="1800.10" torque="-264.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="1800.10" torque="0.00" fuelConsumption="6409.00" />
+						<Entry engineSpeed="1800.10" torque="200.00" fuelConsumption="11777.00" />
+						<Entry engineSpeed="1800.10" torque="400.00" fuelConsumption="17320.00" />
+						<Entry engineSpeed="1800.10" torque="600.00" fuelConsumption="23394.00" />
+						<Entry engineSpeed="1800.10" torque="800.00" fuelConsumption="30501.00" />
+						<Entry engineSpeed="1800.10" torque="1000.00" fuelConsumption="36378.00" />
+						<Entry engineSpeed="1800.10" torque="1200.00" fuelConsumption="43079.00" />
+						<Entry engineSpeed="1800.10" torque="1400.00" fuelConsumption="49796.00" />
+						<Entry engineSpeed="1800.10" torque="1600.00" fuelConsumption="57436.00" />
+						<Entry engineSpeed="1800.10" torque="1800.00" fuelConsumption="65157.00" />
+						<Entry engineSpeed="1800.10" torque="1857.00" fuelConsumption="67574.00" />
+						<Entry engineSpeed="2000.10" torque="-301.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="2000.10" torque="0.00" fuelConsumption="9127.00" />
+						<Entry engineSpeed="2000.10" torque="200.00" fuelConsumption="14822.00" />
+						<Entry engineSpeed="2000.10" torque="400.00" fuelConsumption="20655.00" />
+						<Entry engineSpeed="2000.10" torque="600.00" fuelConsumption="27076.00" />
+						<Entry engineSpeed="2000.10" torque="800.00" fuelConsumption="34188.00" />
+						<Entry engineSpeed="2000.10" torque="1000.00" fuelConsumption="42837.00" />
+						<Entry engineSpeed="2000.10" torque="1200.00" fuelConsumption="51018.00" />
+						<Entry engineSpeed="2000.10" torque="1352.00" fuelConsumption="56618.00" />
+						<Entry engineSpeed="2100.10" torque="-320.00" fuelConsumption="0.00" />
+						<Entry engineSpeed="2100.10" torque="0.00" fuelConsumption="10470.00" />
+						<Entry engineSpeed="2100.10" torque="200.00" fuelConsumption="16332.00" />
+						<Entry engineSpeed="2100.10" torque="400.00" fuelConsumption="22396.00" />
+						<Entry engineSpeed="2100.10" torque="600.00" fuelConsumption="28914.00" />
+						<Entry engineSpeed="2100.10" torque="800.00" fuelConsumption="35717.00" />
+						<Entry engineSpeed="2100.10" torque="1000.00" fuelConsumption="45643.00" />
+						<Entry engineSpeed="2100.10" torque="1100.00" fuelConsumption="50653.00" />
+						<Entry engineSpeed="1000.10" torque="1200.00" fuelConsumption="23530.00" />
+						<Entry engineSpeed="1000.10" torque="1400.00" fuelConsumption="27202.00" />
+						<Entry engineSpeed="1000.10" torque="1600.00" fuelConsumption="31165.00" />
+						<Entry engineSpeed="1000.10" torque="1800.00" fuelConsumption="35103.00" />
+						<Entry engineSpeed="1000.10" torque="2000.00" fuelConsumption="39360.00" />
+						<Entry engineSpeed="1000.10" torque="2200.00" fuelConsumption="44120.00" />
+						<Entry engineSpeed="1000.10" torque="2300.00" fuelConsumption="46836.00" />
+					</FuelConsumptionMap>
+				</Fuel>	
+			</Mode>
+
+		</v2.0:Data>
+	</tns:Engine>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Engine_hashed.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Engine_hashed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..13bf37ab1cf4cffd6871873b8d1cde798542752b
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Engine_hashed.xml
@@ -0,0 +1,427 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:Engine>
+        <v2.0:Data id="ENG-gooZah3D" xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+            <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+            <Model>Generic 40t Long Haul Truck Engine</Model>
+            <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+            <Date>2022-03-15T08:10:22.5745225Z</Date>
+            <AppVersion>VectoEngine x.y</AppVersion>
+            <Displacement>12730</Displacement>
+            <RatedSpeed>2200</RatedSpeed>
+            <RatedPower>380000</RatedPower>
+            <MaxEngineTorque>2300</MaxEngineTorque>
+            <WHRType>
+                <MechanicalOutputICE>false</MechanicalOutputICE>
+                <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+                <ElectricalOutput>false</ElectricalOutput>
+            </WHRType>
+            <Mode>
+                <IdlingSpeed>570</IdlingSpeed>
+                <FullLoadAndDragCurve>
+                    <Entry engineSpeed="800.30" maxTorque="1791.00" dragTorque="-149.00" />
+                    <Entry engineSpeed="1000.30" maxTorque="2300.00" dragTorque="-160.00" />
+                    <Entry engineSpeed="1200.30" maxTorque="2300.00" dragTorque="-179.00" />
+                    <Entry engineSpeed="1400.30" maxTorque="2300.00" dragTorque="-203.00" />
+                    <Entry engineSpeed="560.30" maxTorque="1180.00" dragTorque="-149.00" />
+                    <Entry engineSpeed="600.30" maxTorque="1282.00" dragTorque="-148.00" />
+                    <Entry engineSpeed="1600.30" maxTorque="2079.00" dragTorque="-235.00" />
+                    <Entry engineSpeed="1800.30" maxTorque="1857.00" dragTorque="-264.00" />
+                    <Entry engineSpeed="2000.30" maxTorque="1352.00" dragTorque="-301.00" />
+                    <Entry engineSpeed="2100.30" maxTorque="1100.00" dragTorque="-320.00" />
+                </FullLoadAndDragCurve>
+                <Fuel type="Ethanol CI">
+                    <WHTCUrban>4.0097</WHTCUrban>
+                    <WHTCRural>4.0035</WHTCRural>
+                    <WHTCMotorway>4.0200</WHTCMotorway>
+                    <BFColdHot>4.0000</BFColdHot>
+                    <CFRegPer>4.0000</CFRegPer>
+                    <CFNCV>4.0000</CFNCV>
+                    <FuelConsumptionMap>
+                        <Entry engineSpeed="560.40" torque="200.00" fuelConsumption="3197.00" />
+                        <Entry engineSpeed="560.40" torque="400.00" fuelConsumption="5295.00" />
+                        <Entry engineSpeed="560.40" torque="600.00" fuelConsumption="7615.00" />
+                        <Entry engineSpeed="560.40" torque="800.00" fuelConsumption="9375.00" />
+                        <Entry engineSpeed="560.40" torque="1000.00" fuelConsumption="11239.00" />
+                        <Entry engineSpeed="560.40" torque="-149.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="560.40" torque="0.00" fuelConsumption="1256.00" />
+                        <Entry engineSpeed="560.40" torque="1180.00" fuelConsumption="12869.00" />
+                        <Entry engineSpeed="600.40" torque="-148.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="600.40" torque="0.00" fuelConsumption="1459.00" />
+                        <Entry engineSpeed="600.40" torque="200.00" fuelConsumption="3358.00" />
+                        <Entry engineSpeed="600.40" torque="400.00" fuelConsumption="5498.00" />
+                        <Entry engineSpeed="600.40" torque="600.00" fuelConsumption="8101.00" />
+                        <Entry engineSpeed="600.40" torque="800.00" fuelConsumption="10014.00" />
+                        <Entry engineSpeed="600.40" torque="1000.00" fuelConsumption="12071.00" />
+                        <Entry engineSpeed="600.40" torque="1200.00" fuelConsumption="14201.00" />
+                        <Entry engineSpeed="600.40" torque="1282.00" fuelConsumption="15304.00" />
+                        <Entry engineSpeed="800.40" torque="-149.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="800.40" torque="0.00" fuelConsumption="1879.00" />
+                        <Entry engineSpeed="800.40" torque="200.00" fuelConsumption="4286.00" />
+                        <Entry engineSpeed="800.40" torque="400.00" fuelConsumption="7021.00" />
+                        <Entry engineSpeed="800.40" torque="600.00" fuelConsumption="10059.00" />
+                        <Entry engineSpeed="800.40" torque="800.00" fuelConsumption="13086.00" />
+                        <Entry engineSpeed="800.40" torque="1000.00" fuelConsumption="16015.00" />
+                        <Entry engineSpeed="800.40" torque="1200.00" fuelConsumption="19239.00" />
+                        <Entry engineSpeed="800.40" torque="1400.00" fuelConsumption="22426.00" />
+                        <Entry engineSpeed="800.40" torque="1600.00" fuelConsumption="25483.00" />
+                        <Entry engineSpeed="800.40" torque="1791.00" fuelConsumption="28905.00" />
+                        <Entry engineSpeed="1000.40" torque="-160.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="1000.40" torque="0.00" fuelConsumption="2865.00" />
+                        <Entry engineSpeed="1000.40" torque="200.00" fuelConsumption="5963.00" />
+                        <Entry engineSpeed="1000.40" torque="400.00" fuelConsumption="9198.00" />
+                        <Entry engineSpeed="1000.40" torque="600.00" fuelConsumption="12354.00" />
+                        <Entry engineSpeed="1000.40" torque="800.00" fuelConsumption="15965.00" />
+                        <Entry engineSpeed="1000.40" torque="1000.00" fuelConsumption="19864.00" />
+                        <Entry engineSpeed="1000.40" torque="1200.00" fuelConsumption="23530.00" />
+                        <Entry engineSpeed="1000.40" torque="1400.00" fuelConsumption="27202.00" />
+                        <Entry engineSpeed="1000.40" torque="1600.00" fuelConsumption="31165.00" />
+                        <Entry engineSpeed="1000.40" torque="1800.00" fuelConsumption="35103.00" />
+                        <Entry engineSpeed="1000.40" torque="2000.00" fuelConsumption="39360.00" />
+                        <Entry engineSpeed="1000.40" torque="2200.00" fuelConsumption="44120.00" />
+                        <Entry engineSpeed="1000.40" torque="2300.00" fuelConsumption="46836.00" />
+                        <Entry engineSpeed="1200.40" torque="-179.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="1200.40" torque="0.00" fuelConsumption="3307.00" />
+                        <Entry engineSpeed="1200.40" torque="200.00" fuelConsumption="6897.00" />
+                        <Entry engineSpeed="1200.40" torque="400.00" fuelConsumption="10651.00" />
+                        <Entry engineSpeed="1200.40" torque="600.00" fuelConsumption="14645.00" />
+                        <Entry engineSpeed="1200.40" torque="800.00" fuelConsumption="19115.00" />
+                        <Entry engineSpeed="1200.40" torque="1000.00" fuelConsumption="23677.00" />
+                        <Entry engineSpeed="1200.40" torque="1200.00" fuelConsumption="28180.00" />
+                        <Entry engineSpeed="1200.40" torque="1400.00" fuelConsumption="32431.00" />
+                        <Entry engineSpeed="1200.40" torque="1600.00" fuelConsumption="36698.00" />
+                        <Entry engineSpeed="1200.40" torque="1800.00" fuelConsumption="41691.00" />
+                        <Entry engineSpeed="1200.40" torque="2000.00" fuelConsumption="46915.00" />
+                        <Entry engineSpeed="1200.40" torque="2200.00" fuelConsumption="51783.00" />
+                        <Entry engineSpeed="1200.40" torque="2300.00" fuelConsumption="54932.00" />
+                        <Entry engineSpeed="1400.40" torque="-203.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="1400.40" torque="0.00" fuelConsumption="4306.00" />
+                        <Entry engineSpeed="1400.40" torque="200.00" fuelConsumption="8143.00" />
+                        <Entry engineSpeed="1400.40" torque="400.00" fuelConsumption="12723.00" />
+                        <Entry engineSpeed="1400.40" torque="600.00" fuelConsumption="17523.00" />
+                        <Entry engineSpeed="1400.40" torque="800.00" fuelConsumption="22288.00" />
+                        <Entry engineSpeed="1400.40" torque="1000.00" fuelConsumption="27093.00" />
+                        <Entry engineSpeed="1400.40" torque="1200.00" fuelConsumption="32536.00" />
+                        <Entry engineSpeed="1400.40" torque="1400.00" fuelConsumption="37746.00" />
+                        <Entry engineSpeed="1400.40" torque="1600.00" fuelConsumption="43194.00" />
+                        <Entry engineSpeed="1400.40" torque="1800.00" fuelConsumption="49453.00" />
+                        <Entry engineSpeed="1400.40" torque="2000.00" fuelConsumption="55830.00" />
+                        <Entry engineSpeed="1400.40" torque="2200.00" fuelConsumption="61072.00" />
+                        <Entry engineSpeed="1400.40" torque="2300.00" fuelConsumption="64377.00" />
+                        <Entry engineSpeed="1600.40" torque="-235.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="1600.40" torque="0.00" fuelConsumption="5209.00" />
+                        <Entry engineSpeed="1600.40" torque="200.00" fuelConsumption="9669.00" />
+                        <Entry engineSpeed="1600.40" torque="400.00" fuelConsumption="14838.00" />
+                        <Entry engineSpeed="1600.40" torque="600.00" fuelConsumption="20127.00" />
+                        <Entry engineSpeed="1600.40" torque="800.00" fuelConsumption="25894.00" />
+                        <Entry engineSpeed="1600.40" torque="1000.00" fuelConsumption="31631.00" />
+                        <Entry engineSpeed="1600.40" torque="1200.00" fuelConsumption="37248.00" />
+                        <Entry engineSpeed="1600.40" torque="1400.00" fuelConsumption="42826.00" />
+                        <Entry engineSpeed="1600.40" torque="1600.00" fuelConsumption="49752.00" />
+                        <Entry engineSpeed="1600.40" torque="1800.00" fuelConsumption="57020.00" />
+                        <Entry engineSpeed="1600.40" torque="2000.00" fuelConsumption="63914.00" />
+                        <Entry engineSpeed="1600.40" torque="2079.00" fuelConsumption="66520.00" />
+                        <Entry engineSpeed="1800.40" torque="-264.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="1800.40" torque="0.00" fuelConsumption="6409.00" />
+                        <Entry engineSpeed="1800.40" torque="200.00" fuelConsumption="11777.00" />
+                        <Entry engineSpeed="1800.40" torque="400.00" fuelConsumption="17320.00" />
+                        <Entry engineSpeed="1800.40" torque="600.00" fuelConsumption="23394.00" />
+                        <Entry engineSpeed="1800.40" torque="800.00" fuelConsumption="30501.00" />
+                        <Entry engineSpeed="1800.40" torque="1000.00" fuelConsumption="36378.00" />
+                        <Entry engineSpeed="1800.40" torque="1200.00" fuelConsumption="43079.00" />
+                        <Entry engineSpeed="1800.40" torque="1400.00" fuelConsumption="49796.00" />
+                        <Entry engineSpeed="1800.40" torque="1600.00" fuelConsumption="57436.00" />
+                        <Entry engineSpeed="1800.40" torque="1800.00" fuelConsumption="65157.00" />
+                        <Entry engineSpeed="1800.40" torque="1857.00" fuelConsumption="67574.00" />
+                        <Entry engineSpeed="2000.40" torque="-301.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="2000.40" torque="0.00" fuelConsumption="9127.00" />
+                        <Entry engineSpeed="2000.40" torque="200.00" fuelConsumption="14822.00" />
+                        <Entry engineSpeed="2000.40" torque="400.00" fuelConsumption="20655.00" />
+                        <Entry engineSpeed="2000.40" torque="600.00" fuelConsumption="27076.00" />
+                        <Entry engineSpeed="2000.40" torque="800.00" fuelConsumption="34188.00" />
+                        <Entry engineSpeed="2000.40" torque="1000.00" fuelConsumption="42837.00" />
+                        <Entry engineSpeed="2000.40" torque="1200.00" fuelConsumption="51018.00" />
+                        <Entry engineSpeed="2000.40" torque="1352.00" fuelConsumption="56618.00" />
+                        <Entry engineSpeed="2100.40" torque="-320.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="2100.40" torque="0.00" fuelConsumption="10470.00" />
+                        <Entry engineSpeed="2100.40" torque="200.00" fuelConsumption="16332.00" />
+                        <Entry engineSpeed="2100.40" torque="400.00" fuelConsumption="22396.00" />
+                        <Entry engineSpeed="2100.40" torque="600.00" fuelConsumption="28914.00" />
+                        <Entry engineSpeed="2100.40" torque="800.00" fuelConsumption="35717.00" />
+                        <Entry engineSpeed="2100.40" torque="1000.00" fuelConsumption="45643.00" />
+                        <Entry engineSpeed="2100.40" torque="1100.00" fuelConsumption="50653.00" />
+                    </FuelConsumptionMap>
+                </Fuel>
+                <Fuel type="Diesel CI">
+                    <WHTCUrban>3.0097</WHTCUrban>
+                    <WHTCRural>3.0035</WHTCRural>
+                    <WHTCMotorway>3.0200</WHTCMotorway>
+                    <BFColdHot>3.0000</BFColdHot>
+                    <CFRegPer>3.0000</CFRegPer>
+                    <CFNCV>3.0000</CFNCV>
+                    <FuelConsumptionMap>
+                        <Entry engineSpeed="800.30" torque="200.00" fuelConsumption="4286.00" />
+                        <Entry engineSpeed="800.30" torque="400.00" fuelConsumption="7021.00" />
+                        <Entry engineSpeed="800.30" torque="600.00" fuelConsumption="10059.00" />
+                        <Entry engineSpeed="800.30" torque="800.00" fuelConsumption="13086.00" />
+                        <Entry engineSpeed="800.30" torque="1000.00" fuelConsumption="16015.00" />
+                        <Entry engineSpeed="800.30" torque="1200.00" fuelConsumption="19239.00" />
+                        <Entry engineSpeed="800.30" torque="1400.00" fuelConsumption="22426.00" />
+                        <Entry engineSpeed="800.30" torque="1600.00" fuelConsumption="25483.00" />
+                        <Entry engineSpeed="800.30" torque="1791.00" fuelConsumption="28905.00" />
+                        <Entry engineSpeed="560.30" torque="-149.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="560.30" torque="0.00" fuelConsumption="1256.00" />
+                        <Entry engineSpeed="560.30" torque="200.00" fuelConsumption="3197.00" />
+                        <Entry engineSpeed="560.30" torque="400.00" fuelConsumption="5295.00" />
+                        <Entry engineSpeed="560.30" torque="600.00" fuelConsumption="7615.00" />
+                        <Entry engineSpeed="560.30" torque="800.00" fuelConsumption="9375.00" />
+                        <Entry engineSpeed="560.30" torque="1000.00" fuelConsumption="11239.00" />
+                        <Entry engineSpeed="560.30" torque="1180.00" fuelConsumption="12869.00" />
+                        <Entry engineSpeed="600.30" torque="-148.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="600.30" torque="0.00" fuelConsumption="1459.00" />
+                        <Entry engineSpeed="600.30" torque="200.00" fuelConsumption="3358.00" />
+                        <Entry engineSpeed="600.30" torque="400.00" fuelConsumption="5498.00" />
+                        <Entry engineSpeed="600.30" torque="600.00" fuelConsumption="8101.00" />
+                        <Entry engineSpeed="600.30" torque="800.00" fuelConsumption="10014.00" />
+                        <Entry engineSpeed="600.30" torque="1000.00" fuelConsumption="12071.00" />
+                        <Entry engineSpeed="600.30" torque="1200.00" fuelConsumption="14201.00" />
+                        <Entry engineSpeed="600.30" torque="1282.00" fuelConsumption="15304.00" />
+                        <Entry engineSpeed="800.30" torque="-149.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="800.30" torque="0.00" fuelConsumption="1879.00" />
+                        <Entry engineSpeed="1000.30" torque="-160.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="1000.30" torque="0.00" fuelConsumption="2865.00" />
+                        <Entry engineSpeed="1000.30" torque="200.00" fuelConsumption="5963.00" />
+                        <Entry engineSpeed="1000.30" torque="400.00" fuelConsumption="9198.00" />
+                        <Entry engineSpeed="1000.30" torque="600.00" fuelConsumption="12354.00" />
+                        <Entry engineSpeed="1000.30" torque="800.00" fuelConsumption="15965.00" />
+                        <Entry engineSpeed="1000.30" torque="1000.00" fuelConsumption="19864.00" />
+                        <Entry engineSpeed="1000.30" torque="1200.00" fuelConsumption="23530.00" />
+                        <Entry engineSpeed="1000.30" torque="1400.00" fuelConsumption="27202.00" />
+                        <Entry engineSpeed="1000.30" torque="1600.00" fuelConsumption="31165.00" />
+                        <Entry engineSpeed="1000.30" torque="1800.00" fuelConsumption="35103.00" />
+                        <Entry engineSpeed="1000.30" torque="2000.00" fuelConsumption="39360.00" />
+                        <Entry engineSpeed="1000.30" torque="2200.00" fuelConsumption="44120.00" />
+                        <Entry engineSpeed="1000.30" torque="2300.00" fuelConsumption="46836.00" />
+                        <Entry engineSpeed="1200.30" torque="-179.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="1200.30" torque="0.00" fuelConsumption="3307.00" />
+                        <Entry engineSpeed="1200.30" torque="200.00" fuelConsumption="6897.00" />
+                        <Entry engineSpeed="1200.30" torque="400.00" fuelConsumption="10651.00" />
+                        <Entry engineSpeed="1200.30" torque="600.00" fuelConsumption="14645.00" />
+                        <Entry engineSpeed="1200.30" torque="800.00" fuelConsumption="19115.00" />
+                        <Entry engineSpeed="1200.30" torque="1000.00" fuelConsumption="23677.00" />
+                        <Entry engineSpeed="1200.30" torque="1200.00" fuelConsumption="28180.00" />
+                        <Entry engineSpeed="1200.30" torque="1400.00" fuelConsumption="32431.00" />
+                        <Entry engineSpeed="1200.30" torque="1600.00" fuelConsumption="36698.00" />
+                        <Entry engineSpeed="1200.30" torque="1800.00" fuelConsumption="41691.00" />
+                        <Entry engineSpeed="1200.30" torque="2000.00" fuelConsumption="46915.00" />
+                        <Entry engineSpeed="1200.30" torque="2200.00" fuelConsumption="51783.00" />
+                        <Entry engineSpeed="1200.30" torque="2300.00" fuelConsumption="54932.00" />
+                        <Entry engineSpeed="1400.30" torque="-203.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="1400.30" torque="0.00" fuelConsumption="4306.00" />
+                        <Entry engineSpeed="1400.30" torque="200.00" fuelConsumption="8143.00" />
+                        <Entry engineSpeed="1400.30" torque="400.00" fuelConsumption="12723.00" />
+                        <Entry engineSpeed="1400.30" torque="600.00" fuelConsumption="17523.00" />
+                        <Entry engineSpeed="1400.30" torque="800.00" fuelConsumption="22288.00" />
+                        <Entry engineSpeed="1400.30" torque="1000.00" fuelConsumption="27093.00" />
+                        <Entry engineSpeed="1400.30" torque="1200.00" fuelConsumption="32536.00" />
+                        <Entry engineSpeed="1400.30" torque="1400.00" fuelConsumption="37746.00" />
+                        <Entry engineSpeed="1400.30" torque="1600.00" fuelConsumption="43194.00" />
+                        <Entry engineSpeed="1400.30" torque="1800.00" fuelConsumption="49453.00" />
+                        <Entry engineSpeed="1400.30" torque="2000.00" fuelConsumption="55830.00" />
+                        <Entry engineSpeed="1400.30" torque="2200.00" fuelConsumption="61072.00" />
+                        <Entry engineSpeed="1400.30" torque="2300.00" fuelConsumption="64377.00" />
+                        <Entry engineSpeed="1600.30" torque="-235.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="1600.30" torque="0.00" fuelConsumption="5209.00" />
+                        <Entry engineSpeed="1600.30" torque="200.00" fuelConsumption="9669.00" />
+                        <Entry engineSpeed="1600.30" torque="400.00" fuelConsumption="14838.00" />
+                        <Entry engineSpeed="1600.30" torque="600.00" fuelConsumption="20127.00" />
+                        <Entry engineSpeed="1600.30" torque="800.00" fuelConsumption="25894.00" />
+                        <Entry engineSpeed="1600.30" torque="1000.00" fuelConsumption="31631.00" />
+                        <Entry engineSpeed="1600.30" torque="1200.00" fuelConsumption="37248.00" />
+                        <Entry engineSpeed="1600.30" torque="1400.00" fuelConsumption="42826.00" />
+                        <Entry engineSpeed="1600.30" torque="1600.00" fuelConsumption="49752.00" />
+                        <Entry engineSpeed="1600.30" torque="1800.00" fuelConsumption="57020.00" />
+                        <Entry engineSpeed="1600.30" torque="2000.00" fuelConsumption="63914.00" />
+                        <Entry engineSpeed="1600.30" torque="2079.00" fuelConsumption="66520.00" />
+                        <Entry engineSpeed="1800.30" torque="-264.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="1800.30" torque="0.00" fuelConsumption="6409.00" />
+                        <Entry engineSpeed="1800.30" torque="200.00" fuelConsumption="11777.00" />
+                        <Entry engineSpeed="1800.30" torque="400.00" fuelConsumption="17320.00" />
+                        <Entry engineSpeed="1800.30" torque="600.00" fuelConsumption="23394.00" />
+                        <Entry engineSpeed="1800.30" torque="800.00" fuelConsumption="30501.00" />
+                        <Entry engineSpeed="1800.30" torque="1000.00" fuelConsumption="36378.00" />
+                        <Entry engineSpeed="1800.30" torque="1200.00" fuelConsumption="43079.00" />
+                        <Entry engineSpeed="1800.30" torque="1400.00" fuelConsumption="49796.00" />
+                        <Entry engineSpeed="1800.30" torque="1600.00" fuelConsumption="57436.00" />
+                        <Entry engineSpeed="1800.30" torque="1800.00" fuelConsumption="65157.00" />
+                        <Entry engineSpeed="1800.30" torque="1857.00" fuelConsumption="67574.00" />
+                        <Entry engineSpeed="2000.30" torque="-301.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="2000.30" torque="0.00" fuelConsumption="9127.00" />
+                        <Entry engineSpeed="2000.30" torque="200.00" fuelConsumption="14822.00" />
+                        <Entry engineSpeed="2000.30" torque="400.00" fuelConsumption="20655.00" />
+                        <Entry engineSpeed="2000.30" torque="600.00" fuelConsumption="27076.00" />
+                        <Entry engineSpeed="2000.30" torque="800.00" fuelConsumption="34188.00" />
+                        <Entry engineSpeed="2000.30" torque="1000.00" fuelConsumption="42837.00" />
+                        <Entry engineSpeed="2000.30" torque="1200.00" fuelConsumption="51018.00" />
+                        <Entry engineSpeed="2000.30" torque="1352.00" fuelConsumption="56618.00" />
+                        <Entry engineSpeed="2100.30" torque="-320.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="2100.30" torque="0.00" fuelConsumption="10470.00" />
+                        <Entry engineSpeed="2100.30" torque="200.00" fuelConsumption="16332.00" />
+                        <Entry engineSpeed="2100.30" torque="400.00" fuelConsumption="22396.00" />
+                        <Entry engineSpeed="2100.30" torque="600.00" fuelConsumption="28914.00" />
+                        <Entry engineSpeed="2100.30" torque="800.00" fuelConsumption="35717.00" />
+                        <Entry engineSpeed="2100.30" torque="1000.00" fuelConsumption="45643.00" />
+                        <Entry engineSpeed="2100.30" torque="1100.00" fuelConsumption="50653.00" />
+                    </FuelConsumptionMap>
+                </Fuel>
+            </Mode>
+            <Mode>
+                <IdlingSpeed>560</IdlingSpeed>
+                <FullLoadAndDragCurve>
+                    <Entry engineSpeed="1000.10" maxTorque="2300.00" dragTorque="-160.00" />
+                    <Entry engineSpeed="1200.10" maxTorque="2300.00" dragTorque="-179.00" />
+                    <Entry engineSpeed="1400.10" maxTorque="2300.00" dragTorque="-203.00" />
+                    <Entry engineSpeed="1600.10" maxTorque="2079.00" dragTorque="-235.00" />
+                    <Entry engineSpeed="560.10" maxTorque="1180.00" dragTorque="-149.00" />
+                    <Entry engineSpeed="600.10" maxTorque="1282.00" dragTorque="-148.00" />
+                    <Entry engineSpeed="800.10" maxTorque="1791.00" dragTorque="-149.00" />
+                    <Entry engineSpeed="2000.10" maxTorque="1352.00" dragTorque="-301.00" />
+                    <Entry engineSpeed="2100.10" maxTorque="1100.00" dragTorque="-320.00" />
+                    <Entry engineSpeed="1800.10" maxTorque="1857.00" dragTorque="-264.00" />
+                </FullLoadAndDragCurve>
+                <Fuel type="Diesel CI">
+                    <WHTCUrban>1.0097</WHTCUrban>
+                    <WHTCRural>1.0035</WHTCRural>
+                    <WHTCMotorway>1.0200</WHTCMotorway>
+                    <BFColdHot>1.0000</BFColdHot>
+                    <CFRegPer>1.0000</CFRegPer>
+                    <CFNCV>1.0000</CFNCV>
+                    <FuelConsumptionMap>
+                        <Entry engineSpeed="560.10" torque="600.00" fuelConsumption="7615.00" />
+                        <Entry engineSpeed="560.10" torque="800.00" fuelConsumption="9375.00" />
+                        <Entry engineSpeed="560.10" torque="1000.00" fuelConsumption="11239.00" />
+                        <Entry engineSpeed="560.10" torque="1180.00" fuelConsumption="12869.00" />
+                        <Entry engineSpeed="560.10" torque="-149.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="560.10" torque="0.00" fuelConsumption="1256.00" />
+                        <Entry engineSpeed="560.10" torque="200.00" fuelConsumption="3197.00" />
+                        <Entry engineSpeed="560.10" torque="400.00" fuelConsumption="5295.00" />
+                        <Entry engineSpeed="600.10" torque="-148.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="600.10" torque="0.00" fuelConsumption="1459.00" />
+                        <Entry engineSpeed="600.10" torque="200.00" fuelConsumption="3358.00" />
+                        <Entry engineSpeed="600.10" torque="400.00" fuelConsumption="5498.00" />
+                        <Entry engineSpeed="600.10" torque="600.00" fuelConsumption="8101.00" />
+                        <Entry engineSpeed="600.10" torque="800.00" fuelConsumption="10014.00" />
+                        <Entry engineSpeed="600.10" torque="1000.00" fuelConsumption="12071.00" />
+                        <Entry engineSpeed="600.10" torque="1200.00" fuelConsumption="14201.00" />
+                        <Entry engineSpeed="600.10" torque="1282.00" fuelConsumption="15304.00" />
+                        <Entry engineSpeed="800.10" torque="-149.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="800.10" torque="0.00" fuelConsumption="1879.00" />
+                        <Entry engineSpeed="800.10" torque="200.00" fuelConsumption="4286.00" />
+                        <Entry engineSpeed="800.10" torque="400.00" fuelConsumption="7021.00" />
+                        <Entry engineSpeed="800.10" torque="600.00" fuelConsumption="10059.00" />
+                        <Entry engineSpeed="800.10" torque="800.00" fuelConsumption="13086.00" />
+                        <Entry engineSpeed="800.10" torque="1000.00" fuelConsumption="16015.00" />
+                        <Entry engineSpeed="800.10" torque="1200.00" fuelConsumption="19239.00" />
+                        <Entry engineSpeed="800.10" torque="1400.00" fuelConsumption="22426.00" />
+                        <Entry engineSpeed="800.10" torque="1600.00" fuelConsumption="25483.00" />
+                        <Entry engineSpeed="800.10" torque="1791.00" fuelConsumption="28905.00" />
+                        <Entry engineSpeed="1000.10" torque="-160.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="1000.10" torque="0.00" fuelConsumption="2865.00" />
+                        <Entry engineSpeed="1000.10" torque="200.00" fuelConsumption="5963.00" />
+                        <Entry engineSpeed="1000.10" torque="400.00" fuelConsumption="9198.00" />
+                        <Entry engineSpeed="1000.10" torque="600.00" fuelConsumption="12354.00" />
+                        <Entry engineSpeed="1000.10" torque="800.00" fuelConsumption="15965.00" />
+                        <Entry engineSpeed="1000.10" torque="1000.00" fuelConsumption="19864.00" />
+                        <Entry engineSpeed="1200.10" torque="-179.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="1200.10" torque="0.00" fuelConsumption="3307.00" />
+                        <Entry engineSpeed="1200.10" torque="200.00" fuelConsumption="6897.00" />
+                        <Entry engineSpeed="1200.10" torque="400.00" fuelConsumption="10651.00" />
+                        <Entry engineSpeed="1200.10" torque="600.00" fuelConsumption="14645.00" />
+                        <Entry engineSpeed="1200.10" torque="800.00" fuelConsumption="19115.00" />
+                        <Entry engineSpeed="1200.10" torque="1000.00" fuelConsumption="23677.00" />
+                        <Entry engineSpeed="1200.10" torque="1200.00" fuelConsumption="28180.00" />
+                        <Entry engineSpeed="1200.10" torque="1400.00" fuelConsumption="32431.00" />
+                        <Entry engineSpeed="1200.10" torque="1600.00" fuelConsumption="36698.00" />
+                        <Entry engineSpeed="1200.10" torque="1800.00" fuelConsumption="41691.00" />
+                        <Entry engineSpeed="1200.10" torque="2000.00" fuelConsumption="46915.00" />
+                        <Entry engineSpeed="1200.10" torque="2200.00" fuelConsumption="51783.00" />
+                        <Entry engineSpeed="1200.10" torque="2300.00" fuelConsumption="54932.00" />
+                        <Entry engineSpeed="1400.10" torque="-203.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="1400.10" torque="0.00" fuelConsumption="4306.00" />
+                        <Entry engineSpeed="1400.10" torque="200.00" fuelConsumption="8143.00" />
+                        <Entry engineSpeed="1400.10" torque="400.00" fuelConsumption="12723.00" />
+                        <Entry engineSpeed="1400.10" torque="600.00" fuelConsumption="17523.00" />
+                        <Entry engineSpeed="1400.10" torque="800.00" fuelConsumption="22288.00" />
+                        <Entry engineSpeed="1400.10" torque="1000.00" fuelConsumption="27093.00" />
+                        <Entry engineSpeed="1400.10" torque="1200.00" fuelConsumption="32536.00" />
+                        <Entry engineSpeed="1400.10" torque="1400.00" fuelConsumption="37746.00" />
+                        <Entry engineSpeed="1400.10" torque="1600.00" fuelConsumption="43194.00" />
+                        <Entry engineSpeed="1400.10" torque="1800.00" fuelConsumption="49453.00" />
+                        <Entry engineSpeed="1400.10" torque="2000.00" fuelConsumption="55830.00" />
+                        <Entry engineSpeed="1400.10" torque="2200.00" fuelConsumption="61072.00" />
+                        <Entry engineSpeed="1400.10" torque="2300.00" fuelConsumption="64377.00" />
+                        <Entry engineSpeed="1600.10" torque="-235.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="1600.10" torque="0.00" fuelConsumption="5209.00" />
+                        <Entry engineSpeed="1600.10" torque="200.00" fuelConsumption="9669.00" />
+                        <Entry engineSpeed="1600.10" torque="400.00" fuelConsumption="14838.00" />
+                        <Entry engineSpeed="1600.10" torque="600.00" fuelConsumption="20127.00" />
+                        <Entry engineSpeed="1600.10" torque="800.00" fuelConsumption="25894.00" />
+                        <Entry engineSpeed="1600.10" torque="1000.00" fuelConsumption="31631.00" />
+                        <Entry engineSpeed="1600.10" torque="1200.00" fuelConsumption="37248.00" />
+                        <Entry engineSpeed="1600.10" torque="1400.00" fuelConsumption="42826.00" />
+                        <Entry engineSpeed="1600.10" torque="1600.00" fuelConsumption="49752.00" />
+                        <Entry engineSpeed="1600.10" torque="1800.00" fuelConsumption="57020.00" />
+                        <Entry engineSpeed="1600.10" torque="2000.00" fuelConsumption="63914.00" />
+                        <Entry engineSpeed="1600.10" torque="2079.00" fuelConsumption="66520.00" />
+                        <Entry engineSpeed="1800.10" torque="-264.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="1800.10" torque="0.00" fuelConsumption="6409.00" />
+                        <Entry engineSpeed="1800.10" torque="200.00" fuelConsumption="11777.00" />
+                        <Entry engineSpeed="1800.10" torque="400.00" fuelConsumption="17320.00" />
+                        <Entry engineSpeed="1800.10" torque="600.00" fuelConsumption="23394.00" />
+                        <Entry engineSpeed="1800.10" torque="800.00" fuelConsumption="30501.00" />
+                        <Entry engineSpeed="1800.10" torque="1000.00" fuelConsumption="36378.00" />
+                        <Entry engineSpeed="1800.10" torque="1200.00" fuelConsumption="43079.00" />
+                        <Entry engineSpeed="1800.10" torque="1400.00" fuelConsumption="49796.00" />
+                        <Entry engineSpeed="1800.10" torque="1600.00" fuelConsumption="57436.00" />
+                        <Entry engineSpeed="1800.10" torque="1800.00" fuelConsumption="65157.00" />
+                        <Entry engineSpeed="1800.10" torque="1857.00" fuelConsumption="67574.00" />
+                        <Entry engineSpeed="2000.10" torque="-301.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="2000.10" torque="0.00" fuelConsumption="9127.00" />
+                        <Entry engineSpeed="2000.10" torque="200.00" fuelConsumption="14822.00" />
+                        <Entry engineSpeed="2000.10" torque="400.00" fuelConsumption="20655.00" />
+                        <Entry engineSpeed="2000.10" torque="600.00" fuelConsumption="27076.00" />
+                        <Entry engineSpeed="2000.10" torque="800.00" fuelConsumption="34188.00" />
+                        <Entry engineSpeed="2000.10" torque="1000.00" fuelConsumption="42837.00" />
+                        <Entry engineSpeed="2000.10" torque="1200.00" fuelConsumption="51018.00" />
+                        <Entry engineSpeed="2000.10" torque="1352.00" fuelConsumption="56618.00" />
+                        <Entry engineSpeed="2100.10" torque="-320.00" fuelConsumption="0.00" />
+                        <Entry engineSpeed="2100.10" torque="0.00" fuelConsumption="10470.00" />
+                        <Entry engineSpeed="2100.10" torque="200.00" fuelConsumption="16332.00" />
+                        <Entry engineSpeed="2100.10" torque="400.00" fuelConsumption="22396.00" />
+                        <Entry engineSpeed="2100.10" torque="600.00" fuelConsumption="28914.00" />
+                        <Entry engineSpeed="2100.10" torque="800.00" fuelConsumption="35717.00" />
+                        <Entry engineSpeed="2100.10" torque="1000.00" fuelConsumption="45643.00" />
+                        <Entry engineSpeed="2100.10" torque="1100.00" fuelConsumption="50653.00" />
+                        <Entry engineSpeed="1000.10" torque="1200.00" fuelConsumption="23530.00" />
+                        <Entry engineSpeed="1000.10" torque="1400.00" fuelConsumption="27202.00" />
+                        <Entry engineSpeed="1000.10" torque="1600.00" fuelConsumption="31165.00" />
+                        <Entry engineSpeed="1000.10" torque="1800.00" fuelConsumption="35103.00" />
+                        <Entry engineSpeed="1000.10" torque="2000.00" fuelConsumption="39360.00" />
+                        <Entry engineSpeed="1000.10" torque="2200.00" fuelConsumption="44120.00" />
+                        <Entry engineSpeed="1000.10" torque="2300.00" fuelConsumption="46836.00" />
+                    </FuelConsumptionMap>
+                </Fuel>
+            </Mode>
+        </v2.0:Data>
+        <v2.0:Signature>
+            <di:Reference URI="#ENG-gooZah3D">
+                <di:Transforms>
+                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </di:Transforms>
+                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <di:DigestValue>KDW9qOoFFe8gAVvOtzQ9lMOOaksXtpMriiwJEjK0U7U=</di:DigestValue>
+            </di:Reference>
+        </v2.0:Signature>
+    </tns:Engine>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Gearbox_APT-N.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Gearbox_APT-N.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eba756f9fa172ba310442c2e134b567987b8d58c
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Gearbox_APT-N.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:Gearbox>
+        <v2.0:Data xsi:type="GearboxDataDeclarationType" id="GBX-asdf">
+            <Manufacturer>Generic Vendor</Manufacturer>
+            <Model>GB_12-gear</Model>
+            <CertificationNumber>GBX-GB_12-gear</CertificationNumber>
+            <Date>2021-11-18T14:23:31.4958567Z</Date>
+            <AppVersion>VectoCore</AppVersion>
+            <TransmissionType>APT-N</TransmissionType>
+            <MainCertificationMethod>Standard values</MainCertificationMethod>
+            <v2.3:Gears xsi:type="GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+                <Gear number="1">
+                    <Ratio>14.930</Ratio>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						 <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                    </TorqueLossMap>
+                </Gear>
+				<Gear number="3">
+                    <Ratio>9.020</Ratio>
+                    <TorqueLossMap>
+					    <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+				
+                <Gear number="2">
+                    <Ratio>11.640</Ratio>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+
+            </v2.3:Gears>
+        </v2.0:Data>
+     </tns:Gearbox>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Gearbox_APT-N_hashed.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Gearbox_APT-N_hashed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d191c7b94a9e602d31436bee21d12338fa8d9526
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Gearbox_APT-N_hashed.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:Gearbox>
+        <v2.0:Data xsi:type="GearboxDataDeclarationType" id="GBX-asdf">
+            <v2.3:Manufacturer>Generic Vendor</v2.3:Manufacturer>
+            <v2.3:Model>GB_12-gear</v2.3:Model>
+            <v2.3:CertificationNumber>GBX-GB_12-gear</v2.3:CertificationNumber>
+            <v2.3:Date>2022-03-15T08:10:36.8806567Z</v2.3:Date>
+            <v2.3:AppVersion>VectoCore</v2.3:AppVersion>
+            <v2.3:TransmissionType>APT-N</v2.3:TransmissionType>
+            <v2.3:MainCertificationMethod>Standard values</v2.3:MainCertificationMethod>
+            <v2.3:Gears xsi:type="GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+                <Gear number="1">
+                    <Ratio>14.930</Ratio>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                    </TorqueLossMap>
+                </Gear>
+                <Gear number="3">
+                    <Ratio>9.020</Ratio>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+                <Gear number="2">
+                    <Ratio>11.640</Ratio>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+            </v2.3:Gears>
+        </v2.0:Data>
+        <v2.0:Signature>
+            <di:Reference URI="#GBX-asdf">
+                <di:Transforms>
+                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </di:Transforms>
+                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <di:DigestValue>q8rEv/JLdlyX2WlBoNWaax/f/E/aUsffJmeOSaOr4ms=</di:DigestValue>
+            </di:Reference>
+        </v2.0:Signature>
+    </tns:Gearbox>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Gearbox_FWD.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Gearbox_FWD.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9f957bb70ebc272865867ecea27b93586e84a018
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Gearbox_FWD.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:Gearbox>
+        <v2.0:Data xsi:type="GearboxFWDDataDeclarationType" id="GBX-asdf">
+            <Manufacturer>Generic Vendor</Manufacturer>
+            <Model>GB_12-gear</Model>
+            <CertificationNumber>GBX-GB_12-gear</CertificationNumber>
+            <Date>2021-11-18T14:23:31.4958567Z</Date>
+            <AppVersion>VectoCore</AppVersion>
+            <TransmissionType>APT-P</TransmissionType>
+            <MainCertificationMethod>Standard values</MainCertificationMethod>
+            <DifferentialIncluded>true</DifferentialIncluded>
+            <AxlegearRatio>1.000</AxlegearRatio>
+            <v2.3:Gears xsi:type="GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+			    <Gear number="3">
+                    <Ratio>9.020</Ratio>
+                    <MaxTorque>1300</MaxTorque>
+                    <MaxSpeed>112</MaxSpeed>
+                    <TorqueLossMap>
+					    <Entry inputSpeed="5000.00" inputTorque="0.30" torqueLoss="31.30" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.30" torqueLoss="31.30" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.30" torqueLoss="2000.30" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-50000.30" torqueLoss="2000.30" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.30" torqueLoss="5.30" />
+                        <Entry inputSpeed="0.00" inputTorque="0.30" torqueLoss="5.30" />
+                        <Entry inputSpeed="0.00" inputTorque="125.30" torqueLoss="5.30" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.30" torqueLoss="2000.30" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.30" torqueLoss="2000.30" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.30" torqueLoss="31.30" />
+
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+			    <Gear number="2">
+                    <Ratio>11.640</Ratio>
+                    <MaxTorque>1200</MaxTorque>
+                    <MaxSpeed>110</MaxSpeed>
+                    <TorqueLossMap>
+						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+					
+                        <Entry inputSpeed="0.00" inputTorque="-50000.20" torqueLoss="2000.20" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.20" torqueLoss="5.20" />
+                        <Entry inputSpeed="0.00" inputTorque="0.20" torqueLoss="5.20" />
+                        <Entry inputSpeed="0.00" inputTorque="125.20" torqueLoss="5.20" />
+
+                        <Entry inputSpeed="5000.00" inputTorque="-780.20" torqueLoss="31.20" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.20" torqueLoss="31.20" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.20" torqueLoss="31.20" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.20" torqueLoss="2000.20" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.20" torqueLoss="2000.20" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.20" torqueLoss="2000.20" />
+                    </TorqueLossMap>
+                </Gear>
+                <Gear number="1">
+                    <Ratio>14.930</Ratio>
+                    <MaxTorque>1000</MaxTorque>
+                    <MaxSpeed>100</MaxSpeed>
+                    <TorqueLossMap>
+					    <Entry inputSpeed="5000.00" inputTorque="-50000.10" torqueLoss="2000.10" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.10" torqueLoss="31.10" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.10" torqueLoss="31.10" />
+					
+                        <Entry inputSpeed="0.00" inputTorque="-50000.10" torqueLoss="2000.10" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.10" torqueLoss="5.10" />
+                        <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="0.00" inputTorque="0.10" torqueLoss="5.10" />
+                        <Entry inputSpeed="0.00" inputTorque="125.10" torqueLoss="5.10" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.10" torqueLoss="2000.10" />
+
+                        <Entry inputSpeed="5000.00" inputTorque="780.10" torqueLoss="31.10" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.10" torqueLoss="2000.10" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+
+                    </TorqueLossMap>
+                </Gear>
+            </v2.3:Gears>
+        </v2.0:Data>
+     </tns:Gearbox>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Gearbox_FWD_hashed.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Gearbox_FWD_hashed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b1bc0edf415174e472ed9180e4bfbb46fda4f727
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Gearbox_FWD_hashed.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:Gearbox>
+        <v2.0:Data xsi:type="GearboxFWDDataDeclarationType" id="GBX-asdf">
+            <v2.3:Manufacturer>Generic Vendor</v2.3:Manufacturer>
+            <v2.3:Model>GB_12-gear</v2.3:Model>
+            <v2.3:CertificationNumber>GBX-GB_12-gear</v2.3:CertificationNumber>
+            <v2.3:Date>2022-03-15T08:10:51.9758105Z</v2.3:Date>
+            <v2.3:AppVersion>VectoCore</v2.3:AppVersion>
+            <v2.3:TransmissionType>APT-P</v2.3:TransmissionType>
+            <v2.3:MainCertificationMethod>Standard values</v2.3:MainCertificationMethod>
+            <v2.3:DifferentialIncluded>true</v2.3:DifferentialIncluded>
+            <v2.3:AxlegearRatio>1.000</v2.3:AxlegearRatio>
+            <v2.3:Gears xsi:type="GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+                <Gear number="3">
+                    <Ratio>9.020</Ratio>
+                    <MaxTorque>1300</MaxTorque>
+                    <MaxSpeed>112</MaxSpeed>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="5000.00" inputTorque="0.30" torqueLoss="31.30" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.30" torqueLoss="31.30" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.30" torqueLoss="2000.30" />
+                        <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-50000.30" torqueLoss="2000.30" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.30" torqueLoss="5.30" />
+                        <Entry inputSpeed="0.00" inputTorque="0.30" torqueLoss="5.30" />
+                        <Entry inputSpeed="0.00" inputTorque="125.30" torqueLoss="5.30" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.30" torqueLoss="2000.30" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.30" torqueLoss="2000.30" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.30" torqueLoss="31.30" />
+                        <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+                <Gear number="2">
+                    <Ratio>11.640</Ratio>
+                    <MaxTorque>1200</MaxTorque>
+                    <MaxSpeed>110</MaxSpeed>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-50000.20" torqueLoss="2000.20" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.20" torqueLoss="5.20" />
+                        <Entry inputSpeed="0.00" inputTorque="0.20" torqueLoss="5.20" />
+                        <Entry inputSpeed="0.00" inputTorque="125.20" torqueLoss="5.20" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.20" torqueLoss="31.20" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.20" torqueLoss="31.20" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.20" torqueLoss="31.20" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.20" torqueLoss="2000.20" />
+                        <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.20" torqueLoss="2000.20" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.20" torqueLoss="2000.20" />
+                    </TorqueLossMap>
+                </Gear>
+                <Gear number="1">
+                    <Ratio>14.930</Ratio>
+                    <MaxTorque>1000</MaxTorque>
+                    <MaxSpeed>100</MaxSpeed>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.10" torqueLoss="2000.10" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.10" torqueLoss="31.10" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.10" torqueLoss="31.10" />
+                        <Entry inputSpeed="0.00" inputTorque="-50000.10" torqueLoss="2000.10" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.10" torqueLoss="5.10" />
+                        <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.10" torqueLoss="5.10" />
+                        <Entry inputSpeed="0.00" inputTorque="125.10" torqueLoss="5.10" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.10" torqueLoss="2000.10" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.10" torqueLoss="31.10" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.10" torqueLoss="2000.10" />
+                        <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                    </TorqueLossMap>
+                </Gear>
+            </v2.3:Gears>
+        </v2.0:Data>
+        <v2.0:Signature>
+            <di:Reference URI="#GBX-asdf">
+                <di:Transforms>
+                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </di:Transforms>
+                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <di:DigestValue>7Jm+EXKu2MsOfwaOaPRFsPaktEPACid8QuTuSfeUC8U=</di:DigestValue>
+            </di:Reference>
+        </v2.0:Signature>
+    </tns:Gearbox>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Gearbox_IHPC.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Gearbox_IHPC.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b6b9ac8a0d80583011d3f57bdef6f4d04bd065a2
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Gearbox_IHPC.xml
@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:Gearbox>
+        <v2.0:Data xsi:type="GearboxDataDeclarationType" id="GBX-asdf">
+            <Manufacturer>Generic Vendor</Manufacturer>
+            <Model>GB_12-gear</Model>
+            <CertificationNumber>GBX-GB_12-gear</CertificationNumber>
+            <Date>2021-11-18T14:30:10.5091769Z</Date>
+            <AppVersion>VectoCore</AppVersion>
+            <TransmissionType>IHPC Type 1</TransmissionType>
+            <MainCertificationMethod>Standard values</MainCertificationMethod>
+            <v2.3:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+                <Gear number="1">
+                    <Ratio>14.930</Ratio>
+                    <TorqueLossMap>
+					    <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+					
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+                <Gear number="2">
+                    <Ratio>11.640</Ratio>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+
+                <Gear number="4">
+                    <Ratio>7.040</Ratio>
+                    <TorqueLossMap>
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+
+				<Gear number="10">
+					<Ratio>1.600</Ratio>
+					<TorqueLossMap>
+						<Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+						<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+						<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+						<Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+					</TorqueLossMap>
+				</Gear>
+
+				<Gear number="7">
+                    <Ratio>3.390</Ratio>
+                    <TorqueLossMap>
+					    <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+                <Gear number="5">
+                    <Ratio>5.640</Ratio>
+                    <TorqueLossMap>
+					    <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+					
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+				<Gear number="12">
+                    <Ratio>1.000</Ratio>
+                    <TorqueLossMap>
+					    <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="1000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="1000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-845.00" torqueLoss="17.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="1000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-250.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="250.00" torqueLoss="5.00" />
+
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="17.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="845.00" torqueLoss="17.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="1000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+                <Gear number="6">
+                    <Ratio>4.400</Ratio>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+
+                <Gear number="8">
+                    <Ratio>2.650</Ratio>
+                    <TorqueLossMap>
+					    <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+				<Gear number="3">
+                    <Ratio>9.020</Ratio>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+      
+						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                    </TorqueLossMap>
+                </Gear>
+				
+				
+                <Gear number="9">
+                    <Ratio>2.050</Ratio>
+                    <TorqueLossMap>
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />					
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+
+                <Gear number="11">
+                    <Ratio>1.280</Ratio>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+				
+
+
+            </v2.3:Gears>
+        </v2.0:Data>
+    </tns:Gearbox>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Gearbox_IHPC_hashed.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Gearbox_IHPC_hashed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..12d77ad284b5f1e1202a507ec65ca79d4aaede50
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Gearbox_IHPC_hashed.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:Gearbox>
+        <v2.0:Data xsi:type="GearboxDataDeclarationType" id="GBX-asdf">
+            <v2.3:Manufacturer>Generic Vendor</v2.3:Manufacturer>
+            <v2.3:Model>GB_12-gear</v2.3:Model>
+            <v2.3:CertificationNumber>GBX-GB_12-gear</v2.3:CertificationNumber>
+            <v2.3:Date>2022-03-15T08:13:35.0858393Z</v2.3:Date>
+            <v2.3:AppVersion>VectoCore</v2.3:AppVersion>
+            <v2.3:TransmissionType>IHPC Type 1</v2.3:TransmissionType>
+            <v2.3:MainCertificationMethod>Standard values</v2.3:MainCertificationMethod>
+            <v2.3:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+                <Gear number="1">
+                    <Ratio>14.930</Ratio>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+                <Gear number="2">
+                    <Ratio>11.640</Ratio>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+                <Gear number="4">
+                    <Ratio>7.040</Ratio>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+                <Gear number="10">
+                    <Ratio>1.600</Ratio>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+                <Gear number="7">
+                    <Ratio>3.390</Ratio>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+                <Gear number="5">
+                    <Ratio>5.640</Ratio>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+                <Gear number="12">
+                    <Ratio>1.000</Ratio>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="1000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="1000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-845.00" torqueLoss="17.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="1000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-250.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="250.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="17.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="845.00" torqueLoss="17.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="1000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+                <Gear number="6">
+                    <Ratio>4.400</Ratio>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+                <Gear number="8">
+                    <Ratio>2.650</Ratio>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+                <Gear number="3">
+                    <Ratio>9.020</Ratio>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                    </TorqueLossMap>
+                </Gear>
+                <Gear number="9">
+                    <Ratio>2.050</Ratio>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+                <Gear number="11">
+                    <Ratio>1.280</Ratio>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+            </v2.3:Gears>
+        </v2.0:Data>
+        <v2.0:Signature>
+            <di:Reference URI="#GBX-asdf">
+                <di:Transforms>
+                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </di:Transforms>
+                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <di:DigestValue>u/3pX6GcmHGk1ui9vKRxz1ClBGBeVoASaeDcvFTQbo8=</di:DigestValue>
+            </di:Reference>
+        </v2.0:Signature>
+    </tns:Gearbox>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/IEPC_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/IEPC_1.xml
new file mode 100644
index 0000000000000000000000000000000000000000..be66b9bc3f7b58204672ad18a1874926bb130e62
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/IEPC_1.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+	<tns:IEPC>
+		<Data xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+			<Manufacturer>a</Manufacturer>
+			<Model>a</Model>
+			<CertificationNumber>token</CertificationNumber>
+			<Date>2021-11-18T14:31:52.4460619Z</Date>
+			<AppVersion>aaaaa</AppVersion>
+			<ElectricMachineType>ASM</ElectricMachineType>
+			<CertificationMethod>Measured for complete component</CertificationMethod>
+			<R85RatedPower>1</R85RatedPower>
+			<RotationalInertia>0.10</RotationalInertia>
+			<DifferentialIncluded>false</DifferentialIncluded>
+			<DesignTypeWheelMotor>true</DesignTypeWheelMotor>
+			<Gears xsi:type="IEPCGearsDeclarationType">
+				<Gear number="2">
+					<Ratio>1.000</Ratio>
+					<MaxOutShaftTorque>2000</MaxOutShaftTorque>
+				</Gear>
+				<Gear number="1">
+					<Ratio>3.000</Ratio>
+				</Gear>
+			</Gears>
+			<VoltageLevel>
+				<Voltage>600</Voltage>
+				<ContinuousTorque>200.00</ContinuousTorque>
+				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+				<OverloadTorque>400.00</OverloadTorque>
+				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+				<OverloadDuration>30.00</OverloadDuration>
+				<MaxTorqueCurve>
+					<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+					<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+				</MaxTorqueCurve>
+				<PowerMap gear="2">
+					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.00"/>
+					<Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
+					<Entry outShaftSpeed="0.00" torque="500.00" electricPower="1500.00"/>
+					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+				</PowerMap>
+				<PowerMap gear="1">
+					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+				</PowerMap>
+			</VoltageLevel>
+			<VoltageLevel>
+				<Voltage>400</Voltage>
+				<ContinuousTorque>200.00</ContinuousTorque>
+				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+				<OverloadTorque>400.00</OverloadTorque>
+				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+				<OverloadDuration>30.00</OverloadDuration>
+				<MaxTorqueCurve>
+					<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+					<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+				</MaxTorqueCurve>
+				<PowerMap gear="2">
+					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
+					<Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
+					<Entry outShaftSpeed="0.00" torque="500.00" electricPower="1500.00"/>
+				</PowerMap>
+				<PowerMap gear="1">
+					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+				</PowerMap>
+			</VoltageLevel>
+			<DragCurve gear="2">
+				<Entry outShaftSpeed="4500.00" dragTorque="35.00"/>
+				<Entry outShaftSpeed="0.00" dragTorque="15.00"/>
+			</DragCurve>
+			<DragCurve gear="1">
+				<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+				<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+			</DragCurve>
+			<Conditioning>
+				<Entry coolantTempInlet="30" coolingPower="5000"/>
+			</Conditioning>
+		</Data>
+	</tns:IEPC>
+</tns:VectoInputDeclaration>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/IEPC_1_hashed.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/IEPC_1_hashed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..20d5588960568e0418f3b19f486ae999f40a4000
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/IEPC_1_hashed.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:IEPC>
+        <v2.3:Data xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+            <v2.3:Manufacturer>a</v2.3:Manufacturer>
+            <v2.3:Model>a</v2.3:Model>
+            <v2.3:CertificationNumber>token</v2.3:CertificationNumber>
+            <v2.3:Date>2022-03-15T08:14:22.2781233Z</v2.3:Date>
+            <v2.3:AppVersion>aaaaa</v2.3:AppVersion>
+            <v2.3:ElectricMachineType>ASM</v2.3:ElectricMachineType>
+            <v2.3:CertificationMethod>Measured for complete component</v2.3:CertificationMethod>
+            <v2.3:R85RatedPower>1</v2.3:R85RatedPower>
+            <v2.3:RotationalInertia>0.10</v2.3:RotationalInertia>
+            <v2.3:DifferentialIncluded>false</v2.3:DifferentialIncluded>
+            <v2.3:DesignTypeWheelMotor>true</v2.3:DesignTypeWheelMotor>
+            <v2.3:Gears xsi:type="IEPCGearsDeclarationType">
+                <v2.3:Gear number="2">
+                    <v2.3:Ratio>1.000</v2.3:Ratio>
+                    <v2.3:MaxOutShaftTorque>2000</v2.3:MaxOutShaftTorque>
+                </v2.3:Gear>
+                <v2.3:Gear number="1">
+                    <v2.3:Ratio>3.000</v2.3:Ratio>
+                </v2.3:Gear>
+            </v2.3:Gears>
+            <v2.3:VoltageLevel>
+                <v2.3:Voltage>600</v2.3:Voltage>
+                <v2.3:ContinuousTorque>200.00</v2.3:ContinuousTorque>
+                <v2.3:TestSpeedContinuousTorque>2000.00</v2.3:TestSpeedContinuousTorque>
+                <v2.3:OverloadTorque>400.00</v2.3:OverloadTorque>
+                <v2.3:TestSpeedOverloadTorque>2000.00</v2.3:TestSpeedOverloadTorque>
+                <v2.3:OverloadDuration>30.00</v2.3:OverloadDuration>
+                <v2.3:MaxTorqueCurve>
+                    <v2.3:Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00" />
+                </v2.3:MaxTorqueCurve>
+                <v2.3:PowerMap gear="2">
+                    <v2.3:Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="500.00" electricPower="1500.00" />
+                    <v2.3:Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00" />
+                </v2.3:PowerMap>
+                <v2.3:PowerMap gear="1">
+                    <v2.3:Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00" />
+                </v2.3:PowerMap>
+            </v2.3:VoltageLevel>
+            <v2.3:VoltageLevel>
+                <v2.3:Voltage>400</v2.3:Voltage>
+                <v2.3:ContinuousTorque>200.00</v2.3:ContinuousTorque>
+                <v2.3:TestSpeedContinuousTorque>2000.00</v2.3:TestSpeedContinuousTorque>
+                <v2.3:OverloadTorque>400.00</v2.3:OverloadTorque>
+                <v2.3:TestSpeedOverloadTorque>2000.00</v2.3:TestSpeedOverloadTorque>
+                <v2.3:OverloadDuration>30.00</v2.3:OverloadDuration>
+                <v2.3:MaxTorqueCurve>
+                    <v2.3:Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00" />
+                </v2.3:MaxTorqueCurve>
+                <v2.3:PowerMap gear="2">
+                    <v2.3:Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.00" />
+                    <v2.3:Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="500.00" electricPower="1500.00" />
+                </v2.3:PowerMap>
+                <v2.3:PowerMap gear="1">
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00" />
+                </v2.3:PowerMap>
+            </v2.3:VoltageLevel>
+            <v2.3:DragCurve gear="2">
+                <v2.3:Entry outShaftSpeed="4500.00" dragTorque="35.00" />
+                <v2.3:Entry outShaftSpeed="0.00" dragTorque="15.00" />
+            </v2.3:DragCurve>
+            <v2.3:DragCurve gear="1">
+                <v2.3:Entry outShaftSpeed="4000.00" dragTorque="30.00" />
+                <v2.3:Entry outShaftSpeed="0.00" dragTorque="10.00" />
+            </v2.3:DragCurve>
+            <v2.3:Conditioning>
+                <v2.3:Entry coolantTempInlet="30" coolingPower="5000" />
+            </v2.3:Conditioning>
+        </v2.3:Data>
+        <v2.3:Signature>
+            <di:Reference URI="#IEPC-asdf">
+                <di:Transforms>
+                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </di:Transforms>
+                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <di:DigestValue>neHHOskXxCKhM8kWNhwGMeeUN0viOnctoqXT6nTZyaE=</di:DigestValue>
+            </di:Reference>
+        </v2.3:Signature>
+    </tns:IEPC>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/IEPC_StdValues.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/IEPC_StdValues.xml
new file mode 100644
index 0000000000000000000000000000000000000000..038bbf5b254a284ff1ed9a784250fb190653b31b
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/IEPC_StdValues.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+	<tns:IEPC>
+		<Data xsi:type="IEPCStandardValuesDataDeclarationType" id="IEPC-asdf" >
+			<Manufacturer>a</Manufacturer>
+			<Model>a</Model>
+			<CertificationNumber>token</CertificationNumber>
+			<Date>2021-11-18T14:33:55.6801441Z</Date>
+			<AppVersion>aaaaa</AppVersion>
+			<ElectricMachineType>ASM</ElectricMachineType>
+			<CertificationMethod>Standard values for all components</CertificationMethod>
+			<R85RatedPower>1</R85RatedPower>
+			<RotationalInertia>0.10</RotationalInertia>
+			<DifferentialIncluded>false</DifferentialIncluded>
+			<DesignTypeWheelMotor>true</DesignTypeWheelMotor>
+			<Gears xsi:type="IEPCGearsDeclarationType">
+				<Gear number="2">
+					<Ratio>1.000</Ratio>
+					<MaxOutShaftTorque>2000</MaxOutShaftTorque>
+				</Gear>
+				<Gear number="1">
+					<Ratio>3.000</Ratio>
+				</Gear>
+				
+			</Gears>
+			<VoltageLevel>
+				<ContinuousTorque>200.00</ContinuousTorque>
+				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+				<OverloadTorque>400.00</OverloadTorque>
+				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+				<OverloadDuration>30.00</OverloadDuration>
+				<MaxTorqueCurve>
+					<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+					<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+				</MaxTorqueCurve>
+				<PowerMap>
+					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+				</PowerMap>
+			</VoltageLevel>
+			<DragCurve>
+				<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+				<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+			</DragCurve>
+		</Data>
+	</tns:IEPC>
+</tns:VectoInputDeclaration>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/IEPC_StdValues_hashed.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/IEPC_StdValues_hashed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6f9bc756441b076b3555176653a4240acdcd42dc
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/IEPC_StdValues_hashed.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:IEPC>
+        <v2.3:Data xsi:type="IEPCStandardValuesDataDeclarationType" id="IEPC-asdf">
+            <v2.3:Manufacturer>a</v2.3:Manufacturer>
+            <v2.3:Model>a</v2.3:Model>
+            <v2.3:CertificationNumber>token</v2.3:CertificationNumber>
+            <v2.3:Date>2022-03-15T08:25:17.9153057Z</v2.3:Date>
+            <v2.3:AppVersion>aaaaa</v2.3:AppVersion>
+            <v2.3:ElectricMachineType>ASM</v2.3:ElectricMachineType>
+            <v2.3:CertificationMethod>Standard values for all components</v2.3:CertificationMethod>
+            <v2.3:R85RatedPower>1</v2.3:R85RatedPower>
+            <v2.3:RotationalInertia>0.10</v2.3:RotationalInertia>
+            <v2.3:DifferentialIncluded>false</v2.3:DifferentialIncluded>
+            <v2.3:DesignTypeWheelMotor>true</v2.3:DesignTypeWheelMotor>
+            <v2.3:Gears xsi:type="IEPCGearsDeclarationType">
+                <v2.3:Gear number="2">
+                    <v2.3:Ratio>1.000</v2.3:Ratio>
+                    <v2.3:MaxOutShaftTorque>2000</v2.3:MaxOutShaftTorque>
+                </v2.3:Gear>
+                <v2.3:Gear number="1">
+                    <v2.3:Ratio>3.000</v2.3:Ratio>
+                </v2.3:Gear>
+            </v2.3:Gears>
+            <v2.3:VoltageLevel>
+                <v2.3:ContinuousTorque>200.00</v2.3:ContinuousTorque>
+                <v2.3:TestSpeedContinuousTorque>2000.00</v2.3:TestSpeedContinuousTorque>
+                <v2.3:OverloadTorque>400.00</v2.3:OverloadTorque>
+                <v2.3:TestSpeedOverloadTorque>2000.00</v2.3:TestSpeedOverloadTorque>
+                <v2.3:OverloadDuration>30.00</v2.3:OverloadDuration>
+                <v2.3:MaxTorqueCurve>
+                    <v2.3:Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00" />
+                </v2.3:MaxTorqueCurve>
+                <v2.3:PowerMap>
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00" />
+                    <v2.3:Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00" />
+                    <v2.3:Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00" />
+                </v2.3:PowerMap>
+            </v2.3:VoltageLevel>
+            <v2.3:DragCurve>
+                <v2.3:Entry outShaftSpeed="4000.00" dragTorque="30.00" />
+                <v2.3:Entry outShaftSpeed="0.00" dragTorque="10.00" />
+            </v2.3:DragCurve>
+        </v2.3:Data>
+        <v2.3:Signature>
+            <di:Reference URI="#IEPC-asdf">
+                <di:Transforms>
+                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </di:Transforms>
+                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <di:DigestValue>qf3qtFGyFZBiBOZp4BuBvnD0emOW9jyxdZh+iqNSJII=</di:DigestValue>
+            </di:Reference>
+        </v2.3:Signature>
+    </tns:IEPC>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Retarder.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Retarder.xml
new file mode 100644
index 0000000000000000000000000000000000000000..21009e43921937ec86cb391f4e451e2aee61f9e3
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Retarder.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:Retarder xsi:type="v2.0:RetarderComponentDeclarationType">
+        <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="RetarderDataDeclarationType" id="RET-asdf">           
+         <Manufacturer>Generic Vendor</Manufacturer>
+         <Model>Generic Model</Model>
+         <CertificationNumber>RET-1234</CertificationNumber>
+         <Date>2021-11-18T14:09:17.2810263Z</Date>
+         <AppVersion>aaaaa</AppVersion>
+         <CertificationMethod>Measured</CertificationMethod>
+		<RetarderLossMap>
+			<Entry retarderSpeed="1001.00"  torqueLoss="10.00" />
+			<Entry retarderSpeed="1000.00"  torqueLoss="10.00" />
+			<Entry retarderSpeed="1005.00"  torqueLoss="100.00" />
+			<Entry retarderSpeed="0.00"  torqueLoss="10.00" />
+		</RetarderLossMap>
+        </v2.0:Data>
+    </tns:Retarder>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Retarder_hahsed.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Retarder_hahsed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e8f3341e0b5b28c59e16d2c2a3c89e24ca7efc3b
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Retarder_hahsed.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:Retarder xsi:type="v2.0:RetarderComponentDeclarationType">
+        <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="RetarderDataDeclarationType" id="RET-asdf">
+            <Manufacturer>Generic Vendor</Manufacturer>
+            <Model>Generic Model</Model>
+            <CertificationNumber>RET-1234</CertificationNumber>
+            <Date>2022-03-15T08:26:09.6167797Z</Date>
+            <AppVersion>aaaaa</AppVersion>
+            <CertificationMethod>Measured</CertificationMethod>
+            <RetarderLossMap>
+                <Entry retarderSpeed="1001.00" torqueLoss="10.00" />
+                <Entry retarderSpeed="1000.00" torqueLoss="10.00" />
+                <Entry retarderSpeed="1005.00" torqueLoss="100.00" />
+                <Entry retarderSpeed="0.00" torqueLoss="10.00" />
+            </RetarderLossMap>
+        </Data>
+        <v2.0:Signature>
+            <di:Reference URI="#RET-asdf">
+                <di:Transforms>
+                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </di:Transforms>
+                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <di:DigestValue>5S5q/oSNH7wKPjBUwZKxkZIeIxZw8KQ++RH/KQm0754=</di:DigestValue>
+            </di:Reference>
+        </v2.0:Signature>
+    </tns:Retarder>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/TorqueConverter.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/TorqueConverter.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9894f46942dbd3d1bdcd404474e1f75133778a2a
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/TorqueConverter.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:TorqueConverter xsi:type="v2.0:TorqueConverterComponentDeclarationType">
+        <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="TorqueConverterDataDeclarationType" id="TC-asdf">           
+         <Manufacturer>Generic Vendor</Manufacturer>
+         <Model>Generic Model</Model>
+         <CertificationNumber>TC-1234</CertificationNumber>
+         <Date>2021-11-18T14:09:17.2810263Z</Date>
+         <AppVersion>aaaaa</AppVersion>
+         <CertificationMethod>Measured</CertificationMethod>
+         <Characteristics>
+		 	<Entry speedRatio='0.0001' torqueRatio='1.75' inputTorqueRef='367.68'/>
+		 	<Entry speedRatio='0.1003' torqueRatio='1.71' inputTorqueRef='355.43'/>
+			<Entry speedRatio='0.0000' torqueRatio='1.80' inputTorqueRef='367.65'/>
+			<Entry speedRatio='0.1002' torqueRatio='1.72' inputTorqueRef='355.42'/>
+		</Characteristics>
+        </v2.0:Data>
+    </tns:TorqueConverter>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/TorqueConverter_hashed.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/TorqueConverter_hashed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5a0bc568084bf797cb7fbef508524c0da6eac641
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/TorqueConverter_hashed.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:TorqueConverter xsi:type="v2.0:TorqueConverterComponentDeclarationType">
+        <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="TorqueConverterDataDeclarationType" id="TC-asdf">
+            <Manufacturer>Generic Vendor</Manufacturer>
+            <Model>Generic Model</Model>
+            <CertificationNumber>TC-1234</CertificationNumber>
+            <Date>2022-03-15T08:26:23.1645201Z</Date>
+            <AppVersion>aaaaa</AppVersion>
+            <CertificationMethod>Measured</CertificationMethod>
+            <Characteristics>
+                <Entry speedRatio="0.0001" torqueRatio="1.75" inputTorqueRef="367.68" />
+                <Entry speedRatio="0.1003" torqueRatio="1.71" inputTorqueRef="355.43" />
+                <Entry speedRatio="0.0000" torqueRatio="1.80" inputTorqueRef="367.65" />
+                <Entry speedRatio="0.1002" torqueRatio="1.72" inputTorqueRef="355.42" />
+            </Characteristics>
+        </Data>
+        <v2.0:Signature>
+            <di:Reference URI="#TC-asdf">
+                <di:Transforms>
+                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </di:Transforms>
+                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <di:DigestValue>l6asBcah3FpRvGDPjNpTPdx7ayeAXUxTvbqk41uc19c=</di:DigestValue>
+            </di:Reference>
+        </v2.0:Signature>
+    </tns:TorqueConverter>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Tyre.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Tyre.xml
new file mode 100644
index 0000000000000000000000000000000000000000..81bbda7ba68032307e245b506c12d8d77a22479a
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Tyre.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"  xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xmlns:xsd="http://www.w3.org/2001/XMLSchema" schemaVersion="1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1 v:\VectoCore\VectoCore\Resources\XSD\VectoComponent.2.1.xsd">
+	<tns:Tyre>
+		<v2.0:Data id="CON_123456" xsi:type="TyreDataDeclarationType">
+			<Manufacturer>Continental</Manufacturer>
+			<Model>CONTINENTAL CONTIVANCONTACT 100</Model>
+			<CertificationNumber>e4*2017/2400*2019/318*T*0799*00</CertificationNumber>
+			<Date>2018-01-01T00:00:00Z</Date>
+			<AppVersion>not available</AppVersion>
+			<Dimension>205/70 R17C</Dimension>
+			<TyreClass>C2</TyreClass>
+			<FuelEfficiencyClass>C</FuelEfficiencyClass>
+			<RRCDeclared>0.0075</RRCDeclared>
+			<FzISO>10131</FzISO>
+		</v2.0:Data>
+	</tns:Tyre>
+</tns:VectoInputDeclaration>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Tyre_hashed.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Tyre_hashed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ae920396e5f9d7249429d2f3770b0aa25cf68e00
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/ToHash/Tyre_hashed.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" schemaVersion="1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1 v:\VectoCore\VectoCore\Resources\XSD\VectoComponent.2.1.xsd">
+    <tns:Tyre>
+        <v2.0:Data id="CON_123456" xsi:type="TyreDataDeclarationType">
+            <Manufacturer>Continental</Manufacturer>
+            <Model>CONTINENTAL CONTIVANCONTACT 100</Model>
+            <CertificationNumber>e4*2017/2400*2019/318*T*0799*00</CertificationNumber>
+            <Date>2022-04-21T16:29:52.9428139Z</Date>
+            <AppVersion>not available</AppVersion>
+            <Dimension>205/70 R17C</Dimension>
+            <TyreClass>C2</TyreClass>
+            <FuelEfficiencyClass>C</FuelEfficiencyClass>
+            <RRCDeclared>0.0075</RRCDeclared>
+            <FzISO>10131</FzISO>
+        </v2.0:Data>
+        <v2.0:Signature>
+            <Reference URI="#CON_123456" xmlns="http://www.w3.org/2000/09/xmldsig#">
+                <Transforms>
+                    <Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </Transforms>
+                <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <DigestValue>plljfjf0kzIAy19CMI2xu30AHfMcB5VlqLlmTKiSkKA=</DigestValue>
+            </Reference>
+        </v2.0:Signature>
+    </tns:Tyre>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationEngineDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationEngineDataProvider.cs
index d2c3c8a1226dd1380e197ff9c9e65ac3fc4bd6dc..ce3e455bd3a19f5eb394aa418cd0fb9b4b12d40f 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationEngineDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationEngineDataProvider.cs
@@ -31,9 +31,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Xml;
 using System.Xml.Linq;
 using TUGraz.IVT.VectoXML;
+using TUGraz.VectoCommon.Exceptions;
 using TUGraz.VectoCommon.InputData;
 using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCommon.Resources;
@@ -249,4 +251,208 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 			get { return NAMESPACE_URI; }
 		}
 	}
+
+	// ---------------------------------------------------------------------------------------
+
+	public class XMLDeclarationEngineDataProviderV23 : XMLDeclarationEngineDataProviderV20
+	{
+		/*
+		 * Support for dual-fuel engines (in different operating modes - either single fuel or dual fuel)
+		 */
+
+		public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V23;
+
+		public new static readonly string QUALIFIED_XSD_TYPE =
+			XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+		public XMLDeclarationEngineDataProviderV23(
+			IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(
+			vehicle, componentNode, sourceFile)
+		{ }
+
+		protected override XNamespace SchemaNamespace => NAMESPACE_URI;
+
+		#region Overrides of XMLDeclarationEngineDataProviderV10
+
+		public override IList<IEngineModeDeclarationInputData> EngineModes {
+			get {
+				return _engineModes ?? (_engineModes = GetNodes(XMLNames.Engine_FuelModes)
+							.Cast<XmlNode>().Select(x => new XMLDualFuelEngineMode(x)).Cast<IEngineModeDeclarationInputData>().ToList());
+			}
+		}
+
+
+		public override WHRType WHRType {
+			get {
+				var retVal = WHRType.None;
+				if (XmlConvert.ToBoolean(GetString(XMLNames.Engine_WHR_MechanicalOutputICE))) {
+					retVal |= WHRType.MechanicalOutputICE;
+				}
+				if (XmlConvert.ToBoolean(GetString(XMLNames.Engine_WHR_MechanicalOutputIDrivetrain))) {
+					retVal |= WHRType.MechanicalOutputDrivetrain;
+				}
+				if (XmlConvert.ToBoolean(GetString(XMLNames.Engine_WHR_ElectricalOutput))) {
+					retVal |= WHRType.ElectricalOutput;
+				}
+
+				return retVal;
+			}
+		}
+
+		#endregion
+
+		public class XMLDualFuelEngineMode : XMLSingleFuelEngineMode
+		{
+			protected IWHRData WHRData;
+
+			public XMLDualFuelEngineMode(XmlNode baseNode) : base(baseNode) { }
+
+			#region Overrides of XMLSingleFuelEngineMode
+
+			public override IList<IEngineFuelDeclarationInputData> Fuels {
+				get {
+					return FuelsList ?? (FuelsList = GetNodes(XMLNames.Engine_FuelModes_Fuel)
+								.Cast<XmlNode>().Select(x => new XMLDualFuelEngineFuel(x))
+								.Cast<IEngineFuelDeclarationInputData>().ToList());
+				}
+			}
+
+			public override IWHRData WasteHeatRecoveryDataElectrical {
+				get {
+					return WHRData ?? (WHRData = ReadWHRData(
+								GetNodes(
+									new[] {
+										XMLNames.Engine_WHRCorrectionFactors,
+										XMLNames.Engine_WHRCorrectionFactors_Electrical
+									}, GetNode(XMLNames.Engine_FuelModes_Fuel)),
+								XMLNames.Engine_FuelConsumptionMap_WHRElPower_Attr)
+							);
+				}
+			}
+
+			public override IWHRData WasteHeatRecoveryDataMechanical {
+				get {
+					return WHRData ?? (WHRData = ReadWHRData(
+								GetNodes(
+									new[] {
+										XMLNames.Engine_WHRCorrectionFactors,
+										XMLNames.Engine_WHRCorrectionFactors_Mechanical
+									}, GetNode(XMLNames.Engine_FuelModes_Fuel)),
+								XMLNames.Engine_FuelConsumptionMap_WHRMechPower_Attr));
+				}
+			}
+
+			#endregion
+
+			protected virtual IWHRData ReadWHRData(XmlNodeList correctionFactorNodes, string fcMapAttr)
+			{
+				var whrPwrNodes = GetNodes(
+						new[] {
+							XMLNames.Engine_FuelConsumptionMap, XMLNames.Engine_FuelConsumptionMap_Entry
+						}, GetNode(XMLNames.Engine_FuelModes_Fuel))
+					.Cast<XmlNode>().All(x => x.Attributes?[fcMapAttr] != null);
+				if (correctionFactorNodes.Count > 0) {
+					if (!whrPwrNodes) {
+						throw new VectoXMLException("WHR correction factors provided but {0} missing for some entries.", fcMapAttr);
+
+					}
+					//return new XMLDeclarationWHRData();
+				}
+
+				if (correctionFactorNodes.Count > 1) {
+					throw new VectoXMLException("WHRData (correction factors) can only be defined for one fuel!");
+				}
+
+				if (whrPwrNodes) {
+					if (correctionFactorNodes.Count == 0) {
+						throw new VectoXMLException("WHR electric power provided but no correction factors found.");
+					}
+					//return new XMLDeclarationWHRData();
+				}
+
+				var fuelNodes = GetNodes(XMLNames.Engine_FuelModes_Fuel);
+				XmlNode whrFuelNode = null;
+				if (fuelNodes.Count > 1) {
+					for (var i = 0; i < fuelNodes.Count; i++) {
+						var fuel = fuelNodes[i];
+						if (GetNodes(XMLNames.Engine_FuelConsumptionMap_Entry, fuel).Cast<XmlNode>()
+																					.Any(x => x.Attributes?[fcMapAttr] != null)) {
+							if (whrFuelNode != null) {
+								throw new VectoException("WHRData ({0}) can only be defined for one fuel!", fcMapAttr);
+							}
+
+							whrFuelNode = fuel;
+						}
+					}
+				} else {
+					whrFuelNode = fuelNodes[0];
+				}
+
+				if (GetNodes(new[] { XMLNames.Engine_FuelConsumptionMap, XMLNames.Engine_FuelConsumptionMap_Entry }, whrFuelNode)
+					.Cast<XmlNode>().Any(x => x.Attributes?[fcMapAttr] == null)) {
+					var missing = GetNodes(
+							new[] { XMLNames.Engine_FuelConsumptionMap, XMLNames.Engine_FuelConsumptionMap_Entry }, whrFuelNode)
+						.Cast<XmlNode>().Where(x => x.Attributes?[fcMapAttr] == null);
+					throw new VectoException("WHRData has to be provided for every entry in the FC-Map! {0}",
+						missing.Select(x => $"n: {x.Attributes?[XMLNames.Engine_FuelConsumptionMap_EngineSpeed_Attr]?.Value}, " +
+											$"T: {x.Attributes?[XMLNames.Engine_FuelConsumptionMap_Torque_Attr]?.Value}").Join("; "));
+				}
+
+				if (correctionFactorNodes[0].ParentNode.ParentNode != whrFuelNode) {
+					throw new VectoException("Correction Factors and WHR-Map have to be defined for the same fuel!");
+				}
+
+				return new XMLDeclarationWHRData(whrFuelNode, correctionFactorNodes[0]);
+			}
+		}
+
+		public class XMLDualFuelEngineFuel : XMLSingleFuelEngineFuel
+		{
+			public XMLDualFuelEngineFuel(XmlNode baseNode) : base(baseNode) { }
+
+			#region Overrides of XMLSingleFuelEngineFuel
+
+			public override FuelType FuelType => GetAttribute(BaseNode, "type").ParseEnum<FuelType>();
+
+			#endregion
+		}
+
+		public class XMLDeclarationWHRData : AbstractXMLType, IWHRData
+		{
+			protected TableData WHRPower;
+			protected XmlNode CorrectionFactorNode;
+
+			public XMLDeclarationWHRData(XmlNode whrFuelNode, XmlNode correctionFactorNode) : base(whrFuelNode)
+			{
+				CorrectionFactorNode = correctionFactorNode;
+			}
+
+			public XMLDeclarationWHRData() : base(null) { }
+
+			#region Implementation of IWHRData
+
+			public double UrbanCorrectionFactor => GetNode(XMLNames.Engine_WHRCorrectionFactors_Urban, CorrectionFactorNode)?.InnerText.ToDouble() ?? 1;
+
+			public double RuralCorrectionFactor => GetNode(XMLNames.Engine_WHRCorrectionFactors_Rural, CorrectionFactorNode)?.InnerText.ToDouble() ?? 1;
+
+			public double MotorwayCorrectionFactor => GetNode(XMLNames.Engine_WHRCorrectionFactors_Motorway, CorrectionFactorNode)?.InnerText.ToDouble() ?? 1;
+
+			public double BFColdHot => GetNode(XMLNames.Engine_WHRCorrectionFactors_BFColdHot, CorrectionFactorNode)?.InnerText.ToDouble() ?? 1;
+
+			public double CFRegPer => GetNode(XMLNames.Engine_WHRCorrectionFactors_CFRegPer, CorrectionFactorNode)?.InnerText.ToDouble() ?? 1;
+
+			public double EngineeringCorrectionFactor => 1.0;
+
+			public TableData GeneratedPower =>
+				WHRPower ?? (WHRPower = BaseNode == null
+					? null
+					: ReadTableData(
+						XMLNames.Engine_FuelConsumptionMap, XMLNames.Engine_FuelConsumptionMap_Entry,
+						AttributeMappings.WHRPowerMapMapping));
+
+			#endregion
+		}
+	}
+
+
 }
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV23InjectModule.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV23InjectModule.cs
new file mode 100644
index 0000000000000000000000000000000000000000..dc2fb66dd0d7bdb71eea200947c3d9fca5c5ee35
--- /dev/null
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV23InjectModule.cs
@@ -0,0 +1,14 @@
+using Ninject.Modules;
+using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider;
+using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Interfaces;
+
+namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.NinjectModules
+{
+	public class XMLDeclarationInputDataV23InjectModule : NinjectModule
+	{
+		public override void Load() {
+			Bind<IXMLEngineDeclarationInputData>().To<XMLDeclarationEngineDataProviderV23>().Named(
+				XMLDeclarationEngineDataProviderV23.QUALIFIED_XSD_TYPE);
+		}
+	}
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationReaderInjectModule.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationReaderInjectModule.cs
index 006ad0c4092f6e7b1836737b9ea0b3e07ed7c780..5703b46004f9b46d3cd086c7ad12f63e579b02a8 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationReaderInjectModule.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationReaderInjectModule.cs
@@ -53,6 +53,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
 				new XMLDeclarationInputDataV21InjectModule(),
 				new XMLDeclarationInputDataV22InjectModule(),
 				new XMLDeclarationInputDataV221InjectModule(),
+				new XMLDeclarationInputDataV23InjectModule(),
 			});
 
 			#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/AttributeMappings.cs b/VectoCore/VectoCore/OutputData/XML/AttributeMappings.cs
index 312f55e2fbef5f0afad1892dd835968b2b46d65a..d6c429ee46341d1b47e3be91fc9a9daa8d2cc93f 100644
--- a/VectoCore/VectoCore/OutputData/XML/AttributeMappings.cs
+++ b/VectoCore/VectoCore/OutputData/XML/AttributeMappings.cs
@@ -46,6 +46,13 @@ namespace TUGraz.IVT.VectoXML
 			{ FuelConsumptionMapReader.Fields.FuelConsumption, XMLNames.Engine_FuelConsumptionMap_FuelConsumption_Attr }
 		};
 
+		public static readonly Dictionary<string, string> WHRPowerMapMapping = new Dictionary<string, string> {
+			{ WHRPowerReader.Fields.EngineSpeed, XMLNames.Engine_FuelConsumptionMap_EngineSpeed_Attr },
+			{ WHRPowerReader.Fields.Torque, XMLNames.Engine_FuelConsumptionMap_Torque_Attr },
+			{ WHRPowerReader.Fields.ElectricPower, XMLNames.Engine_FuelConsumptionMap_WHRElPower_Attr },
+			{ WHRPowerReader.Fields.MechanicalPower, XMLNames.Engine_FuelConsumptionMap_WHRMechPower_Attr }
+		};
+
 		public static readonly Dictionary<string, string> EngineFullLoadCurveMapping = new Dictionary<string, string> {
 			{ FullLoadCurveReader.Fields.EngineSpeed, XMLNames.Engine_EngineFullLoadCurve_EngineSpeed_Attr },
 			{ FullLoadCurveReader.Fields.TorqueFullLoad, XMLNames.Engine_FullLoadCurve_MaxTorque_Attr },
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs
index aeaaba58ef23702b406ea70a5179b3b355e73ce7..a00fa6f0078d4dca5d7011240e1f2c0b51859bf3 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs
@@ -53,7 +53,7 @@ namespace TUGraz.VectoCore.OutputData.XML
 	public class XMLCustomerReport
 	{
 		public const string SCHEMA_VERSION_STRING = "0.7";
-		public const string CURRENT_SCHEMA_VERSION = "0.7.1";
+		public const string CURRENT_SCHEMA_VERSION = "0.7.2";
 
 		protected readonly XElement VehiclePart;
 
@@ -95,6 +95,7 @@ namespace TUGraz.VectoCore.OutputData.XML
 				new XElement(tns + XMLNames.Vehicle_CurbMassChassis, XMLHelper.ValueAsUnit(modelData.VehicleData.CurbMass, XMLNames.Unit_kg)),
 				new XElement(tns + XMLNames.Vehicle_ZeroEmissionVehicle, modelData.VehicleData.ZeroEmissionVehicle),
 				new XElement(tns + XMLNames.Vehicle_HybridElectricHDV, modelData.VehicleData.HybridElectricHDV),
+				new XElement(tns + "WasteHeatRecovery", modelData.EngineData.WHRType != WHRType.None),
 				new XElement(tns + XMLNames.Vehicle_DualFuelVehicle, modelData.VehicleData.DualFuelVehicle),
 
 				exempted ? ExemptedData(modelData) : new[] {
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
index e35356f4c3c77590455d0e8c6041bd9ffeff637f..8ba338e0f4bd9992e3075d908c081cfbd415f573 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
@@ -279,60 +279,43 @@ namespace TUGraz.VectoCore.OutputData.XML
 
 		public static IEnumerable<XElement> GetResults(ResultEntry result, XNamespace tns, bool fullOutput)
 		{
-			//var fuel = result.FuelData;
 			var retVal = new List<XElement>();
-
-			//foreach (var fuel in result.FuelData) {
-			var fuel = result.FuelData.First();
-			var entry = result.FuelConsumptionFinal[fuel.FuelType];
-			//var fcResult = new XElement(tns + XMLNames.Report_Results_Fuel, new XAttribute(XMLNames.Report_Results_Fuel_Type_Attr, fuel.FuelType.ToXMLFormat()));
-			var fcResult = retVal;
-			fcResult.AddRange(new[] {
-				new XElement(
-						tns + XMLNames.Report_Results_FuelConsumption,
-						new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/km"),
-						entry.FC_FINAL_KM
-						.ConvertToGrammPerKiloMeter().ToMinSignificantDigits(3, 1)),
-					new XElement(
+			foreach (var fuel in result.FuelData) {
+                //var fuel = result.FuelData.First();
+				var entry = result.FuelConsumptionFinal[fuel.FuelType];
+                var fcResult = new XElement(tns + "Fuel", new XAttribute("type", fuel.FuelType.ToXMLFormat()));
+                //var fcResult = retVal;
+				fcResult.Add(new XElement(
+					tns + XMLNames.Report_Results_FuelConsumption,
+					new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/km"),
+					entry.FC_FINAL_KM
+						.ConvertToGrammPerKiloMeter().ToMinSignificantDigits(3, 1)), new XElement(
+					tns + XMLNames.Report_Results_FuelConsumption,
+					new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/t-km"),
+					(entry.FC_FINAL_KM / result.Payload)
+					.ConvertToGrammPerTonKilometer().ToMinSignificantDigits(3, 1)), result.CargoVolume > 0
+					? new XElement(
 						tns + XMLNames.Report_Results_FuelConsumption,
-						new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/t-km"),
-						(entry.FC_FINAL_KM / result.Payload)
-						.ConvertToGrammPerTonKilometer().ToMinSignificantDigits(3, 1)),
-					result.CargoVolume > 0
-						? new XElement(
-							tns + XMLNames.Report_Results_FuelConsumption,
-							new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/m³-km"),
-							(entry.TotalFuelConsumptionCorrected.ConvertToGramm() / result.Distance.ConvertToKiloMeter() /
-							result.CargoVolume)
-							.Value().ToMinSignificantDigits(3, 1))
-						: null
-					//result.PassengerCount.HasValue && result.PassengerCount.Value > 0
-					//	? new XElement(
-					//		tns + XMLNames.Report_Results_FuelConsumption,
-					//		new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/p-km"),
-					//		(entry.TotalFuelConsumptionCorrected.ConvertToGramm() / result.Distance.ConvertToKiloMeter() /
-					//		result.PassengerCount.Value).ToMinSignificantDigits(3, 1))
-					//	: null
-				});
+						new XAttribute(XMLNames.Report_Results_Unit_Attr, "g/m³-km"),
+						(entry.TotalFuelConsumptionCorrected.ConvertToGramm() / result.Distance.ConvertToKiloMeter() /
+						result.CargoVolume)
+						.Value().ToMinSignificantDigits(3, 1))
+					: null);
 
 				//FC
 				// TODO: MQ 2019-07-31 - per fuel or overall?
 				if (fullOutput) {
-					fcResult.AddRange(new [] {
-						new XElement(
-							tns + XMLNames.Report_Results_FuelConsumption,
-							new XAttribute(XMLNames.Report_Results_Unit_Attr, "MJ/km"),
-							(entry.EnergyDemand /
-							result.Distance.ConvertToKiloMeter() / 1e6)
-							.Value().ToMinSignificantDigits(3, 1)),
-						new XElement(
-							tns + XMLNames.Report_Results_FuelConsumption,
-							new XAttribute(XMLNames.Report_Results_Unit_Attr, "MJ/t-km"),
-							(entry.EnergyDemand /
-							result.Distance.ConvertToKiloMeter() / result.Payload.ConvertToTon() / 1e6)
-							.Value().ToMinSignificantDigits(3, 1))
-
-					});
+					fcResult.Add(new XElement(
+						tns + XMLNames.Report_Results_FuelConsumption,
+						new XAttribute(XMLNames.Report_Results_Unit_Attr, "MJ/km"),
+						(entry.EnergyDemand /
+						result.Distance.ConvertToKiloMeter() / 1e6)
+						.Value().ToMinSignificantDigits(3, 1)), new XElement(
+						tns + XMLNames.Report_Results_FuelConsumption,
+						new XAttribute(XMLNames.Report_Results_Unit_Attr, "MJ/t-km"),
+						(entry.EnergyDemand /
+						result.Distance.ConvertToKiloMeter() / result.Payload.ConvertToTon() / 1e6)
+						.Value().ToMinSignificantDigits(3, 1)));
 					if (result.CargoVolume > 0) {
 						fcResult.Add(
 							new XElement(
@@ -352,20 +335,17 @@ namespace TUGraz.VectoCore.OutputData.XML
 					//}
 				}
 				if (fuel.FuelDensity != null) {
-					fcResult.AddRange(new [] {
-						new XElement(
-							tns + XMLNames.Report_Results_FuelConsumption,
-							new XAttribute(XMLNames.Report_Results_Unit_Attr, "l/100km"),
-							(entry.TotalFuelConsumptionCorrected.ConvertToGramm() / fuel.FuelDensity /
+					fcResult.Add(new XElement(
+						tns + XMLNames.Report_Results_FuelConsumption,
+						new XAttribute(XMLNames.Report_Results_Unit_Attr, "l/100km"),
+						(entry.TotalFuelConsumptionCorrected.ConvertToGramm() / fuel.FuelDensity /
 							result.Distance.ConvertToKiloMeter() * 100)
-							.Value().ToMinSignificantDigits(3, 1)),
-						new XElement(
-							tns + XMLNames.Report_Results_FuelConsumption,
-							new XAttribute(XMLNames.Report_Results_Unit_Attr, "l/t-km"),
-							(entry.TotalFuelConsumptionCorrected.ConvertToGramm() / fuel.FuelDensity /
-							result.Distance.ConvertToKiloMeter() /
-							result.Payload.ConvertToTon()).Value().ToMinSignificantDigits(3, 1))
-						});
+						.Value().ToMinSignificantDigits(3, 1)), new XElement(
+						tns + XMLNames.Report_Results_FuelConsumption,
+						new XAttribute(XMLNames.Report_Results_Unit_Attr, "l/t-km"),
+						(entry.TotalFuelConsumptionCorrected.ConvertToGramm() / fuel.FuelDensity /
+						result.Distance.ConvertToKiloMeter() /
+						result.Payload.ConvertToTon()).Value().ToMinSignificantDigits(3, 1)));
 					if (result.CargoVolume > 0) {
 						fcResult.Add(
 							new XElement(
@@ -375,18 +355,18 @@ namespace TUGraz.VectoCore.OutputData.XML
 								result.Distance.ConvertToKiloMeter() /
 								result.CargoVolume).Value().ToMinSignificantDigits(3, 1)));
 					}
-					//if (result.PassengerCount.HasValue && result.PassengerCount.Value > 0) {
-					//	fcResult.Add(
-					//		new XElement(
-					//			tns + XMLNames.Report_Results_FuelConsumption,
-					//			new XAttribute(XMLNames.Report_Results_Unit_Attr, "l/p-km"),
-					//			(entry.TotalFuelConsumptionCorrected.ConvertToGramm() / fuel.FuelDensity /
-					//			result.Distance.ConvertToKiloMeter() / result.PassengerCount.Value).Value().ToMinSignificantDigits(3, 1))
-					//	);
-					//}
-				//}
-				//retVal.Add(fcResult);
-			}
+                    //if (result.PassengerCount.HasValue && result.PassengerCount.Value > 0) {
+                    //	fcResult.Add(
+                    //		new XElement(
+                    //			tns + XMLNames.Report_Results_FuelConsumption,
+                    //			new XAttribute(XMLNames.Report_Results_Unit_Attr, "l/p-km"),
+                    //			(entry.TotalFuelConsumptionCorrected.ConvertToGramm() / fuel.FuelDensity /
+                    //			result.Distance.ConvertToKiloMeter() / result.PassengerCount.Value).Value().ToMinSignificantDigits(3, 1))
+                    //	);
+                    //}
+                }
+                retVal.Add(fcResult);
+            }
 
 			//CO2
 			retVal.Add(
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs
index 165659e391874312480e28178cf9ce5d11aeeeb0..3135a128ed968a8d599ac8367e13f92970094d05 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs
@@ -54,7 +54,7 @@ namespace TUGraz.VectoCore.OutputData.XML
 	public class XMLManufacturerReport
 	{
 		public const string SCHEMA_VERSION_STRING = "0.7";
-		public const string CURRENT_SCHEMA_VERSION = "0.7.1";
+		public const string CURRENT_SCHEMA_VERSION = "0.7.2";
 		
 		protected XElement VehiclePart;
 		
@@ -198,14 +198,28 @@ namespace TUGraz.VectoCore.OutputData.XML
 
 		private XElement GetEngineDescription(CombustionEngineData engineData)
 		{
-			return new XElement(tns + XMLNames.Component_Engine,
+			var retVal = new XElement(tns + XMLNames.Component_Engine,
 				GetCommonDescription(engineData),
 				new XElement(tns + XMLNames.Engine_RatedPower, XMLHelper.ValueAsUnit(engineData.RatedPowerDeclared, XMLNames.Unit_kW)),
 				new XElement(tns + XMLNames.Engine_IdlingSpeed, XMLHelper.ValueAsUnit(engineData.IdleSpeed, XMLNames.Unit_RPM)),
 				new XElement(tns + XMLNames.Engine_RatedSpeed, XMLHelper.ValueAsUnit(engineData.RatedSpeedDeclared, XMLNames.Unit_RPM)),
 				new XElement(tns + XMLNames.Engine_Displacement, XMLHelper.ValueAsUnit(engineData.Displacement, XMLNames.Unit_ltr, 1)),
-				new XElement(tns + XMLNames.Engine_FuelType, engineData.Fuels.First().FuelData.FuelType.ToXMLFormat())
-				);
+				new XElement(tns + "FuelTypes",
+					engineData.Fuels.Select(x => new XElement(tns + XMLNames.Engine_FuelType, x.FuelData.FuelType.ToXMLFormat()))
+					),
+				new XElement(tns + "WasteHeatRecoverySystem", engineData.WHRType != WHRType.None)
+			);
+
+			foreach (WHRType whrType in Enum.GetValues(typeof(WHRType))) {
+				if (whrType == WHRType.None) {
+					continue;
+				}
+
+				if ((whrType & engineData.WHRType) == whrType) {
+					retVal.Add(new XElement(tns + "WasteHeatRecoverySystemType", whrType.ToXMLFormat()));
+				}
+			}
+			return retVal;
 		}
 
 		private XElement GetGearboxDescription(GearboxData gearboxData)
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.7.2.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.7.2.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..b71ca11975d38dd0e3830b033d4855b179b72ddd
--- /dev/null
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.7.2.xsd
@@ -0,0 +1,486 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) -->
+<!--W3C XML Schema generated by XMLSpy vXMLSpy Professional Edition v2016 rel. 2 (x64) (http://www.altova.com)-->
+<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.7.2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" targetNamespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.7.2" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.7">
+	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
+	<xs:element name="VectoCustomerInformation">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="Data">
+					<xs:complexType>
+						<xs:complexContent>
+							<xs:extension base="VectoOutputDataType"/>
+						</xs:complexContent>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="Signature" type="vdecdef:SignatureType"/>
+			</xs:sequence>
+			<xs:attribute name="schemaVersion" type="xs:decimal" use="required"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:complexType name="CO2Type">
+		<xs:simpleContent>
+			<xs:extension base="xs:double">
+				<xs:attribute name="unit" type="CO2UnitType" use="required"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+	<xs:complexType name="FuelConsumptionType">
+		<xs:simpleContent>
+			<xs:extension base="xs:double">
+				<xs:attribute name="unit" type="FuelConsumptionUnitType" use="required"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+	<xs:complexType name="ResultType">
+		<xs:sequence>
+			<xs:element name="Mission" type="MissionTypeType"/>
+			<xs:choice>
+				<xs:sequence>
+					<xs:element name="Payload">
+						<xs:complexType>
+							<xs:simpleContent>
+								<xs:extension base="xs:double">
+									<xs:attribute name="unit" type="MassUnitType" use="required"/>
+								</xs:extension>
+							</xs:simpleContent>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="FuelType" type="xs:string"/>
+					<xs:element name="AverageSpeed">
+						<xs:complexType>
+							<xs:simpleContent>
+								<xs:extension base="xs:double">
+									<xs:attribute name="unit" type="SpeedUnitType" use="required"/>
+								</xs:extension>
+							</xs:simpleContent>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="Fuel" maxOccurs="unbounded">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="FuelConsumption" type="FuelConsumptionType" maxOccurs="unbounded">
+									<xs:annotation>
+										<xs:documentation>I.2.3.1 - I.2.3.12 / #69</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+							<xs:attribute name="type" type="xs:string" use="required"/>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="CO2" type="CO2Type" maxOccurs="unbounded"/>
+				</xs:sequence>
+				<xs:element name="Error" type="xs:string"/>
+			</xs:choice>
+		</xs:sequence>
+		<xs:attribute name="status" use="required">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="success"/>
+					<xs:enumeration value="error"/>
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="VectoOutputDataType">
+		<xs:sequence>
+			<xs:element name="Vehicle" type="VehicleType"/>
+			<xs:element name="ResultDataSignature" type="vdecdef:SignatureType">
+				<xs:annotation>
+					<xs:documentation>II.3</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Results">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Status">
+							<xs:simpleType>
+								<xs:restriction base="xs:string">
+									<xs:enumeration value="success"/>
+									<xs:enumeration value="error"/>
+								</xs:restriction>
+							</xs:simpleType>
+						</xs:element>
+						<xs:choice>
+							<xs:sequence>
+								<xs:element name="Result" type="ResultType" maxOccurs="unbounded">
+									<xs:annotation>
+										<xs:documentation>II.2.1, II.2.2</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+								<xs:element name="Summary" minOccurs="0">
+									<xs:complexType>
+										<xs:sequence>
+											<xs:element name="SpecificCO2Emissions">
+												<xs:annotation>
+													<xs:documentation>II.2.3</xs:documentation>
+												</xs:annotation>
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:double">
+															<xs:attribute name="unit" use="required">
+																<xs:simpleType>
+																	<xs:restriction base="xs:string">
+																		<xs:enumeration value="gCO2/tkm"/>
+																	</xs:restriction>
+																</xs:simpleType>
+															</xs:attribute>
+														</xs:extension>
+													</xs:simpleContent>
+												</xs:complexType>
+											</xs:element>
+											<xs:element name="AveragePayload">
+												<xs:annotation>
+													<xs:documentation>II.2.4</xs:documentation>
+												</xs:annotation>
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:double">
+															<xs:attribute name="unit" use="required">
+																<xs:simpleType>
+																	<xs:restriction base="xs:string">
+																		<xs:enumeration value="t"/>
+																	</xs:restriction>
+																</xs:simpleType>
+															</xs:attribute>
+														</xs:extension>
+													</xs:simpleContent>
+												</xs:complexType>
+											</xs:element>
+										</xs:sequence>
+									</xs:complexType>
+								</xs:element>
+							</xs:sequence>
+							<xs:element name="ExemptedVehicle">
+								<xs:complexType/>
+							</xs:element>
+						</xs:choice>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="ApplicationInformation">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="SimulationToolVersion" type="xs:string">
+							<xs:annotation>
+								<xs:documentation>II.2.5</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="Date" type="vdecdef:DateTimeWithTimezone">
+							<xs:annotation>
+								<xs:documentation>II.2.5</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
+		<xs:attribute name="id" type="xs:NCName" use="required"/>
+	</xs:complexType>
+	<xs:complexType name="VehiclePerformanceType">
+		<xs:sequence/>
+	</xs:complexType>
+	<xs:complexType name="VehicleType">
+		<xs:sequence>
+			<xs:element name="Model" type="vdecdef:ModelType">
+				<xs:annotation>
+					<xs:documentation>P236 / II.1.1.7</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Manufacturer" type="vdecdef:ManufacturerType">
+				<xs:annotation>
+					<xs:documentation>P235 / II.1.1.6</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ManufacturerAddress" type="vdecdef:ManufacturerAddressType">
+				<xs:annotation>
+					<xs:documentation>P252 / II.1.1.6</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="VIN" type="vdecdef:VINType">
+				<xs:annotation>
+					<xs:documentation>P238 / II.1.1.1</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="LegislativeClass" type="vdecdef:LegislativeClassDeclarationType">
+				<xs:annotation>
+					<xs:documentation>P251 / II.1.1.2</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="GrossVehicleMass">
+				<xs:annotation>
+					<xs:documentation>P041 / II.1.1.4</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:double">
+							<xs:attribute name="unit" type="MassUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="CurbMassChassis">
+				<xs:annotation>
+					<xs:documentation>P038 / II.1.1.8</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="vdecdef:VehicleCurbMassChassisType">
+							<xs:attribute name="unit" type="MassUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="ZeroEmissionVehicle" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>P269 / II.1.1.10</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="HybridElectricHDV" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>P279 / II.1.1.11</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WasteHeatRecovery" type="xs:boolean"/>
+			<xs:element name="DualFuelVehicle" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>P280 / II.1.1.12</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:choice>
+				<xs:sequence>
+					<xs:element name="AxleConfiguration" type="vdecdef:VehicleAxleConfigurationDeclarationType">
+						<xs:annotation>
+							<xs:documentation>P037 / II.1.1.3</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="VehicleGroup" type="VehicleGroupType">
+						<xs:annotation>
+							<xs:documentation>VECTO / II.1.1.5</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="CO2StandardsGroup">
+						<xs:simpleType>
+							<xs:restriction base="xs:string">
+								<xs:minLength value="1"/>
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+					<xs:element name="VocationalVehicle" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P270 / II.1.1.9</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="SleeperCab" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P267 / II.1.1.13</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ADAS" type="ADASType"/>
+					<xs:element name="EngineRatedPower">
+						<xs:annotation>
+							<xs:documentation>P250 / II.1.2.1</xs:documentation>
+						</xs:annotation>
+						<xs:complexType>
+							<xs:simpleContent>
+								<xs:extension base="vdecdef:EngineRatedPower">
+									<xs:attribute name="unit" type="PowerUnitType" use="required"/>
+								</xs:extension>
+							</xs:simpleContent>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="EngineDisplacement">
+						<xs:annotation>
+							<xs:documentation>P061 / II.1.2.2</xs:documentation>
+						</xs:annotation>
+						<xs:complexType>
+							<xs:simpleContent>
+								<xs:extension base="xs:double">
+									<xs:attribute name="unit" type="DisplacementType" use="required"/>
+								</xs:extension>
+							</xs:simpleContent>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="FuelType" type="vdecdef:FuelTypeType">
+						<xs:annotation>
+							<xs:documentation>P193 / II.1.2.3</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TransmissionMainCertificationMethod" type="vdecdef:GearboxCertificationOptionType">
+						<xs:annotation>
+							<xs:documentation>P154 / II.1.2.4</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TransmissionType" type="vdecdef:GearboxTransmissionTypeType">
+						<xs:annotation>
+							<xs:documentation>P076 / II.1.2.5</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="GearsCount">
+						<xs:annotation>
+							<xs:documentation>P199 / II.1.2.6</xs:documentation>
+						</xs:annotation>
+						<xs:simpleType>
+							<xs:restriction base="xs:int">
+								<xs:minInclusive value="1"/>
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+					<xs:element name="Retarder" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P052 / II.1.2.7</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="AxleRatio" type="vdecdef:AxlegearRatioType">
+						<xs:annotation>
+							<xs:documentation>P150 / II.1.2.8</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="AverageRRCMotorVehicleTyres" type="vdecdef:TyreRRCISOType">
+						<xs:annotation>
+							<xs:documentation>P046 / II.1.2.9  // arithmetic average of RRC over all truck tires</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="AverageFuelEfficiencyLabelMotorVehicleTyres">
+						<xs:annotation>
+							<xs:documentation>II.1.2.10  // classification of AverageRRCMotorVehicleTyres according to 1222/2009 C3 tyres </xs:documentation>
+						</xs:annotation>
+						<xs:simpleType>
+							<xs:restriction base="xs:string">
+								<xs:minLength value="1"/>
+								<xs:maxLength value="1"/>
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+				</xs:sequence>
+				<xs:sequence>
+					<xs:element name="MaxNetPower1" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>P277</xs:documentation>
+						</xs:annotation>
+						<xs:complexType>
+							<xs:simpleContent>
+								<xs:extension base="xs:double">
+									<xs:attribute name="unit" type="PowerUnitType" use="required"/>
+								</xs:extension>
+							</xs:simpleContent>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="MaxNetPower2" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>P278</xs:documentation>
+						</xs:annotation>
+						<xs:complexType>
+							<xs:simpleContent>
+								<xs:extension base="xs:double">
+									<xs:attribute name="unit" type="PowerUnitType" use="required"/>
+								</xs:extension>
+							</xs:simpleContent>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:choice>
+			<xs:element name="InputDataSignature" type="vdecdef:SignatureType"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:simpleType name="AccelerationUnitType">
+		<xs:restriction base="xs:token">
+			<xs:enumeration value="m/s²"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="AirdragCertificationOptionType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Measured"/>
+			<xs:enumeration value="Standard values"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="CO2UnitType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="g/km"/>
+			<xs:enumeration value="g/t-km"/>
+			<xs:enumeration value="g/p-km"/>
+			<xs:enumeration value="g/m³-km"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="DistanceUnitType">
+		<xs:restriction base="xs:token">
+			<xs:enumeration value="km"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="FuelConsumptionUnitType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="g/km"/>
+			<xs:enumeration value="g/t-km"/>
+			<xs:enumeration value="g/p-km"/>
+			<xs:enumeration value="g/m³-km"/>
+			<xs:enumeration value="l/100km"/>
+			<xs:enumeration value="l/t-km"/>
+			<xs:enumeration value="l/p-km"/>
+			<xs:enumeration value="l/m³-km"/>
+			<xs:enumeration value="MJ/km"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="MassUnitType">
+		<xs:restriction base="xs:token">
+			<xs:enumeration value="kg"/>
+			<xs:enumeration value="t"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="MissionTypeType">
+		<xs:restriction base="xs:token">
+			<xs:enumeration value="Long Haul EMS"/>
+			<xs:enumeration value="Long Haul"/>
+			<xs:enumeration value="Regional Delivery EMS"/>
+			<xs:enumeration value="Regional Delivery"/>
+			<xs:enumeration value="Urban Delivery"/>
+			<xs:enumeration value="Municipal Utility"/>
+			<xs:enumeration value="Construction"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="SpeedUnitType">
+		<xs:restriction base="xs:token">
+			<xs:enumeration value="km/h"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="VehicleGroupType">
+		<xs:restriction base="xs:int">
+			<xs:minInclusive value="1"/>
+			<xs:maxInclusive value="16"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="PowerUnitType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="kW"/>
+			<xs:enumeration value="W"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="DisplacementType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="ltr"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="ADASType">
+		<xs:sequence>
+			<xs:element name="EngineStopStart" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>P271 / II.1.2.11</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="EcoRollWithoutEngineStop" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>P272 / II.1.2.12</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="EcoRollWithEngineStop" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>P273 / II.1.2.13</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PredictiveCruiseControl" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>P274 / II.1.2.14</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.xsd
index 7ab5c7037a75ce81cbb95bbb86b6d5c6ab896801..7f2dfd08398cf33082ded0c4cd5c5292d955c2bd 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.xsd
@@ -9,4 +9,5 @@
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.5" schemaLocation="VectoOutputCustomer.0.5.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.7" schemaLocation="VectoOutputCustomer.0.7.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.7.1" schemaLocation="VectoOutputCustomer.0.7.1.xsd"/>
+	<xs:import namespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.7.2" schemaLocation="VectoOutputCustomer.0.7.2.xsd"/>
 </xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.2.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.2.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..bc76d16d5bdf3dc3af037c7ebecd256e5977943d
--- /dev/null
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.2.xsd
@@ -0,0 +1,987 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) -->
+<!--W3C XML Schema generated by XMLSpy vXMLSpy Professional Edition v2016 rel. 2 (x64) (http://www.altova.com)-->
+<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7.2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7.2" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.7">
+	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
+	<xs:element name="VectoOutput">
+		<xs:annotation>
+			<xs:documentation>Comment describing your root element</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="VectoOutputManufacturerType">
+					<xs:attribute name="schemaVersion" type="xs:decimal" use="required"/>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:complexType name="AirdragType">
+		<xs:sequence>
+			<xs:element name="Model" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>P241 / I.1.8.1 / #96</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CertificationMethod" type="AirdragCertificationOptionType">
+				<xs:annotation>
+					<xs:documentation>VECTO / I.1.8.2 / #22</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>P268 / I.1.8.3 / #3</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DigestValue" type="xs:token" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>? / I.1.8.5</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CdxA" type="vdecdef:AirdragCdxAType">
+				<xs:annotation>
+					<xs:documentation>P245 / I.1.8.4 / #23</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="AngledriveType">
+		<xs:sequence>
+			<xs:element name="Model" type="vdecdef:ModelType">
+				<xs:annotation>
+					<xs:documentation>P221 / I.1.6.1 / #93</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CertificationMethod" type="vdecdef:AngledriveCertificationOptionType">
+				<xs:annotation>
+					<xs:documentation>P258 / I.1.6.3 / #37</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>P265 / I.1.6.2 / #94</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DigestValue" type="xs:token">
+				<xs:annotation>
+					<xs:documentation>? / I.1.6.5</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Ratio" type="vdecdef:AngledriveRatioType">
+				<xs:annotation>
+					<xs:documentation>P176 / I.1.6.4 / #38</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="AuxiliariesType">
+		<xs:sequence>
+			<xs:element name="FanTechnology" type="vdecdef:AuxFanTechnologyType">
+				<xs:annotation>
+					<xs:documentation>P181 / I.1.10.1 / #52</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="SteeringPumpTechnology" maxOccurs="4">
+				<xs:annotation>
+					<xs:documentation>P182 / I.1.10.2 / #53</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="vdecdef:AuxSPTechnologyType"/>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="ElectricSystemTechnology" type="vdecdef:AuxESTechnologyType">
+				<xs:annotation>
+					<xs:documentation>P183 / I.1.10.3 / #54</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PneumaticSystemTechnology" type="vdecdef:AuxPSTechnologyType">
+				<xs:annotation>
+					<xs:documentation>P184 / I.1.10.4 / #55</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="HVACTechnology" type="vdecdef:AuxHVACTechnologyType">
+				<xs:annotation>
+					<xs:documentation>P185</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="AxlegearType">
+		<xs:sequence>
+			<xs:element name="Model" type="vdecdef:ModelType">
+				<xs:annotation>
+					<xs:documentation>P216 / I.1.7.1 / #95</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CertificationMethod" type="vdecdef:AxlegearCertificationOptionType">
+				<xs:annotation>
+					<xs:documentation>P256  I.1.7.3 / #34</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>P264 / I.1.7.2 / #5</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DigestValue" type="xs:token">
+				<xs:annotation>
+					<xs:documentation>? / I.1.7.6</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="LineType" type="vdecdef:AxlegearLineTypeType">
+				<xs:annotation>
+					<xs:documentation>P253 / I.1.7.4 / #35</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Ratio" type="vdecdef:AxlegearRatioType">
+				<xs:annotation>
+					<xs:documentation>P150 / I.1.7.5 / #36</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="AxleType">
+		<xs:sequence>
+			<xs:element name="TyreDimension" type="vdecdef:TyreDimensionType">
+				<xs:annotation>
+					<xs:documentation>P108 / I.1.9.1, I.1.9.4, I.1.9.8, I.1.9.12 / #41, #43, #46, #49</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TyreCertificationNumber" type="vdecdef:CertificationNumberType">
+				<xs:annotation>
+					<xs:documentation>P267 / I.1.9.2, I.1.9.6, I.1.9.10, I.1.9.14, #6, #7, #8, #9</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DigestValue" type="xs:token">
+				<xs:annotation>
+					<xs:documentation>? / I.1.9.3a, I.1.9.7a, I.1.9.11a, I.1.9.16</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TyreRRCDeclared" type="vdecdef:TyreRRCISOType">
+				<xs:annotation>
+					<xs:documentation>P046 / I.1.9.3, I.1.9.7, I.1.9.11, I.1.9.15 / #42, #45, #48, #51</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TwinTyres" type="vdecdef:AxleTwinTyresType">
+				<xs:annotation>
+					<xs:documentation>P045 / I.1.9.5, I.1.9.9, I.1.9.13, #44, #47, #50</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+		<xs:attribute name="axleNumber" use="required">
+			<xs:simpleType>
+				<xs:restriction base="xs:int">
+					<xs:minInclusive value="1"/>
+					<xs:maxInclusive value="4"/>
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="AxleWheelsType">
+		<xs:sequence minOccurs="2" maxOccurs="4">
+			<xs:element name="Axle" type="AxleType"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="CO2Type">
+		<xs:simpleContent>
+			<xs:extension base="xs:double">
+				<xs:attribute name="unit" type="CO2UnitType" use="required"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+	<xs:complexType name="ComponentDescriptionType">
+		<xs:sequence>
+			<xs:element name="Model" type="vdecdef:ModelType"/>
+			<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType"/>
+			<xs:element name="DigestValue" type="xs:token"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="EngineType">
+		<xs:sequence>
+			<xs:element name="Model" type="vdecdef:ModelType">
+				<xs:annotation>
+					<xs:documentation>P201 / I.1.2.1 / #85</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType">
+				<xs:annotation>
+					<xs:documentation>P261 / I.1.2.2 / #2</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DigestValue" type="xs:token">
+				<xs:annotation>
+					<xs:documentation>? / I.2.8</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RatedPower">
+				<xs:annotation>
+					<xs:documentation>P250 / I.1.2.3 / #17</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="vdecdef:EngineRatedPower">
+							<xs:attribute name="unit" type="PowerUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="IdlingSpeed">
+				<xs:annotation>
+					<xs:documentation>P063, P198 / I.1.2.4 / #18</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="vdecdef:EngineDeclaredSpeedType">
+							<xs:attribute name="unit" type="AngularVelocityUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="RatedSpeed">
+				<xs:annotation>
+					<xs:documentation>P249 / I.1.2.5 / #19</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="vdecdef:EngineDeclaredSpeedType">
+							<xs:attribute name="unit" type="AngularVelocityUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Displacement">
+				<xs:annotation>
+					<xs:documentation>P061 / I.1.2.6 / #20</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:double">
+							<xs:attribute name="unit" type="DisplacementType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="FuelTypes">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="FuelType" type="vdecdef:FuelTypeType" maxOccurs="unbounded">
+							<xs:annotation>
+								<xs:documentation>P193 / I.1.2.7 / #21</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="WasteHeatRecoverySystem" type="xs:boolean"/>
+			<xs:element name="WasteHeatRecoverySystemType" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="FuelConsumptionType">
+		<xs:simpleContent>
+			<xs:extension base="xs:double">
+				<xs:attribute name="unit" type="FuelConsumptionUnitType" use="required"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+	<xs:complexType name="GearboxType">
+		<xs:sequence>
+			<xs:element name="Model" type="vdecdef:ModelType">
+				<xs:annotation>
+					<xs:documentation>P205 / I.1.3.1 / #86</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CertificationMethod" type="vdecdef:GearboxCertificationOptionType">
+				<xs:annotation>
+					<xs:documentation>P154 / I.1.3.3 / #26</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>P262 / I.1.3.2 / #4</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DigestValue" type="xs:token">
+				<xs:annotation>
+					<xs:documentation>? / I.1.3.9</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="TransmissionType" type="vdecdef:GearboxTransmissionTypeType">
+				<xs:annotation>
+					<xs:documentation>P076 / I.1.3.4 / #27</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="GearsCount">
+				<xs:annotation>
+					<xs:documentation>P199 / I.1.3.5 / #28</xs:documentation>
+				</xs:annotation>
+				<xs:simpleType>
+					<xs:restriction base="xs:int">
+						<xs:minInclusive value="1"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="TransmissionRatioFinalGear" type="vdecdef:GearboxGearRatioType">
+				<xs:annotation>
+					<xs:documentation>P078 / I.1.3.6 / #29</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="ResultType">
+		<xs:sequence>
+			<xs:element name="Mission" type="MissionTypeType">
+				<xs:annotation>
+					<xs:documentation>I.2.1.1 / #56</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:choice>
+				<xs:sequence>
+					<xs:element name="Distance">
+						<xs:annotation>
+							<xs:documentation>I.2.2.8 / #67</xs:documentation>
+						</xs:annotation>
+						<xs:complexType>
+							<xs:simpleContent>
+								<xs:extension base="xs:double">
+									<xs:attribute name="unit" type="DistanceUnitType" use="required"/>
+								</xs:extension>
+							</xs:simpleContent>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="SimulationParameters" type="SimulationParametersType"/>
+					<xs:element name="VehiclePerformance" type="VehiclePerformanceType"/>
+					<xs:element name="Fuel" maxOccurs="unbounded">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="FuelConsumption" type="FuelConsumptionType" maxOccurs="unbounded">
+									<xs:annotation>
+										<xs:documentation>I.2.3.1 - I.2.3.12 / #69</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+							<xs:attribute name="type" type="xs:string" use="required"/>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="CO2" type="CO2Type" maxOccurs="unbounded">
+						<xs:annotation>
+							<xs:documentation>I.2.3.13 - I.2.3.16 / #68</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+				</xs:sequence>
+				<xs:sequence>
+					<xs:element name="Error" type="xs:string"/>
+					<xs:element name="ErrorDetails" type="xs:string"/>
+				</xs:sequence>
+			</xs:choice>
+		</xs:sequence>
+		<xs:attribute name="status" use="required">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="success"/>
+					<xs:enumeration value="error"/>
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="RetarderType">
+		<xs:sequence>
+			<xs:element name="RetarderType" type="vdecdef:RetarderTypeType">
+				<xs:annotation>
+					<xs:documentation>P052 / I.1.3.7 / #30</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:sequence minOccurs="0">
+				<xs:element name="Model" type="vdecdef:ModelType">
+					<xs:annotation>
+						<xs:documentation>P226 / I.1.4.1 / #87</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="CertificationMethod" type="vdecdef:RetarderCertificationOptionType">
+					<xs:annotation>
+						<xs:documentation>P255 / I.1.4.3 / #89</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
+					<xs:annotation>
+						<xs:documentation>P266 / I.1.4.2 / #88</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="DigestValue" type="xs:token">
+					<xs:annotation>
+						<xs:documentation>? / I.1.4.4</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="SimulationParametersType">
+		<xs:sequence>
+			<xs:element name="TotalVehicleMass">
+				<xs:annotation>
+					<xs:documentation>I.2.1.4 / #59</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:double">
+							<xs:attribute name="unit" type="MassUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Payload">
+				<xs:annotation>
+					<xs:documentation>I.2.1.2 / #57</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:double">
+							<xs:attribute name="unit" type="MassUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="FuelType" type="xs:string">
+				<xs:annotation>
+					<xs:documentation>P193, P275 / I.2.1.3 / #58</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="TorqueconverterType">
+		<xs:sequence>
+			<xs:element name="Model" type="vdecdef:ModelType">
+				<xs:annotation>
+					<xs:documentation>P211 / I.1.5.1 / #90</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CertificationMethod" type="vdecdef:TorqueConverterCertificationOptionType">
+				<xs:annotation>
+					<xs:documentation>P257 / I.1.5.3 / #92</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>P263 / I.1.5.2 / #91</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DigestValue" type="xs:token">
+				<xs:annotation>
+					<xs:documentation>? / I.1.5.4</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="TorqueLimitsEntryType">
+		<xs:attribute name="gear" type="vdecdef:GearboxGearNumberType" use="required">
+			<xs:annotation>
+				<xs:documentation>P196</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="torqueLimit" type="vdecdef:TorqueLimitEntryMaxTorqueType" use="required">
+			<xs:annotation>
+				<xs:documentation>P197 / P194</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="unit" use="required">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="Nm"/>
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+		<xs:attribute name="torqueLimitPercent" use="required">
+			<xs:annotation>
+				<xs:documentation>/ I.1.11.*</xs:documentation>
+			</xs:annotation>
+			<xs:simpleType>
+				<xs:restriction base="xs:float">
+					<xs:minInclusive value="0.0"/>
+					<xs:maxInclusive value="100.0"/>
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="TorqueLimitsType">
+		<xs:sequence>
+			<xs:element name="Entry" maxOccurs="unbounded">
+				<xs:complexType>
+					<xs:complexContent>
+						<xs:extension base="TorqueLimitsEntryType"/>
+					</xs:complexContent>
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="VectoOutputDataType">
+		<xs:sequence>
+			<xs:element name="Vehicle" type="VehicleType"/>
+			<xs:element name="Results">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Status">
+							<xs:simpleType>
+								<xs:restriction base="xs:string">
+									<xs:enumeration value="success"/>
+									<xs:enumeration value="error"/>
+								</xs:restriction>
+							</xs:simpleType>
+						</xs:element>
+						<xs:choice>
+							<xs:sequence>
+								<xs:element name="Result" type="ResultType" maxOccurs="unbounded"/>
+							</xs:sequence>
+							<xs:element name="ExemptedVehicle">
+								<xs:complexType/>
+							</xs:element>
+						</xs:choice>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="ApplicationInformation">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="SimulationToolVersion" type="xs:string">
+							<xs:annotation>
+								<xs:documentation>I.3.1.1 / #70</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="Date" type="vdecdef:DateTimeWithTimezone">
+							<xs:annotation>
+								<xs:documentation>I.3.1.2 / #71</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
+		<xs:attribute name="id" type="xs:NCName" use="required"/>
+	</xs:complexType>
+	<xs:complexType name="VehiclePerformanceType">
+		<xs:sequence>
+			<xs:element name="AverageSpeed">
+				<xs:annotation>
+					<xs:documentation>I.2.2.1 / #60</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:double">
+							<xs:attribute name="unit" type="SpeedUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="AverageDrivingSpeed">
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:double">
+							<xs:attribute name="unit" type="SpeedUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="MinSpeed">
+				<xs:annotation>
+					<xs:documentation>I.2.2.2 / #61</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:double">
+							<xs:attribute name="unit" type="SpeedUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="MaxSpeed">
+				<xs:annotation>
+					<xs:documentation>I.2.2.3 / #62</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:double">
+							<xs:attribute name="unit" type="SpeedUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="MaxDeceleration">
+				<xs:annotation>
+					<xs:documentation>I.2.2.4 / #63</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:double">
+							<xs:attribute name="unit" type="AccelerationUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="MaxAcceleration">
+				<xs:annotation>
+					<xs:documentation>I.2.2.5 / #64</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:double">
+							<xs:attribute name="unit" type="AccelerationUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="FullLoadDrivingtimePercentage">
+				<xs:annotation>
+					<xs:documentation>I.2.2.6 / #65</xs:documentation>
+				</xs:annotation>
+				<xs:simpleType>
+					<xs:restriction base="xs:double">
+						<xs:minInclusive value="0"/>
+						<xs:maxInclusive value="100"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="GearshiftCount" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>I.2.2.7 / #66</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="EngineSpeedDriving" type="EngineSpeedDrivingType"/>
+			<xs:element name="AverageGearboxEfficiency">
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:double">
+							<xs:attribute name="unit" type="PercentType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="AverageAxlegearEfficiency">
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:double">
+							<xs:attribute name="unit" type="PercentType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="VehicleType">
+		<xs:sequence>
+			<xs:element name="Model" type="vdecdef:ModelType">
+				<xs:annotation>
+					<xs:documentation>P236 / I.1.1.2 / #79</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Manufacturer" type="vdecdef:ManufacturerType">
+				<xs:annotation>
+					<xs:documentation>P235 / I.1.1.1 / #14</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ManufacturerAddress" type="vdecdef:ManufacturerAddressType">
+				<xs:annotation>
+					<xs:documentation>P252 / I.1.1.1 / #14</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="VIN" type="vdecdef:VINType">
+				<xs:annotation>
+					<xs:documentation>P238 / I.1.1.3 / #1</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="LegislativeClass" type="vdecdef:LegislativeClassDeclarationType">
+				<xs:annotation>
+					<xs:documentation>P251 / I.1.1.4 / #10</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="GrossVehicleMass">
+				<xs:annotation>
+					<xs:documentation>P041 / I.1.1.6 / #12</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:double">
+							<xs:attribute name="unit" type="MassUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="CurbMassChassis">
+				<xs:annotation>
+					<xs:documentation>P038 / I.1.1.8 / #16</xs:documentation>
+					<xs:documentation>P038 / I.1.1.8 / #16</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="vdecdef:VehicleCurbMassChassisType">
+							<xs:attribute name="unit" type="MassUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="ZeroEmissionVehicle" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>P269 / I.1.1.10 / #81</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="HybridElectricHDV" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>P279 / I.1.1.11 / #82</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DualFuelVehicle" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>P280 / I.1.1.12 / #83</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:sequence minOccurs="0">
+				<xs:element name="AxleConfiguration" type="vdecdef:VehicleAxleConfigurationDeclarationType">
+					<xs:annotation>
+						<xs:documentation>P037 / I.1.1.5 / #11</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="VehicleGroup" type="VehicleGroupType">
+					<xs:annotation>
+						<xs:documentation>VECTO / I.1.1.7 / #13</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+			<xs:choice>
+				<xs:sequence>
+					<xs:element name="CO2StandardsGroup">
+						<xs:simpleType>
+							<xs:restriction base="xs:string">
+								<xs:minLength value="1"/>
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+					<xs:element name="VocationalVehicle" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P270 / I.1.1.9 / #80</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="SleeperCab" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P276 / I.1.1.13 / #84</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="PTO" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P247 / I.1.3.8 / #31</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ADAS" type="ADASType"/>
+					<xs:element name="TorqueLimits" type="TorqueLimitsType" minOccurs="0"/>
+					<xs:element name="Components">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Engine" type="EngineType"/>
+								<xs:element name="Gearbox" type="GearboxType"/>
+								<xs:element name="TorqueConverter" type="TorqueconverterType" minOccurs="0"/>
+								<xs:element name="Retarder" type="RetarderType"/>
+								<xs:element name="Angledrive" type="AngledriveType" minOccurs="0"/>
+								<xs:element name="Axlegear" type="AxlegearType"/>
+								<xs:element name="AirDrag" type="AirdragType"/>
+								<xs:element name="AxleWheels" type="AxleWheelsType"/>
+								<xs:element name="Auxiliaries" type="AuxiliariesType"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+				<xs:sequence>
+					<xs:element name="SleeperCab" type="xs:boolean" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>P276 / I.1.1.13 / #84</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MaxNetPower1" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>P277</xs:documentation>
+						</xs:annotation>
+						<xs:complexType>
+							<xs:simpleContent>
+								<xs:extension base="xs:double">
+									<xs:attribute name="unit" type="PowerUnitType" use="required"/>
+								</xs:extension>
+							</xs:simpleContent>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="MaxNetPower2" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>P278</xs:documentation>
+						</xs:annotation>
+						<xs:complexType>
+							<xs:simpleContent>
+								<xs:extension base="xs:double">
+									<xs:attribute name="unit" type="PowerUnitType" use="required"/>
+								</xs:extension>
+							</xs:simpleContent>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:choice>
+			<xs:element name="InputDataSignature" type="vdecdef:SignatureType">
+				<xs:annotation>
+					<xs:documentation>I.3.1.3</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:simpleType name="AccelerationUnitType">
+		<xs:restriction base="xs:token">
+			<xs:enumeration value="m/s²"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="AirdragCertificationOptionType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Measured"/>
+			<xs:enumeration value="Standard values"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="CO2UnitType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="g/km"/>
+			<xs:enumeration value="g/t-km"/>
+			<xs:enumeration value="g/p-km"/>
+			<xs:enumeration value="g/m³-km"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="DistanceUnitType">
+		<xs:restriction base="xs:token">
+			<xs:enumeration value="km"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="FuelConsumptionUnitType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="g/km"/>
+			<xs:enumeration value="g/t-km"/>
+			<xs:enumeration value="g/p-km"/>
+			<xs:enumeration value="g/m³-km"/>
+			<xs:enumeration value="l/100km"/>
+			<xs:enumeration value="l/t-km"/>
+			<xs:enumeration value="l/p-km"/>
+			<xs:enumeration value="l/m³-km"/>
+			<xs:enumeration value="MJ/km"/>
+			<xs:enumeration value="MJ/t-km"/>
+			<xs:enumeration value="MJ/m³-km"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="MassUnitType">
+		<xs:restriction base="xs:token">
+			<xs:enumeration value="kg"/>
+			<xs:enumeration value="t"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="MissionTypeType">
+		<xs:restriction base="xs:token">
+			<xs:enumeration value="Long Haul EMS"/>
+			<xs:enumeration value="Long Haul"/>
+			<xs:enumeration value="Regional Delivery EMS"/>
+			<xs:enumeration value="Regional Delivery"/>
+			<xs:enumeration value="Urban Delivery"/>
+			<xs:enumeration value="Municipal Utility"/>
+			<xs:enumeration value="Construction"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="SpeedUnitType">
+		<xs:restriction base="xs:token">
+			<xs:enumeration value="km/h"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="VehicleGroupType">
+		<xs:restriction base="xs:int">
+			<xs:minInclusive value="1"/>
+			<xs:maxInclusive value="16"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="AngularVelocityUnitType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="rpm"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="PowerUnitType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="kW"/>
+			<xs:enumeration value="W"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="DisplacementType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="ltr"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="VectoOutputManufacturerType">
+		<xs:sequence>
+			<xs:element name="Data">
+				<xs:complexType>
+					<xs:complexContent>
+						<xs:extension base="VectoOutputDataType"/>
+					</xs:complexContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Signature" type="vdecdef:SignatureType">
+				<xs:annotation>
+					<xs:documentation>I.3.1.4 / #73</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:simpleType name="PercentType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="%"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="ADASType">
+		<xs:sequence>
+			<xs:element name="EngineStopStart" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>P271 / I.1.12.1 / #97</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="EcoRollWithoutEngineStop" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>P272 / I.1.12.2 / #98</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="EcoRollWithEngineStop" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>P273 / I.1.12.3 / #99</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="PredictiveCruiseControl" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>P274 / I.1.12.4 / #100</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="EngineSpeedDrivingType">
+		<xs:sequence>
+			<xs:element name="Min">
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:double">
+							<xs:attribute name="unit" type="AngularVelocityUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Average">
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:double">
+							<xs:attribute name="unit" type="AngularVelocityUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Max">
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:double">
+							<xs:attribute name="unit" type="AngularVelocityUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.xsd
index 71bb92380a23a695f871c600b39e770d3fa54da0..dacb9cdc7741769f3076c575949e55e078a57701 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.xsd
@@ -10,4 +10,5 @@
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.6" schemaLocation="VectoOutputManufacturer.0.6.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7" schemaLocation="VectoOutputManufacturer.0.7.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7.1" schemaLocation="VectoOutputManufacturer.0.7.1.xsd"/>
+	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7.2" schemaLocation="VectoOutputManufacturer.0.7.2.xsd"/>
 </xs:schema>
diff --git a/VectoCore/VectoCore/Utils/XMLDefinitions.cs b/VectoCore/VectoCore/Utils/XMLDefinitions.cs
index 47e530052be76f97c86cf85c005b3e434b951413..f3db5c3f2df460ff31f06517f0925fa7e05e1c00 100644
--- a/VectoCore/VectoCore/Utils/XMLDefinitions.cs
+++ b/VectoCore/VectoCore/Utils/XMLDefinitions.cs
@@ -80,6 +80,7 @@ namespace TUGraz.VectoCore.Utils
 
 		public const string DECLARATION_DEFINITIONS_NAMESPACE_URI_V221 = DECLARATION_NAMESPACE + ":v2.2.1";
 
+		public const string DECLARATION_DEFINITIONS_NAMESPACE_URI_V23 = DECLARATION_NAMESPACE + ":v2.3";
 
 		public const string DECLARATION_INPUT_NAMESPACE = "urn:tugraz:ivt:VectoAPI:DeclarationInput";
 
diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp
index 8424ec9eea2428c6a66b00ad14f5ad76e077563c..521eccebfdedbf03cc3a8444ac5dce66bee2d69d 100644
--- a/VectoCore/VectoXML.spp
+++ b/VectoCore/VectoXML.spp
@@ -133,11 +133,13 @@
 			<File FilePath="VectoCore\Resources\XSD\VectoOutputCustomer.0.4.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VectoOutputCustomer.0.5.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VectoOutputCustomer.0.7.1.xsd" HomeFolder="Yes"/>
+			<File FilePath="VectoCore\Resources\XSD\VectoOutputCustomer.0.7.2.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VectoOutputCustomer.0.7.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VectoOutputCustomer.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VectoOutputManufacturer.0.5.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VectoOutputManufacturer.0.6.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VectoOutputManufacturer.0.7.1.xsd" HomeFolder="Yes"/>
+			<File FilePath="VectoCore\Resources\XSD\VectoOutputManufacturer.0.7.2.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VectoOutputManufacturer.0.7.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VectoOutputManufacturer.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VTPReport.0.1.xsd" HomeFolder="Yes"/>