From 08fb543f0af580825b5c19dcd4bbf0bca2afc1fd Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 25 Jan 2022 11:00:29 +0100
Subject: [PATCH] updating test-xml files and generic vehicles after namespace
 changes

---
 .../completed_heavyBus_31b.VIF_Report_2.xml   |    4 +-
 .../CompletedBus 31b2/input_airdragonly.xml   |    2 +-
 .../CompletedBus 31b2/input_aux.xml           |    4 +-
 ...ary_heavyBus group_P31_32_Smart_ES.VIF.xml |    2 +-
 ...yBus group_P31_32_Smart_ES.VIF_incl TC.xml |    8 +-
 .../vecto_vehicle-completed_heavyBus_31b.xml  |    5 +-
 .../completed_heavyBus_34f.VIF_Report_2.xml   |   10 +-
 ...mary_heavyBus group_P33_34_SmartPS.VIF.xml |    8 +-
 .../vecto_vehicle-completed_heavyBus_34f.xml  |    6 +-
 .../completed_heavyBus_39a.VIF_Report_2.xml   |    8 +-
 ...heavyBus group P39_40_nonSmart_ESS_VIF.xml |    8 +-
 .../vecto_vehicle-completed_heavyBus_39a.xml  |    2 +-
 ...primary_heavyBus group_P31_32_Smart_ES.xml |    6 +-
 .../primary_heavyBus group_P33_34_SmartPS.xml |    6 +-
 ...primary_heavyBus group_P35_36_nonSmart.xml |    6 +-
 ...imary_heavyBus group_P37_38_SmartES_PS.xml |    6 +-
 ...ary_heavyBus group P39_40_nonSmart_ESS.xml |    6 +-
 .../Class5_Tractor_DECL.xml                   |    6 +-
 .../Class5_Tractor_DECL_DF-DM_WHR.xml         |    5 +-
 .../Class5_Tractor_DECL_DF.xml                |    5 +-
 .../Class5_Tractor_DECL_WHR.xml               |    5 +-
 ...primary_heavyBus group_P31_32_Smart_ES.xml |    6 +-
 .../vecto_vehicle-completed_heavyBus_31b.xml  |   10 +-
 .../primary_heavyBus group_P33_34_SmartPS.xml |    6 +-
 .../vecto_vehicle-completed_heavyBus_34f.xml  |    4 +-
 .../VTP HeavyBus/CompletedBus_33c.MRF.xml     |    2 +-
 .../XSD/VectoDeclarationComponent.xsd         |    4 +-
 .../XSD/VectoDeclarationDefinitions.2.4.xsd   |    2 +-
 .../XSD/VectoOutputManufacturer.0.8.xsd       |   16 +-
 .../XSD/VectoOutputMultistep.0.1.xsd          |   25 +-
 .../Integration/ADAS/Group9_AT_EcoRoll.xml    | 4271 ++++++++---------
 .../CompletedHeavyBus_33b1.RSLT_VIF.xml       |   18 +-
 .../primary_heavyBus group41.RSLT_VIF.xml     |   14 +-
 ...primary_heavyBus group41_AT-P.RSLT_VIF.xml |    8 +-
 .../primary_heavyBus group41_nonSmart.xml     |    8 +-
 ...primary_heavyBus group41_nonSmart_AT-P.xml |    8 +-
 ...mary_heavyBus group42_SmartPS.RSLT_VIF.xml |    8 +-
 .../primary_heavyBus group42_SmartPS.xml      |    8 +-
 .../vecto_vehicle-completed_heavyBus_41.xml   |    8 +-
 ...to_vehicle-completed_heavyBus_41_mixed.xml |    8 +-
 .../vecto_vehicle-completed_heavyBus_42.xml   |    8 +-
 ...y_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml |    8 +-
 ...le-primary_heavyBus_ESS_electricFanSTP.xml |    8 +-
 ...ary_heavyBus group P39_40_nonSmart_ESS.xml |    4 +-
 .../vecto_vehicle-completed_heavyBus.xml      |    8 +-
 .../Buses/vecto_vehicle-primary_heavyBus.xml  |    8 +-
 ...vecto_vehicle-primary_heavyBus_SmartES.xml |    8 +-
 ...to_vehicle-primary_heavyBus_SmartES_PS.xml |    8 +-
 ...vecto_vehicle-primary_heavyBus_SmartPS.xml |    8 +-
 ...ecto_vehicle-primary_heavyBus_nonSmart.xml |    8 +-
 ..._vehicle-primary_heavyBus_nonSmart_ESS.xml |    8 +-
 .../vecto_vehicle-medium_lorry-Van.xml        |    2 +-
 .../vecto_vehicle-medium_lorry.xml            |    4 +-
 .../vehicle_sampleSingleModeDualFuel.xml      |    4 +-
 .../CompletedBus_34f.RSLT_MANUFACTURER.xml    |    4 +-
 .../primary_heavyBus group 42_non_Smart.xml   |    8 +-
 .../vecto_vehicle-completed_heavyBus_34f.xml  |    4 +-
 .../vecto_vehicle-medium_lorry_4x2.xml        |    6 +-
 .../SchemaVersion1.0/test.VIF_Report_2.xml    |   12 +-
 .../Conventional_completedBus_1.xml           |    4 +-
 .../CompletedBus/HEV_completedBus_1.xml       |    4 +-
 .../CompletedBus/IEPC_completedBus_1.xml      |    4 +-
 .../CompletedBus/PEV_completedBus_1.xml       |    4 +-
 .../Distributed/ComponentData/ADC.xml         |   13 +-
 .../ComponentData/BatterySystem_1.xml         |   10 +-
 .../ComponentData/CapacitorSystem_1.xml       |   13 +-
 .../ElectricMachineSystem-IHPC_1.xml          |   10 +-
 .../ComponentData/ElectricMachineSystem_1.xml |   10 +-
 .../ElectricMachineSystem_StdValues.xml       |   10 +-
 .../ComponentData/Gearbox_APT-N.xml           |   10 +-
 .../ComponentData/Gearbox_IHPC.xml            |   10 +-
 .../Distributed/ComponentData/IEPC_1.xml      |   12 +-
 .../ComponentData/IEPC_StdValues.xml          |   12 +-
 .../exempted_completedBus_input_full.xml      |    2 +-
 ...pletedBus_input_only_mandatory_entries.xml |    2 +-
 .../ExemptedVehicles/exempted_heavyLorry.xml  |    4 +-
 .../ExemptedVehicles/exempted_mediumLorry.xml |    4 +-
 .../ExemptedVehicles/exempted_primaryBus.xml  |    4 +-
 .../Conventional_heavyLorry_AMT.xml           |    2 +-
 .../HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml    |   50 +-
 .../HeavyLorry/HEV-S_heavyLorry_IEPC-S.xml    |   40 +-
 .../HeavyLorry/HEV-S_heavyLorry_S3.xml        |   42 +-
 .../HeavyLorry/HEV-S_heavyLorry_S4.xml        |   50 +-
 .../HeavyLorry/HEV_heavyLorry_AMT_Px.xml      |    2 +-
 .../HeavyLorry/HEV_heavyLorry_AMT_Px_IHPC.xml |    2 +-
 .../HeavyLorry/IEPC_heavyLorry.xml            |   20 +-
 .../HeavyLorry/PEV_heavyLorry_AMT_E2.xml      |   28 +-
 .../HeavyLorry/PEV_heavyLorry_APT-N_E2.xml    |   36 +-
 .../HeavyLorry/PEV_heavyLorry_E3.xml          |    2 +-
 .../HeavyLorry/PEV_heavyLorry_E4.xml          |    2 +-
 .../Conventional_mediumLorry_AMT.xml          |    2 +-
 .../MediumLorry/HEV-S_mediumLorry_AMT_S2.xml  |   42 +-
 .../MediumLorry/HEV-S_mediumLorry_IEPC-S.xml  |   38 +-
 .../MediumLorry/HEV-S_mediumLorry_S3.xml      |   44 +-
 .../MediumLorry/HEV-S_mediumLorry_S4.xml      |   42 +-
 .../MediumLorry/HEV_mediumLorry_AMT_Px.xml    |   26 +-
 .../MediumLorry/IEPC_mediumLorry.xml          |   20 +-
 .../MediumLorry/PEV_mediumLorry_AMT_E2.xml    |   26 +-
 .../PEV_mediumLorry_AMT_E2_EM_Std.xml         |   26 +-
 .../MediumLorry/PEV_mediumLorry_APT-N_E2.xml  |   32 +-
 .../MediumLorry/PEV_mediumLorry_E3.xml        |   26 +-
 .../MediumLorry/PEV_mediumLorry_E4.xml        |   28 +-
 .../Conventional_primaryBus_AMT.xml           |    2 +-
 .../PrimaryBus/HEV-S_primaryBus_AMT_S2.xml    |   42 +-
 .../PrimaryBus/HEV-S_primaryBus_IEPC-S.xml    |   36 +-
 .../PrimaryBus/HEV-S_primaryBus_S3.xml        |   44 +-
 .../PrimaryBus/HEV-S_primaryBus_S4.xml        |   42 +-
 .../PrimaryBus/HEV_primaryBus_AMT_Px.xml      |    2 +-
 .../PrimaryBus/IEPC_primaryBus.xml            |   20 +-
 .../PrimaryBus/PEV_primaryBus_AMT_E2.xml      |   26 +-
 .../PrimaryBus/PEV_primaryBus_E3.xml          |   26 +-
 .../PrimaryBus/PEV_primaryBus_E4.xml          |   26 +-
 .../HEV-S_heavyLorry_AMT_S2_ADC.xml           |   66 +-
 .../HEV_heavyLorry_AMT_Px_Capacitor.xml       |   26 +-
 .../Conventional_heavyLorry_AMT_n_opt.xml     |    2 +-
 .../Conventional_mediumLorry_AMT_n_opt.xml    |    2 +-
 .../Conventional_primaryBus_AMT_n_opt.xml     |    2 +-
 .../HEV-S_heavyLorry_AMT_S2_n_opt.xml         |   34 +-
 .../HEV-S_heavyLorry_IEPC-S_n_opt.xml         |   40 +-
 .../HEV-S_heavyLorry_S3_n_opt.xml             |   26 +-
 .../HEV-S_heavyLorry_S4_n_opt.xml             |   30 +-
 .../HEV-S_mediumLorry_AMT_S2_n_opt.xml        |   26 +-
 .../HEV-S_mediumLorry_IEPC-S_n_opt.xml        |   38 +-
 .../HEV-S_mediumLorry_S3_n_opt.xml            |   28 +-
 .../HEV-S_mediumLorry_S4_n_opt.xml            |   26 +-
 .../HEV-S_primaryBus_AMT_S2_n_opt.xml         |   26 +-
 .../HEV-S_primaryBus_IEPC-S_n_opt.xml         |   36 +-
 .../HEV-S_primaryBus_S3_n_opt.xml             |   28 +-
 .../HEV-S_primaryBus_S4_n_opt.xml             |   26 +-
 .../HEV_heavyLorry_AMT_Px_n_opt.xml           |    2 +-
 .../HEV_mediumLorry_AMT_Px_n_opt.xml          |   18 +-
 .../HEV_primaryBus_AMT_Px_n_opt.xml           |    2 +-
 .../IEPC_heavyLorry_n_opt.xml                 |   20 +-
 .../IEPC_mediumLorry_n_opt.xml                |   20 +-
 .../IEPC_primaryBus_n_opt.xml                 |   20 +-
 .../PEV_heavyLorry_AMT_E2_n_opt.xml           |   18 +-
 .../PEV_heavyLorry_APT-N_E2_n_opt.xml         |   26 +-
 .../PEV_heavyLorry_E3_n_opt.xml               |   18 +-
 .../PEV_heavyLorry_E4_n_opt.xml               |   18 +-
 .../PEV_mediumLorry_AMT_E2_n_opt.xml          |   18 +-
 .../PEV_mediumLorry_APT-N_E2_n_opt.xml        |   24 +-
 .../PEV_mediumLorry_E3_n_opt.xml              |   18 +-
 .../PEV_mediumLorry_E4_n_opt.xml              |   20 +-
 .../PEV_primaryBus_AMT_E2_n_opt.xml           |   18 +-
 .../PEV_primaryBus_E3_n_opt.xml               |   18 +-
 .../PEV_primaryBus_E4_n_opt.xml               |   18 +-
 .../exempted_primary_heavyBus.xml             |    4 +-
 ...ecto_vehicle-completed_heavyBus-sample.xml |    2 +-
 ...cto_vehicle-exempted_input_full-sample.xml |    4 +-
 ...ed_input_only_certain_entries01-sample.xml |    2 +-
 ...ed_input_only_certain_entries02-sample.xml |    2 +-
 ...-exempted_input_only_mandatory_entries.xml |    2 +-
 .../vecto_vehicle-medium_lorry-sample.xml     |    2 +-
 .../vecto_vehicle-primary_heavyBus-sample.xml |    2 +-
 ...vehicle-primary_heavyBusSmartES-sample.xml |    2 +-
 ...imary_heavyBusSmartES_invalid_testdata.xml |    7 +-
 .../vecto_vehicle-stage_input_full-sample.xml |    4 +-
 ...ehicle-stage_input_full-sample_group41.xml |    5 +-
 ...ge_input_only_certain_entries01-sample.xml |    2 +-
 ...ge_input_only_certain_entries02-sample.xml |    2 +-
 ..._input_only_component_nullable_entries.xml |    2 +-
 ...cle-stage_input_only_mandatory_entries.xml |    2 +-
 ..._only_mandatory_standard_value_airdrag.xml |    2 +-
 .../vecto_vehicle-stage_vif_input.xml         |    2 +-
 .../SchemaVersion2.3/engineSample.xml         |    4 +-
 .../engineSampleDualModeDualFuel.xml          |    4 +-
 .../SchemaVersion2.3/engineSample_WHR.xml     |    4 +-
 .../SchemaVersion2.3/vecto_tyre-sample.xml    |    2 +-
 .../vehicle_sampleDualModeDualFuel.xml        |    4 +-
 .../vehicle_sampleDualModeDualFuel_WHR.xml    |    4 +-
 .../vehicle_sampleSingleModeDualFuel.xml      |    4 +-
 .../vehicle_sampleSingleModeDualFuel_WHR.xml  |    4 +-
 ...vehicle_sampleSingleModeSingleFuel_WHR.xml |    4 +-
 .../exempted_primary_heavyBus.VIF.xml         |    4 +-
 ...ultistage_consolidated_multiple_stages.xml |   10 +-
 ...solidated_multiple_stages_NGTankSystem.xml |   10 +-
 ...e_consolidated_multiple_stages_airdrag.xml |   10 +-
 ..._consolidated_multiple_stages_heatPump.xml |   10 +-
 ...stage_consolidated_multiple_stages_hev.xml |   10 +-
 ...stage_consolidated_multiple_stages_vif.xml |    8 +-
 ...ecto_multistage_consolidated_one_stage.xml |    6 +-
 ...cto_multistage_consolidated_two_stages.xml |    8 +-
 .../vecto_multistage_primary_vehicle_only.xml |    2 +-
 ...o_multistage_primary_vehicle_stage_2_3.xml |    6 +-
 ...tage_primary_vehicle_stage_2_3_group41.xml |    8 +-
 ...ultistage_primary_vehicle_stage_2_full.xml |    6 +-
 ...tage_primary_vehicle_stage_2_mandatory.xml |    6 +-
 ...cto_vehicle-exempted_input_full-sample.xml |    2 +-
 ...ed_input_only_certain_entries01-sample.xml |    2 +-
 ...ed_input_only_certain_entries02-sample.xml |    2 +-
 ...-exempted_input_only_mandatory_entries.xml |    2 +-
 .../vecto_vehicle-sample_exempted.xml         |    2 +-
 .../vecto_vehicle-stage_input_full-sample.xml |    2 +-
 ...ge_input_only_certain_entries01-sample.xml |    2 +-
 ...ge_input_only_certain_entries02-sample.xml |    2 +-
 ...cle-stage_input_only_mandatory_entries.xml |    2 +-
 VectoCore/VectoXML.spp                        |    3 -
 197 files changed, 3347 insertions(+), 3336 deletions(-)

diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml
index c2fdc77a86..a73717b581 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"  xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"  xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
   <PrimaryVehicle xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
     <Data id="VEH-88dcf76d37a64b5eaf70" xsi:type="PrimaryVehicleDataType">
       <Vehicle xsi:type="VehiclePIFType">
@@ -583,7 +583,7 @@
           <di:DigestValue>4MFxDdYDnYyRrUdyIPFhEYwbyqqJl3MlYtXMaB/RQis=</di:DigestValue>
         </di:Reference>
       </HashPreviousStep>
-      <vif:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="VEH-273285e977014470902e" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+      <vif:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="VEH-273285e977014470902e" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
         <Manufacturer>Some Manufacturer</Manufacturer>
         <ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
         <VIN>VEH-1234567890</VIN>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/input_airdragonly.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/input_airdragonly.xml
index 4d13801f3c..3533a571d3 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/input_airdragonly.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/input_airdragonly.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
   <v2.0:Vehicle id="TODO_ADDIDENTIFIER" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
     <Manufacturer>TUG</Manufacturer>
     <ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/input_aux.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/input_aux.xml
index a889b353db..54ee20aacd 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/input_aux.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/input_aux.xml	
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="TODO_ADDIDENTIFIER" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
 		<Manufacturer>IVT</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
 		<VIN>VIN-1234</VIN>
 		<Date>2021-06-06T22:00:00Z</Date>
-		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>false</AirdragModifiedMultistep>
 		<VehicleDeclarationType>interim</VehicleDeclarationType>
 		<Components xsi:type="Components_Conventional_CompletedBusType">
 			<Auxiliaries>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.VIF.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.VIF.xml
index 6e6bb5268f..2570c5ed1f 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.VIF.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.VIF.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
   <PrimaryVehicle xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
     <Data id="VEH-88dcf76d37a64b5eaf70" xsi:type="PrimaryVehicleDataType">
       <Vehicle xsi:type="VehiclePIFType">
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.VIF_incl TC.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.VIF_incl TC.xml
index 3217878da5..cefefd2838 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.VIF_incl TC.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.VIF_incl TC.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
 	<PrimaryVehicle>
 		<Data xsi:type="PrimaryVehicleDataType" id="PIF-031eec78fb1746d280d9">
 			<Vehicle xsi:type="VehiclePIFType">
@@ -41,9 +41,9 @@
 							<RatedPower>220000</RatedPower>
 							<MaxEngineTorque>1100</MaxEngineTorque>
 							<WHRType>
-								<MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
-								<MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
-								<ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+								<MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputICE>
+								<MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputDrivetrain>
+								<ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</ElectricalOutput>
 							</WHRType>
 							<Mode>
 								<IdlingSpeed>700</IdlingSpeed>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/vecto_vehicle-completed_heavyBus_31b.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/vecto_vehicle-completed_heavyBus_31b.xml
index 34e44bda75..14b541820f 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/vecto_vehicle-completed_heavyBus_31b.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/vecto_vehicle-completed_heavyBus_31b.xml	
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
 		<Manufacturer>Some Manufacturer</Manufacturer>
 		<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
@@ -9,7 +10,7 @@
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>10680</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem>
 		<NumberPassengerSeatsLowerDeck>86</NumberPassengerSeatsLowerDeck>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml b/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml
index 782050ed8b..a6b2945161 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vif0.1:VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+<vif0.1:VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
   <vif0.1:PrimaryVehicle>
     <vif0.1:Data xsi:type="PrimaryVehicleDataType" id="PIF-7f30aafa027a41a1864b">
       <vif0.1:Vehicle xsi:type="VehiclePIFType">
@@ -42,9 +42,9 @@
               <vif0.1:RatedPower>325032</vif0.1:RatedPower>
               <vif0.1:MaxEngineTorque>2134</vif0.1:MaxEngineTorque>
               <vif0.1:WHRType>
-                <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
-                <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
-                <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+                <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputICE>
+                <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputDrivetrain>
+                <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</ElectricalOutput>
               </vif0.1:WHRType>
               <vif0.1:Mode>
                 <vif0.1:IdlingSpeed>600</vif0.1:IdlingSpeed>
@@ -614,7 +614,7 @@
           <di:DigestValue>a3ai89pd92w4O1za7mc+ut712QqNJqAfX0FeeZdfrFk=</di:DigestValue>
         </di:Reference>
       </vif0.1:HashPreviousStep>
-      <vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="VEH-684dbf252718426b9fde" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+      <vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="VEH-684dbf252718426b9fde" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
         <Manufacturer>Some Manufacturer</Manufacturer>
         <ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
         <VIN>VEH-1234567890</VIN>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.VIF.xml b/Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.VIF.xml
index ff8f84a734..29bd41e9cc 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.VIF.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.VIF.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
 	<PrimaryVehicle>
 		<Data xsi:type="PrimaryVehicleDataType" id="PIF-7f30aafa027a41a1864b">
 			<Vehicle xsi:type="VehiclePIFType">
@@ -42,9 +42,9 @@
 							<RatedPower>325032</RatedPower>
 							<MaxEngineTorque>2134</MaxEngineTorque>
 							<WHRType>
-								<MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
-								<MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
-								<ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+								<MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputICE>
+								<MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputDrivetrain>
+								<ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</ElectricalOutput>
 							</WHRType>
 							<Mode>
 								<IdlingSpeed>600</IdlingSpeed>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 34f/vecto_vehicle-completed_heavyBus_34f.xml b/Generic Vehicles/Declaration Mode/CompletedBus 34f/vecto_vehicle-completed_heavyBus_34f.xml
index 0edd2a3e40..d6b9ca9aff 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 34f/vecto_vehicle-completed_heavyBus_34f.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 34f/vecto_vehicle-completed_heavyBus_34f.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
 		<Manufacturer>Some Manufacturer</Manufacturer>
 		<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
@@ -9,7 +9,7 @@
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>19400</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>false</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem>
 		<NumberPassengerSeatsLowerDeck>16</NumberPassengerSeatsLowerDeck>
@@ -25,7 +25,7 @@
 		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
 		<VehicleDeclarationType>final</VehicleDeclarationType>
 		<VehicleTypeApprovalNumber>1234</VehicleTypeApprovalNumber>
-		<ADAS xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xsi:type="ADAS_Conventional_Type">
+		<ADAS xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:type="ADAS_Conventional_Type">
 			<EngineStopStart>true</EngineStopStart>
 			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml b/Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml
index b9fbad0730..9cad3882cd 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vif0.1:VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/DEV/VectoOutputMultistage.0.1.xsd">
+<vif0.1:VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/DEV/VectoOutputMultistage.0.1.xsd">
   <vif0.1:PrimaryVehicle>
     <vif0.1:Data xsi:type="PrimaryVehicleDataType" id="PIF-10652bf49ae0499f8689">
       <vif0.1:Vehicle xsi:type="VehiclePIFType">
@@ -42,9 +42,9 @@
               <vif0.1:RatedPower>260</vif0.1:RatedPower>
               <vif0.1:MaxEngineTorque>2400</vif0.1:MaxEngineTorque>
               <vif0.1:WHRType>
-                <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
-                <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
-                <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+                <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputICE>
+                <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputDrivetrain>
+                <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</ElectricalOutput>
               </vif0.1:WHRType>
               <vif0.1:Mode>
                 <vif0.1:IdlingSpeed>600</vif0.1:IdlingSpeed>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 39a/primary_heavyBus group P39_40_nonSmart_ESS_VIF.xml b/Generic Vehicles/Declaration Mode/CompletedBus 39a/primary_heavyBus group P39_40_nonSmart_ESS_VIF.xml
index 1cc8901201..9e10269cb6 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 39a/primary_heavyBus group P39_40_nonSmart_ESS_VIF.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 39a/primary_heavyBus group P39_40_nonSmart_ESS_VIF.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/DEV/VectoOutputMultistage.0.1.xsd">
+<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/DEV/VectoOutputMultistage.0.1.xsd">
 	<PrimaryVehicle>
 		<Data xsi:type="PrimaryVehicleDataType" id="PIF-10652bf49ae0499f8689">
 			<Vehicle xsi:type="VehiclePIFType">
@@ -42,9 +42,9 @@
 							<RatedPower>260</RatedPower>
 							<MaxEngineTorque>2400</MaxEngineTorque>
 							<WHRType>
-								<MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
-								<MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
-								<ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+								<MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputICE>
+								<MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputDrivetrain>
+								<ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</ElectricalOutput>
 							</WHRType>
 							<Mode>
 								<IdlingSpeed>600</IdlingSpeed>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml b/Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml
index 709891bb30..cce6460a7a 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType">
 		<Manufacturer>Some Manufacturer</Manufacturer>
 		<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
diff --git a/Generic Vehicles/Declaration Mode/Group P31_32/primary_heavyBus group_P31_32_Smart_ES.xml b/Generic Vehicles/Declaration Mode/Group P31_32/primary_heavyBus group_P31_32_Smart_ES.xml
index 753033c119..cef2f8a024 100644
--- a/Generic Vehicles/Declaration Mode/Group P31_32/primary_heavyBus group_P31_32_Smart_ES.xml	
+++ b/Generic Vehicles/Declaration Mode/Group P31_32/primary_heavyBus group_P31_32_Smart_ES.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
 		<Manufacturer>Generic Bus Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -22,10 +22,10 @@
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>none</PredictiveCruiseControl>
 		</ADAS>
-		<v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+		<v2.4:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Entry gear="6" maxTorque="1800"/>
 			<Entry gear="1" maxTorque="2500"/>
-		</v2.10.2:TorqueLimits>
+		</v2.4:TorqueLimits>
 		<Components xsi:type="Components_Conventional_PrimaryBusType">
 			<Engine>
 				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
diff --git a/Generic Vehicles/Declaration Mode/Group P33_34/primary_heavyBus group_P33_34_SmartPS.xml b/Generic Vehicles/Declaration Mode/Group P33_34/primary_heavyBus group_P33_34_SmartPS.xml
index a02c324c0f..b4864d9409 100644
--- a/Generic Vehicles/Declaration Mode/Group P33_34/primary_heavyBus group_P33_34_SmartPS.xml	
+++ b/Generic Vehicles/Declaration Mode/Group P33_34/primary_heavyBus group_P33_34_SmartPS.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD//VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD//VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_SmartPS" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
 		<Manufacturer>Generic Bus Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -22,11 +22,11 @@
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>none</PredictiveCruiseControl>
 		</ADAS>
-		<v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+		<v2.4:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Entry gear="6" maxTorque="1800"/>
 			<Entry gear="1" maxTorque="2500"/>
 			<Entry gear="12" maxTorque="1900"/>
-		</v2.10.2:TorqueLimits>
+		</v2.4:TorqueLimits>
 		<Components xsi:type="Components_Conventional_PrimaryBusType">
 			<Engine>
 				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
diff --git a/Generic Vehicles/Declaration Mode/Group P35_36/primary_heavyBus group_P35_36_nonSmart.xml b/Generic Vehicles/Declaration Mode/Group P35_36/primary_heavyBus group_P35_36_nonSmart.xml
index 298ccb209e..a59fefa737 100644
--- a/Generic Vehicles/Declaration Mode/Group P35_36/primary_heavyBus group_P35_36_nonSmart.xml	
+++ b/Generic Vehicles/Declaration Mode/Group P35_36/primary_heavyBus group_P35_36_nonSmart.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD//VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD//VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
 		<Manufacturer>Generic Bus Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -22,10 +22,10 @@
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>none</PredictiveCruiseControl>
 		</ADAS>
-		<v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+		<v2.4:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Entry gear="6" maxTorque="1800"/>
 			<Entry gear="1" maxTorque="2500"/>
-		</v2.10.2:TorqueLimits>
+		</v2.4:TorqueLimits>
 		<Components xsi:type="Components_Conventional_PrimaryBusType">
 			<Engine>
 				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
diff --git a/Generic Vehicles/Declaration Mode/Group P37_38/primary_heavyBus group_P37_38_SmartES_PS.xml b/Generic Vehicles/Declaration Mode/Group P37_38/primary_heavyBus group_P37_38_SmartES_PS.xml
index a321dbf26d..bb8e36d247 100644
--- a/Generic Vehicles/Declaration Mode/Group P37_38/primary_heavyBus group_P37_38_SmartES_PS.xml	
+++ b/Generic Vehicles/Declaration Mode/Group P37_38/primary_heavyBus group_P37_38_SmartES_PS.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD//VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD//VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_SmartES-PS" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
 		<Manufacturer>Generic Bus Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -22,11 +22,11 @@
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>none</PredictiveCruiseControl>
 		</ADAS>
-		<v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+		<v2.4:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Entry gear="6" maxTorque="1800"/>
 			<Entry gear="1" maxTorque="2500"/>
 			<Entry gear="12" maxTorque="1900"/>
-		</v2.10.2:TorqueLimits>
+		</v2.4:TorqueLimits>
 		<Components xsi:type="Components_Conventional_PrimaryBusType">
 			<Engine >
 				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
diff --git a/Generic Vehicles/Declaration Mode/Group P39_40/primary_heavyBus group P39_40_nonSmart_ESS.xml b/Generic Vehicles/Declaration Mode/Group P39_40/primary_heavyBus group P39_40_nonSmart_ESS.xml
index c675c51184..e476cae6d8 100644
--- a/Generic Vehicles/Declaration Mode/Group P39_40/primary_heavyBus group P39_40_nonSmart_ESS.xml	
+++ b/Generic Vehicles/Declaration Mode/Group P39_40/primary_heavyBus group P39_40_nonSmart_ESS.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD//VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD//VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart-ESS" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
 		<Manufacturer>Generic Bus Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -22,11 +22,11 @@
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>none</PredictiveCruiseControl>
 		</ADAS>
-		<v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+		<v2.4:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Entry gear="6" maxTorque="1800"/>
 			<Entry gear="1" maxTorque="2500"/>
 			<Entry gear="12" maxTorque="1900"/>
-		</v2.10.2:TorqueLimits>
+		</v2.4:TorqueLimits>
 		<Components xsi:type="Components_Conventional_PrimaryBusType">
 			<Engine>
 				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
diff --git a/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL.xml b/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL.xml
index ed5c7b724e..f165a47db1 100644
--- a/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL.xml	
+++ b/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL.xml	
@@ -6,9 +6,9 @@
 	xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 
 	xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 	xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
-	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
+	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
 	xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
-	xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/DEV/VectoInput.2.0.xsd">
+	xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
   <v2.0:Vehicle id="VEH-NA" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
     <Manufacturer>TU Graz, IVT</Manufacturer>
     <ManufacturerAddress>N/A</ManufacturerAddress>
@@ -39,7 +39,7 @@
     </v2.1:ADAS>
    <v2.1:Components xsi:type="v2.0:VehicleComponentsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Engine  xsi:type="EngineComponentDeclarationType">
-				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">
+				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
           <Manufacturer>TU Graz, IVT</Manufacturer>
           <Model>325kW 12.7l Engine</Model>
           <CertificationNumber>ENG-325kW 12.7l Engine</CertificationNumber>
diff --git a/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_DF-DM_WHR.xml b/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_DF-DM_WHR.xml
index 0a5eec813b..de2270f158 100644
--- a/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_DF-DM_WHR.xml	
+++ b/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_DF-DM_WHR.xml	
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/DEV/VectoInput.2.0.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-NA_DF-DA_WHR" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
 		<Manufacturer>TU Graz, IVT</Manufacturer>
 		<ManufacturerAddress>N/A</ManufacturerAddress>
@@ -30,7 +31,7 @@
 		</v2.1:ADAS>
 		<v2.1:Components xsi:type="v2.0:VehicleComponentsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Engine xsi:type="EngineComponentDeclarationType">
-				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">
+				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 					<Manufacturer>TU Graz, IVT</Manufacturer>
 					<Model>325kW 12.7l Engine</Model>
 					<CertificationNumber>ENG-325kW 12.7l Engine</CertificationNumber>
diff --git a/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_DF.xml b/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_DF.xml
index 92b2757414..f56ab2dbbe 100644
--- a/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_DF.xml	
+++ b/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_DF.xml	
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/DEV/VectoInput.2.0.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-NA_DF" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
 		<Manufacturer>TU Graz, IVT</Manufacturer>
 		<ManufacturerAddress>N/A</ManufacturerAddress>
@@ -30,7 +31,7 @@
 		</v2.1:ADAS>
 		<v2.1:Components xsi:type="v2.0:VehicleComponentsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Engine xsi:type="EngineComponentDeclarationType">
-				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">
+				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 					<Manufacturer>TU Graz, IVT</Manufacturer>
 					<Model>325kW 12.7l Engine</Model>
 					<CertificationNumber>ENG-325kW 12.7l Engine</CertificationNumber>
diff --git a/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_WHR.xml b/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_WHR.xml
index 2b44db193a..aea3118700 100644
--- a/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_WHR.xml	
+++ b/Generic Vehicles/Declaration Mode/Group5_Tractor_4x2/Class5_Tractor_DECL_WHR.xml	
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/DEV/VectoInput.2.0.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-NA_WHR" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
 		<Manufacturer>TU Graz, IVT</Manufacturer>
 		<ManufacturerAddress>N/A</ManufacturerAddress>
@@ -30,7 +31,7 @@
 		</v2.1:ADAS>
 		<v2.1:Components xsi:type="v2.0:VehicleComponentsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Engine xsi:type="EngineComponentDeclarationType">
-				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">
+				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 					<Manufacturer>TU Graz, IVT</Manufacturer>
 					<Model>325kW 12.7l Engine</Model>
 					<CertificationNumber>ENG-325kW 12.7l Engine</CertificationNumber>
diff --git a/Generic Vehicles/Declaration Mode/SingleBus_31b/primary_heavyBus group_P31_32_Smart_ES.xml b/Generic Vehicles/Declaration Mode/SingleBus_31b/primary_heavyBus group_P31_32_Smart_ES.xml
index 753033c119..cef2f8a024 100644
--- a/Generic Vehicles/Declaration Mode/SingleBus_31b/primary_heavyBus group_P31_32_Smart_ES.xml	
+++ b/Generic Vehicles/Declaration Mode/SingleBus_31b/primary_heavyBus group_P31_32_Smart_ES.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
 		<Manufacturer>Generic Bus Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -22,10 +22,10 @@
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>none</PredictiveCruiseControl>
 		</ADAS>
-		<v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+		<v2.4:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Entry gear="6" maxTorque="1800"/>
 			<Entry gear="1" maxTorque="2500"/>
-		</v2.10.2:TorqueLimits>
+		</v2.4:TorqueLimits>
 		<Components xsi:type="Components_Conventional_PrimaryBusType">
 			<Engine>
 				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
diff --git a/Generic Vehicles/Declaration Mode/SingleBus_31b/vecto_vehicle-completed_heavyBus_31b.xml b/Generic Vehicles/Declaration Mode/SingleBus_31b/vecto_vehicle-completed_heavyBus_31b.xml
index acf86d58e0..868332c985 100644
--- a/Generic Vehicles/Declaration Mode/SingleBus_31b/vecto_vehicle-completed_heavyBus_31b.xml	
+++ b/Generic Vehicles/Declaration Mode/SingleBus_31b/vecto_vehicle-completed_heavyBus_31b.xml	
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD//VectoDeclarationJob.xsd">
-	<v2.0:Vehicle id="VEH-1234567890" xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType">
+	<v2.0:Vehicle id="VEH-1234567890" xsi:type="v2.4:Vehicle_Conventional_CompletedBusDeclarationType">
 		<Manufacturer>Some Manufacturer</Manufacturer>
 		<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
 		<VIN>VEH-1234567890</VIN>
@@ -16,7 +16,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCor
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>10680</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem>
 			<NumberPassengerSeatsLowerDeck>86</NumberPassengerSeatsLowerDeck>
diff --git a/Generic Vehicles/Declaration Mode/SingleBus_34f/primary_heavyBus group_P33_34_SmartPS.xml b/Generic Vehicles/Declaration Mode/SingleBus_34f/primary_heavyBus group_P33_34_SmartPS.xml
index a02c324c0f..b4864d9409 100644
--- a/Generic Vehicles/Declaration Mode/SingleBus_34f/primary_heavyBus group_P33_34_SmartPS.xml	
+++ b/Generic Vehicles/Declaration Mode/SingleBus_34f/primary_heavyBus group_P33_34_SmartPS.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD//VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD//VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_SmartPS" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
 		<Manufacturer>Generic Bus Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -22,11 +22,11 @@
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>none</PredictiveCruiseControl>
 		</ADAS>
-		<v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+		<v2.4:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Entry gear="6" maxTorque="1800"/>
 			<Entry gear="1" maxTorque="2500"/>
 			<Entry gear="12" maxTorque="1900"/>
-		</v2.10.2:TorqueLimits>
+		</v2.4:TorqueLimits>
 		<Components xsi:type="Components_Conventional_PrimaryBusType">
 			<Engine>
 				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
diff --git a/Generic Vehicles/Declaration Mode/SingleBus_34f/vecto_vehicle-completed_heavyBus_34f.xml b/Generic Vehicles/Declaration Mode/SingleBus_34f/vecto_vehicle-completed_heavyBus_34f.xml
index a2abe53dfc..12d242b4ca 100644
--- a/Generic Vehicles/Declaration Mode/SingleBus_34f/vecto_vehicle-completed_heavyBus_34f.xml	
+++ b/Generic Vehicles/Declaration Mode/SingleBus_34f/vecto_vehicle-completed_heavyBus_34f.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
 		<Manufacturer>Some Manufacturer</Manufacturer>
 		<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
@@ -9,7 +9,7 @@
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>19400</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>false</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem>
 		<NumberPassengerSeatsLowerDeck>16</NumberPassengerSeatsLowerDeck>
diff --git a/Generic Vehicles/Declaration Mode/VTP HeavyBus/CompletedBus_33c.MRF.xml b/Generic Vehicles/Declaration Mode/VTP HeavyBus/CompletedBus_33c.MRF.xml
index 65d8725abb..e8e3b724b4 100644
--- a/Generic Vehicles/Declaration Mode/VTP HeavyBus/CompletedBus_33c.MRF.xml	
+++ b/Generic Vehicles/Declaration Mode/VTP HeavyBus/CompletedBus_33c.MRF.xml	
@@ -68,7 +68,7 @@
             <CertificationMethod>Standard values</CertificationMethod>
             <CdxA>6.30</CdxA>
           </AirDrag>
-          <mrf0.8:Auxiliaries xsi:type="AUX_Conventional_CompletedBusType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+          <mrf0.8:Auxiliaries xsi:type="AUX_Conventional_CompletedBusType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
             <ElectricSystem>
               <LEDLights>
 				  <Interiorlights>true</Interiorlights>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd
index 4dd2a0fac2..f29249611a 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:c2.0="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" xmlns:vdc="urn:tugraz:ivt:VectoAPI:DeclarationComponent" xmlns:vdd="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:ns1="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0" xmlns:ns2="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationComponent" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
+<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:c2.0="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" xmlns:vdc="urn:tugraz:ivt:VectoAPI:DeclarationComponent" xmlns:vdd="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:ns1="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0" xmlns:ns2="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationComponent" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
 	<!-- 
 
          This is a convienience file that imports the schema for declaration input (i.e., job data) and all supported declaration definitions
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd
index 431eab4c58..1b30fc41f0 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd
@@ -3512,7 +3512,7 @@
 					<xs:documentation>P041 - [kg]</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="AirdragModifiedMultistage" type="xs:boolean" minOccurs="0">
+			<xs:element name="AirdragModifiedMultistep" type="xs:boolean" minOccurs="0">
 				<xs:annotation>
 					<xs:documentation>P334 - bool</xs:documentation>
 					<xs:appinfo>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.8.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.8.xsd
index 4efc6e2bee..5760679f6e 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.8.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.8.xsd
@@ -1,11 +1,15 @@
 <?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.8" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:common="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.8">
+<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:common="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" 
+xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
+xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.8">
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/>
-	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" schemaLocation="VectoDeclarationDefinitions.2.10.2_JobInputData.xsd"/>
+	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaLocation="VectoDeclarationDefinitions.2.4.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" schemaLocation="VectoOutputDefinitions.xsd"/>
 	<xs:complexType name="AbstractComponentsType" abstract="true"/>
@@ -241,7 +245,7 @@
 			<xs:extension base="AbstractComponentsType">
 				<xs:sequence>
 					<xs:element name="AirDrag" type="AirdragType"/>
-					<xs:element name="Auxiliaries" type="v2.8:Abstract_AUX_Conventional_CompletedBusDeclarationType"/>
+					<xs:element name="Auxiliaries" type="v2.4:Abstract_AUX_Conventional_CompletedBusDeclarationType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -257,7 +261,7 @@
 					<xs:element name="Angledrive" type="AngledriveType" minOccurs="0"/>
 					<xs:element name="Axlegear" type="AxlegearType"/>
 					<xs:element name="AxleWheels" type="AxleWheelsType"/>
-					<xs:element name="Auxiliaries" type="v2.8:Abstract_AUX_Conventional_CompletedBusDeclarationType"/>
+					<xs:element name="Auxiliaries" type="v2.4:Abstract_AUX_Conventional_CompletedBusDeclarationType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -851,12 +855,12 @@
 							</xs:restriction>
 						</xs:simpleType>
 					</xs:element>
-					<xs:element name="ChassisConfiguration" type="v2.8:ChassisConfigurationPrimaryBusDeclarationType">
+					<xs:element name="ChassisConfiguration" type="v2.4:ChassisConfigurationPrimaryBusDeclarationType">
 						<xs:annotation>
 							<xs:documentation>P036 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="AxleConfiguration" type="v2.8:AxleConfigurationPrimaryBusLorryDeclarationType">
+					<xs:element name="AxleConfiguration" type="v2.4:AxleConfigurationPrimaryBusLorryDeclarationType">
 						<xs:annotation>
 							<xs:documentation>P037 - enum</xs:documentation>
 						</xs:annotation>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd
index df91be2e0d..8a3c15f674 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.4" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" xmlns:common="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"  xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" xmlns:common="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" schemaLocation="VectoOutputDefinitions.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/>
-	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3_DEV.xsd"/>
-	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" schemaLocation="VectoDeclarationDefinitions.2.10.2_JobInputData.xsd"/>
+	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3.xsd"/>
+	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaLocation="VectoDeclarationDefinitions.2.4.xsd"/>
 	<xs:element name="VectoOutputMultistep" type="vif:VectoOutputMultistageType">
 		<xs:annotation>
 			<xs:documentation>Comment describing your root element</xs:documentation>
@@ -131,7 +132,7 @@
 									</xs:annotation>
 									<xs:complexType>
 										<xs:simpleContent>
-											<xs:extension base="v2.10.2:AuxSPTechnologyPrimaryBusType">
+											<xs:extension base="v2.4:AuxSPTechnologyPrimaryBusType">
 												<xs:attribute name="axleNumber" use="required">
 													<xs:simpleType>
 														<xs:restriction base="xs:int">
@@ -156,7 +157,7 @@
 									</xs:annotation>
 									<xs:complexType>
 										<xs:simpleContent>
-											<xs:extension base="v2.10.2:AlternatorTechnologyType"/>
+											<xs:extension base="v2.4:AlternatorTechnologyType"/>
 										</xs:simpleContent>
 									</xs:complexType>
 								</xs:element>
@@ -254,7 +255,7 @@
 					<xs:element name="PneumaticSystem">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="SizeOfAirSupply" type="v2.10.2:PneumaticSystemTechnologyType"/>
+								<xs:element name="SizeOfAirSupply" type="v2.4:PneumaticSystemTechnologyType"/>
 								<xs:element name="CompressorDrive">
 									<xs:annotation>
 										<xs:documentation>P310 - enum</xs:documentation>
@@ -266,7 +267,7 @@
 										</xs:restriction>
 									</xs:simpleType>
 								</xs:element>
-								<xs:element name="Clutch" type="v2.10.2:PneumaticSystemClutchTypeType"/>
+								<xs:element name="Clutch" type="v2.4:PneumaticSystemClutchTypeType"/>
 								<xs:element name="CompressorRatio" type="v1.0:Double3"/>
 								<xs:element name="SmartCompressionSystem" type="xs:boolean"/>
 								<xs:element name="SmartRegenerationSystem" type="xs:boolean"/>
@@ -371,7 +372,7 @@
 			<xs:extension base="vif:AbstractManufacturingStageDataType">
 				<xs:sequence>
 					<xs:element name="HashPreviousStep" type="v1.0:SignatureType"/>
-					<xs:element name="Vehicle" type="v2.10.2:AbstractCompletedBusVehicleType"/>
+					<xs:element name="Vehicle" type="v2.4:AbstractCompletedBusVehicleType"/>
 					<xs:element name="ApplicationInformation" type="vif:ApplicationInformationPrimaryVehicleType"/>
 				</xs:sequence>
 			</xs:extension>
@@ -777,12 +778,12 @@
 							</xs:restriction>
 						</xs:simpleType>
 					</xs:element>
-					<xs:element name="ChassisConfiguration" type="v2.10.2:ChassisConfigurationPrimaryBusDeclarationType">
+					<xs:element name="ChassisConfiguration" type="v2.4:ChassisConfigurationPrimaryBusDeclarationType">
 						<xs:annotation>
 							<xs:documentation>P036 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="AxleConfiguration" type="v2.10.2:AxleConfigurationPrimaryBusLorryDeclarationType">
+					<xs:element name="AxleConfiguration" type="v2.4:AxleConfigurationPrimaryBusLorryDeclarationType">
 						<xs:annotation>
 							<xs:documentation>P037 - enum</xs:documentation>
 						</xs:annotation>
@@ -852,8 +853,8 @@
 							<xs:documentation>P251 - [-]</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="ChassisConfiguration" type="v2.10.2:ChassisConfigurationPrimaryBusDeclarationType"/>
-					<xs:element name="AxleConfiguration" type="v2.10.2:AxleConfigurationPrimaryBusLorryDeclarationType"/>
+					<xs:element name="ChassisConfiguration" type="v2.4:ChassisConfigurationPrimaryBusDeclarationType"/>
+					<xs:element name="AxleConfiguration" type="v2.4:AxleConfigurationPrimaryBusLorryDeclarationType"/>
 					<xs:element name="Articulated" type="xs:boolean"/>
 					<xs:element name="TechnicalPermissibleMaximumLadenMass" type="v1.0:VehicleGrossVehicleMassType"/>
 					<xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType"/>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll.xml
index e69ccd89dc..eb02d9921c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll.xml
@@ -1,2148 +1,2139 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0"
-	xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
-	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" 
-	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
-	xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
-	xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
-	<v2.0:Vehicle id="VEH-class9_AT_EcoRoll"  xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
-    <Manufacturer>TUG Generic</Manufacturer>
-    <ManufacturerAddress>N.A.</ManufacturerAddress>
-    <Model>N.A.</Model>
-    <VIN>N.A.</VIN>
-    <Date>2019-02-27T09:39:05.3188703Z</Date>
-    <LegislativeClass>N3</LegislativeClass>
-    <VehicleCategory>Rigid Lorry</VehicleCategory>
-    <AxleConfiguration>6x2</AxleConfiguration>
-    <CurbMassChassis>7750</CurbMassChassis>
-    <GrossVehicleMass>26000</GrossVehicleMass>
-    <IdlingSpeed>600</IdlingSpeed>
-    <RetarderType>None</RetarderType>
-    <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>
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+	<v2.0:Vehicle id="VEH-class9_AT_EcoRoll" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
+		<Manufacturer>TUG Generic</Manufacturer>
+		<ManufacturerAddress>N.A.</ManufacturerAddress>
+		<Model>N.A.</Model>
+		<VIN>N.A.</VIN>
+		<Date>2019-02-27T09:39:05.3188703Z</Date>
+		<LegislativeClass>N3</LegislativeClass>
+		<VehicleCategory>Rigid Lorry</VehicleCategory>
+		<AxleConfiguration>6x2</AxleConfiguration>
+		<CurbMassChassis>7750</CurbMassChassis>
+		<GrossVehicleMass>26000</GrossVehicleMass>
+		<IdlingSpeed>600</IdlingSpeed>
+		<RetarderType>None</RetarderType>
+		<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>
-		<v2.1:ADAS xsi:type="v2.3:AdvancedDriverAssistantSystemsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">
+		<ADAS xsi:type="AdvancedDriverAssistantSystemsType">
 			<EngineStopStart>false</EngineStopStart>
 			<EcoRollWithoutEngineStop>true</EcoRollWithoutEngineStop>
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>none</PredictiveCruiseControl>
-			<APTEcoRollReleaseLockupClutch>false</APTEcoRollReleaseLockupClutch>
-		</v2.1:ADAS>
-    <Components xsi:type="v2.0:VehicleComponentsType">
-      <Engine xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="EngineComponentDeclarationType">
-        <Data id="ENG-Generic220kW7.7lEngine" xsi:type="EngineDataDeclarationType">
-          <Manufacturer>TUG Generic</Manufacturer>
-          <Model>Generic 220kW 7.7l Engine</Model>
-          <CertificationNumber>ENG-Generic 220kW 7.7l Engine</CertificationNumber>
-          <Date>2019-02-27T09:39:05.3241256Z</Date>
-          <AppVersion>VectoCore</AppVersion>
-          <Displacement>7700</Displacement>
-          <IdlingSpeed>600</IdlingSpeed>
-          <RatedSpeed>2200</RatedSpeed>
-          <RatedPower>219774</RatedPower>
-          <MaxEngineTorque>1200</MaxEngineTorque>
-          <WHTCUrban>1.0300</WHTCUrban>
-          <WHTCRural>1.0100</WHTCRural>
-          <WHTCMotorway>1.0000</WHTCMotorway>
-          <BFColdHot>1.0000</BFColdHot>
-          <CFRegPer>1.0000</CFRegPer>
-          <CFNCV>1.0000</CFNCV>
-          <FuelType>Diesel CI</FuelType>
-          <FuelConsumptionMap>
-            <Entry engineSpeed="600.00" torque="-144.58" fuelConsumption="0.00" />
-            <Entry engineSpeed="600.00" torque="-44.58" fuelConsumption="0.00" />
-            <Entry engineSpeed="600.00" torque="0.00" fuelConsumption="638.00" />
-            <Entry engineSpeed="600.00" torque="70.00" fuelConsumption="1601.24" />
-            <Entry engineSpeed="600.00" torque="100.00" fuelConsumption="2020.04" />
-            <Entry engineSpeed="600.00" torque="200.00" fuelConsumption="3330.71" />
-            <Entry engineSpeed="600.00" torque="300.00" fuelConsumption="4651.64" />
-            <Entry engineSpeed="600.00" torque="400.00" fuelConsumption="5962.41" />
-            <Entry engineSpeed="600.00" torque="500.00" fuelConsumption="7979.12" />
-            <Entry engineSpeed="600.00" torque="600.00" fuelConsumption="10025.12" />
-            <Entry engineSpeed="800.00" torque="-154.66" fuelConsumption="0.00" />
-            <Entry engineSpeed="800.00" torque="-54.66" fuelConsumption="0.00" />
-            <Entry engineSpeed="800.00" torque="0.00" fuelConsumption="914.26" />
-            <Entry engineSpeed="800.00" torque="70.00" fuelConsumption="1862.24" />
-            <Entry engineSpeed="800.00" torque="100.00" fuelConsumption="2367.75" />
-            <Entry engineSpeed="800.00" torque="200.00" fuelConsumption="4006.79" />
-            <Entry engineSpeed="800.00" torque="300.00" fuelConsumption="5667.98" />
-            <Entry engineSpeed="800.00" torque="400.00" fuelConsumption="7335.35" />
-            <Entry engineSpeed="800.00" torque="500.00" fuelConsumption="9511.02" />
-            <Entry engineSpeed="800.00" torque="600.00" fuelConsumption="11650.65" />
-            <Entry engineSpeed="800.00" torque="700.00" fuelConsumption="13773.98" />
-            <Entry engineSpeed="800.00" torque="800.00" fuelConsumption="15797.43" />
-            <Entry engineSpeed="800.00" torque="836.00" fuelConsumption="16529.92" />
-            <Entry engineSpeed="1000.00" torque="-163.63" fuelConsumption="0.00" />
-            <Entry engineSpeed="1000.00" torque="-63.63" fuelConsumption="0.00" />
-            <Entry engineSpeed="1000.00" torque="0.00" fuelConsumption="1190.51" />
-            <Entry engineSpeed="1000.00" torque="70.00" fuelConsumption="2123.23" />
-            <Entry engineSpeed="1000.00" torque="100.00" fuelConsumption="2715.46" />
-            <Entry engineSpeed="1000.00" torque="200.00" fuelConsumption="4682.86" />
-            <Entry engineSpeed="1000.00" torque="300.00" fuelConsumption="6684.33" />
-            <Entry engineSpeed="1000.00" torque="400.00" fuelConsumption="8708.28" />
-            <Entry engineSpeed="1000.00" torque="500.00" fuelConsumption="11042.92" />
-            <Entry engineSpeed="1000.00" torque="600.00" fuelConsumption="13276.18" />
-            <Entry engineSpeed="1000.00" torque="700.00" fuelConsumption="15477.76" />
-            <Entry engineSpeed="1000.00" torque="800.00" fuelConsumption="17682.68" />
-            <Entry engineSpeed="1000.00" torque="900.00" fuelConsumption="19910.32" />
-            <Entry engineSpeed="1000.00" torque="1000.00" fuelConsumption="22137.47" />
-            <Entry engineSpeed="1000.00" torque="1070.00" fuelConsumption="23687.75" />
-            <Entry engineSpeed="1200.00" torque="-174.94" fuelConsumption="0.00" />
-            <Entry engineSpeed="1200.00" torque="-74.94" fuelConsumption="0.00" />
-            <Entry engineSpeed="1200.00" torque="0.00" fuelConsumption="1466.77" />
-            <Entry engineSpeed="1200.00" torque="70.00" fuelConsumption="2384.23" />
-            <Entry engineSpeed="1200.00" torque="100.00" fuelConsumption="3063.16" />
-            <Entry engineSpeed="1200.00" torque="200.00" fuelConsumption="5358.94" />
-            <Entry engineSpeed="1200.00" torque="300.00" fuelConsumption="7700.67" />
-            <Entry engineSpeed="1200.00" torque="400.00" fuelConsumption="10081.22" />
-            <Entry engineSpeed="1200.00" torque="500.00" fuelConsumption="12574.82" />
-            <Entry engineSpeed="1200.00" torque="600.00" fuelConsumption="14901.72" />
-            <Entry engineSpeed="1200.00" torque="700.00" fuelConsumption="17181.54" />
-            <Entry engineSpeed="1200.00" torque="800.00" fuelConsumption="19567.93" />
-            <Entry engineSpeed="1200.00" torque="900.00" fuelConsumption="21988.50" />
-            <Entry engineSpeed="1200.00" torque="1000.00" fuelConsumption="24410.55" />
-            <Entry engineSpeed="1200.00" torque="1100.00" fuelConsumption="26818.12" />
-            <Entry engineSpeed="1200.00" torque="1200.00" fuelConsumption="29600.85" />
-            <Entry engineSpeed="1400.00" torque="-186.25" fuelConsumption="0.00" />
-            <Entry engineSpeed="1400.00" torque="-86.25" fuelConsumption="0.00" />
-            <Entry engineSpeed="1400.00" torque="0.00" fuelConsumption="1943.23" />
-            <Entry engineSpeed="1400.00" torque="70.00" fuelConsumption="2867.47" />
-            <Entry engineSpeed="1400.00" torque="100.00" fuelConsumption="3660.90" />
-            <Entry engineSpeed="1400.00" torque="200.00" fuelConsumption="6305.67" />
-            <Entry engineSpeed="1400.00" torque="300.00" fuelConsumption="9033.23" />
-            <Entry engineSpeed="1400.00" torque="400.00" fuelConsumption="11786.02" />
-            <Entry engineSpeed="1400.00" torque="500.00" fuelConsumption="14469.48" />
-            <Entry engineSpeed="1400.00" torque="600.00" fuelConsumption="17183.33" />
-            <Entry engineSpeed="1400.00" torque="700.00" fuelConsumption="20019.01" />
-            <Entry engineSpeed="1400.00" torque="800.00" fuelConsumption="22833.01" />
-            <Entry engineSpeed="1400.00" torque="900.00" fuelConsumption="25503.81" />
-            <Entry engineSpeed="1400.00" torque="1000.00" fuelConsumption="28133.13" />
-            <Entry engineSpeed="1400.00" torque="1100.00" fuelConsumption="30822.69" />
-            <Entry engineSpeed="1400.00" torque="1200.00" fuelConsumption="33616.50" />
-            <Entry engineSpeed="1600.00" torque="-197.57" fuelConsumption="0.00" />
-            <Entry engineSpeed="1600.00" torque="-97.57" fuelConsumption="0.00" />
-            <Entry engineSpeed="1600.00" torque="0.00" fuelConsumption="2390.68" />
-            <Entry engineSpeed="1600.00" torque="70.00" fuelConsumption="3375.40" />
-            <Entry engineSpeed="1600.00" torque="100.00" fuelConsumption="4270.71" />
-            <Entry engineSpeed="1600.00" torque="200.00" fuelConsumption="7255.08" />
-            <Entry engineSpeed="1600.00" torque="300.00" fuelConsumption="10395.25" />
-            <Entry engineSpeed="1600.00" torque="400.00" fuelConsumption="13532.58" />
-            <Entry engineSpeed="1600.00" torque="500.00" fuelConsumption="16706.54" />
-            <Entry engineSpeed="1600.00" torque="600.00" fuelConsumption="19830.25" />
-            <Entry engineSpeed="1600.00" torque="700.00" fuelConsumption="22960.50" />
-            <Entry engineSpeed="1600.00" torque="800.00" fuelConsumption="26109.44" />
-            <Entry engineSpeed="1600.00" torque="900.00" fuelConsumption="29158.70" />
-            <Entry engineSpeed="1600.00" torque="1000.00" fuelConsumption="32050.23" />
-            <Entry engineSpeed="1600.00" torque="1100.00" fuelConsumption="35223.83" />
-            <Entry engineSpeed="1600.00" torque="1200.00" fuelConsumption="38415.23" />
-            <Entry engineSpeed="1800.00" torque="-204.41" fuelConsumption="0.00" />
-            <Entry engineSpeed="1800.00" torque="-104.41" fuelConsumption="0.00" />
-            <Entry engineSpeed="1800.00" torque="0.00" fuelConsumption="2890.46" />
-            <Entry engineSpeed="1800.00" torque="70.00" fuelConsumption="3985.03" />
-            <Entry engineSpeed="1800.00" torque="100.00" fuelConsumption="4965.43" />
-            <Entry engineSpeed="1800.00" torque="200.00" fuelConsumption="8233.42" />
-            <Entry engineSpeed="1800.00" torque="300.00" fuelConsumption="11783.43" />
-            <Entry engineSpeed="1800.00" torque="400.00" fuelConsumption="15307.09" />
-            <Entry engineSpeed="1800.00" torque="500.00" fuelConsumption="18849.16" />
-            <Entry engineSpeed="1800.00" torque="600.00" fuelConsumption="22267.47" />
-            <Entry engineSpeed="1800.00" torque="700.00" fuelConsumption="25749.16" />
-            <Entry engineSpeed="1800.00" torque="800.00" fuelConsumption="29389.56" />
-            <Entry engineSpeed="1800.00" torque="900.00" fuelConsumption="32951.65" />
-            <Entry engineSpeed="1800.00" torque="1000.00" fuelConsumption="36567.98" />
-            <Entry engineSpeed="1800.00" torque="1100.00" fuelConsumption="40354.88" />
-            <Entry engineSpeed="1800.00" torque="1124.00" fuelConsumption="41263.46" />
-            <Entry engineSpeed="2000.00" torque="-211.73" fuelConsumption="0.00" />
-            <Entry engineSpeed="2000.00" torque="-111.73" fuelConsumption="0.00" />
-            <Entry engineSpeed="2000.00" torque="0.00" fuelConsumption="3496.10" />
-            <Entry engineSpeed="2000.00" torque="70.00" fuelConsumption="4806.79" />
-            <Entry engineSpeed="2000.00" torque="100.00" fuelConsumption="5854.51" />
-            <Entry engineSpeed="2000.00" torque="200.00" fuelConsumption="9346.91" />
-            <Entry engineSpeed="2000.00" torque="300.00" fuelConsumption="13318.20" />
-            <Entry engineSpeed="2000.00" torque="400.00" fuelConsumption="17192.16" />
-            <Entry engineSpeed="2000.00" torque="500.00" fuelConsumption="21141.10" />
-            <Entry engineSpeed="2000.00" torque="600.00" fuelConsumption="25063.69" />
-            <Entry engineSpeed="2000.00" torque="700.00" fuelConsumption="28933.73" />
-            <Entry engineSpeed="2000.00" torque="800.00" fuelConsumption="33033.20" />
-            <Entry engineSpeed="2000.00" torque="900.00" fuelConsumption="37186.49" />
-            <Entry engineSpeed="2000.00" torque="1000.00" fuelConsumption="41216.66" />
-            <Entry engineSpeed="2000.00" torque="1038.00" fuelConsumption="42697.63" />
-            <Entry engineSpeed="2200.00" torque="-225.56" fuelConsumption="0.00" />
-            <Entry engineSpeed="2200.00" torque="-125.56" fuelConsumption="0.00" />
-            <Entry engineSpeed="2200.00" torque="0.00" fuelConsumption="4247.18" />
-            <Entry engineSpeed="2200.00" torque="70.00" fuelConsumption="5534.02" />
-            <Entry engineSpeed="2200.00" torque="100.00" fuelConsumption="6687.77" />
-            <Entry engineSpeed="2200.00" torque="200.00" fuelConsumption="10533.61" />
-            <Entry engineSpeed="2200.00" torque="300.00" fuelConsumption="14853.02" />
-            <Entry engineSpeed="2200.00" torque="400.00" fuelConsumption="19148.40" />
-            <Entry engineSpeed="2200.00" torque="500.00" fuelConsumption="23390.99" />
-            <Entry engineSpeed="2200.00" torque="600.00" fuelConsumption="27829.44" />
-            <Entry engineSpeed="2200.00" torque="700.00" fuelConsumption="32500.75" />
-            <Entry engineSpeed="2200.00" torque="800.00" fuelConsumption="37123.63" />
-            <Entry engineSpeed="2200.00" torque="900.00" fuelConsumption="41612.31" />
-            <Entry engineSpeed="2200.00" torque="955.00" fuelConsumption="44050.20" />
-            <Entry engineSpeed="2400.00" torque="-235.72" fuelConsumption="0.00" />
-            <Entry engineSpeed="2400.00" torque="-135.72" fuelConsumption="0.00" />
-            <Entry engineSpeed="2400.00" torque="0.00" fuelConsumption="4945.10" />
-            <Entry engineSpeed="2400.00" torque="70.00" fuelConsumption="6234.18" />
-            <Entry engineSpeed="2400.00" torque="100.00" fuelConsumption="7525.66" />
-            <Entry engineSpeed="2400.00" torque="200.00" fuelConsumption="11830.60" />
-            <Entry engineSpeed="2400.00" torque="300.00" fuelConsumption="16443.47" />
-            <Entry engineSpeed="2400.00" torque="400.00" fuelConsumption="21308.19" />
-            <Entry engineSpeed="2400.00" torque="500.00" fuelConsumption="26325.66" />
-            <Entry engineSpeed="2400.00" torque="600.00" fuelConsumption="31335.42" />
-            <Entry engineSpeed="2400.00" torque="700.00" fuelConsumption="36716.19" />
-            <Entry engineSpeed="2400.00" torque="800.00" fuelConsumption="42106.80" />
-            <Entry engineSpeed="2400.00" torque="815.00" fuelConsumption="42844.11" />
-            <Entry engineSpeed="2400.00" torque="915.00" fuelConsumption="42844.11" />
-            <Entry engineSpeed="2500.00" torque="-240.18" fuelConsumption="0.00" />
-            <Entry engineSpeed="2500.00" torque="-140.18" fuelConsumption="0.00" />
-            <Entry engineSpeed="2500.00" torque="0.00" fuelConsumption="5337.87" />
-            <Entry engineSpeed="2500.00" torque="70.00" fuelConsumption="6286.76" />
-            <Entry engineSpeed="2500.00" torque="100.00" fuelConsumption="7731.93" />
-            <Entry engineSpeed="2500.00" torque="200.00" fuelConsumption="12386.92" />
-            <Entry engineSpeed="2500.00" torque="300.00" fuelConsumption="17232.61" />
-            <Entry engineSpeed="2500.00" torque="400.00" fuelConsumption="22335.99" />
-            <Entry engineSpeed="2500.00" torque="500.00" fuelConsumption="27944.55" />
-            <Entry engineSpeed="2500.00" torque="600.00" fuelConsumption="33199.92" />
-            <Entry engineSpeed="2500.00" torque="710.00" fuelConsumption="39388.78" />
-            <Entry engineSpeed="2600.00" torque="-146.13" fuelConsumption="0.00" />
-            <Entry engineSpeed="2600.00" torque="0.00" fuelConsumption="5534.25" />
-          </FuelConsumptionMap>
-          <FullLoadAndDragCurve>
-            <Entry engineSpeed="600.00" maxTorque="600.00" dragTorque="-43.58" />
-            <Entry engineSpeed="800.00" maxTorque="836.00" dragTorque="-53.66" />
-            <Entry engineSpeed="1000.00" maxTorque="1069.52" dragTorque="-62.03" />
-            <Entry engineSpeed="1200.00" maxTorque="1200.00" dragTorque="-73.94" />
-            <Entry engineSpeed="1400.00" maxTorque="1200.00" dragTorque="-85.25" />
-            <Entry engineSpeed="1600.00" maxTorque="1200.00" dragTorque="-96.57" />
-            <Entry engineSpeed="1800.00" maxTorque="1123.62" dragTorque="-103.41" />
-            <Entry engineSpeed="2000.00" maxTorque="1037.52" dragTorque="-110.73" />
-            <Entry engineSpeed="2200.00" maxTorque="953.95" dragTorque="-124.56" />
-            <Entry engineSpeed="2400.00" maxTorque="815.35" dragTorque="-134.72" />
-            <Entry engineSpeed="2500.00" maxTorque="711.29" dragTorque="-139.18" />
-            <Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-145.13" />
-          </FullLoadAndDragCurve>
-        </Data>
-        <Signature>
-          <Reference URI="#ENG-Generic220kW7.7lEngine" 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></DigestValue>
-          </Reference>
-        </Signature>
-      </Engine>
-      <Gearbox xsi:type="GearboxComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
-        <Data id="GBX-APT-SGenericTqMax1200" xsi:type="v2.0:GearboxDataDeclarationType">
-          <Manufacturer>TUG Generic</Manufacturer>
-          <Model>APT-S Generic TqMax1200</Model>
-          <CertificationNumber>GBX-APT-S Generic TqMax1200</CertificationNumber>
-          <Date>2019-02-27T09:39:05.3400867Z</Date>
-          <AppVersion>VectoCore</AppVersion>
-          <TransmissionType>APT-S</TransmissionType>
-          <MainCertificationMethod>Standard values</MainCertificationMethod>
-          <Gears xsi:type="GearsDeclarationType">
-            <Gear number="1">
-              <Ratio>3.490</Ratio>
-              <TorqueLossMap>
-                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="48.00" />
-                <Entry inputSpeed="0.00" inputTorque="200.00" torqueLoss="56.00" />
-                <Entry inputSpeed="0.00" inputTorque="400.00" torqueLoss="64.00" />
-                <Entry inputSpeed="0.00" inputTorque="600.00" torqueLoss="72.00" />
-                <Entry inputSpeed="0.00" inputTorque="900.00" torqueLoss="84.00" />
-                <Entry inputSpeed="0.00" inputTorque="1200.00" torqueLoss="96.00" />
-                <Entry inputSpeed="0.00" inputTorque="1600.00" torqueLoss="112.00" />
-                <Entry inputSpeed="0.00" inputTorque="2000.00" torqueLoss="128.00" />
-                <Entry inputSpeed="0.00" inputTorque="2500.00" torqueLoss="148.00" />
-                <Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00" />
-                <Entry inputSpeed="600.00" inputTorque="200.00" torqueLoss="56.00" />
-                <Entry inputSpeed="600.00" inputTorque="400.00" torqueLoss="64.00" />
-                <Entry inputSpeed="600.00" inputTorque="600.00" torqueLoss="72.00" />
-                <Entry inputSpeed="600.00" inputTorque="900.00" torqueLoss="84.00" />
-                <Entry inputSpeed="600.00" inputTorque="1200.00" torqueLoss="96.00" />
-                <Entry inputSpeed="600.00" inputTorque="1600.00" torqueLoss="112.00" />
-                <Entry inputSpeed="600.00" inputTorque="2000.00" torqueLoss="128.00" />
-                <Entry inputSpeed="600.00" inputTorque="2500.00" torqueLoss="148.00" />
-                <Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00" />
-                <Entry inputSpeed="900.00" inputTorque="200.00" torqueLoss="65.00" />
-                <Entry inputSpeed="900.00" inputTorque="400.00" torqueLoss="73.00" />
-                <Entry inputSpeed="900.00" inputTorque="600.00" torqueLoss="81.00" />
-                <Entry inputSpeed="900.00" inputTorque="900.00" torqueLoss="93.00" />
-                <Entry inputSpeed="900.00" inputTorque="1200.00" torqueLoss="105.00" />
-                <Entry inputSpeed="900.00" inputTorque="1600.00" torqueLoss="121.00" />
-                <Entry inputSpeed="900.00" inputTorque="2000.00" torqueLoss="137.00" />
-                <Entry inputSpeed="900.00" inputTorque="2500.00" torqueLoss="157.00" />
-                <Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00" />
-                <Entry inputSpeed="1200.00" inputTorque="200.00" torqueLoss="74.00" />
-                <Entry inputSpeed="1200.00" inputTorque="400.00" torqueLoss="82.00" />
-                <Entry inputSpeed="1200.00" inputTorque="600.00" torqueLoss="90.00" />
-                <Entry inputSpeed="1200.00" inputTorque="900.00" torqueLoss="102.00" />
-                <Entry inputSpeed="1200.00" inputTorque="1200.00" torqueLoss="114.00" />
-                <Entry inputSpeed="1200.00" inputTorque="1600.00" torqueLoss="130.00" />
-                <Entry inputSpeed="1200.00" inputTorque="2000.00" torqueLoss="146.00" />
-                <Entry inputSpeed="1200.00" inputTorque="2500.00" torqueLoss="166.00" />
-                <Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00" />
-                <Entry inputSpeed="1600.00" inputTorque="200.00" torqueLoss="86.00" />
-                <Entry inputSpeed="1600.00" inputTorque="400.00" torqueLoss="94.00" />
-                <Entry inputSpeed="1600.00" inputTorque="600.00" torqueLoss="102.00" />
-                <Entry inputSpeed="1600.00" inputTorque="900.00" torqueLoss="114.00" />
-                <Entry inputSpeed="1600.00" inputTorque="1200.00" torqueLoss="126.00" />
-                <Entry inputSpeed="1600.00" inputTorque="1600.00" torqueLoss="142.00" />
-                <Entry inputSpeed="1600.00" inputTorque="2000.00" torqueLoss="158.00" />
-                <Entry inputSpeed="1600.00" inputTorque="2500.00" torqueLoss="178.00" />
-                <Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00" />
-                <Entry inputSpeed="2000.00" inputTorque="200.00" torqueLoss="98.00" />
-                <Entry inputSpeed="2000.00" inputTorque="400.00" torqueLoss="106.00" />
-                <Entry inputSpeed="2000.00" inputTorque="600.00" torqueLoss="114.00" />
-                <Entry inputSpeed="2000.00" inputTorque="900.00" torqueLoss="126.00" />
-                <Entry inputSpeed="2000.00" inputTorque="1200.00" torqueLoss="138.00" />
-                <Entry inputSpeed="2000.00" inputTorque="1600.00" torqueLoss="154.00" />
-                <Entry inputSpeed="2000.00" inputTorque="2000.00" torqueLoss="170.00" />
-                <Entry inputSpeed="2000.00" inputTorque="2500.00" torqueLoss="190.00" />
-                <Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00" />
-                <Entry inputSpeed="2500.00" inputTorque="200.00" torqueLoss="113.00" />
-                <Entry inputSpeed="2500.00" inputTorque="400.00" torqueLoss="121.00" />
-                <Entry inputSpeed="2500.00" inputTorque="600.00" torqueLoss="129.00" />
-                <Entry inputSpeed="2500.00" inputTorque="900.00" torqueLoss="141.00" />
-                <Entry inputSpeed="2500.00" inputTorque="1200.00" torqueLoss="153.00" />
-                <Entry inputSpeed="2500.00" inputTorque="1600.00" torqueLoss="169.00" />
-                <Entry inputSpeed="2500.00" inputTorque="2000.00" torqueLoss="185.00" />
-                <Entry inputSpeed="2500.00" inputTorque="2500.00" torqueLoss="205.00" />
-                <Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00" />
-                <Entry inputSpeed="3000.00" inputTorque="200.00" torqueLoss="128.00" />
-                <Entry inputSpeed="3000.00" inputTorque="400.00" torqueLoss="136.00" />
-                <Entry inputSpeed="3000.00" inputTorque="600.00" torqueLoss="144.00" />
-                <Entry inputSpeed="3000.00" inputTorque="900.00" torqueLoss="156.00" />
-                <Entry inputSpeed="3000.00" inputTorque="1200.00" torqueLoss="168.00" />
-                <Entry inputSpeed="3000.00" inputTorque="1600.00" torqueLoss="184.00" />
-                <Entry inputSpeed="3000.00" inputTorque="2000.00" torqueLoss="200.00" />
-                <Entry inputSpeed="3000.00" inputTorque="2500.00" torqueLoss="220.00" />
-                <Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00" />
-                <Entry inputSpeed="600.00" inputTorque="-200.00" torqueLoss="56.00" />
-                <Entry inputSpeed="600.00" inputTorque="-400.00" torqueLoss="64.00" />
-                <Entry inputSpeed="600.00" inputTorque="-600.00" torqueLoss="72.00" />
-                <Entry inputSpeed="600.00" inputTorque="-900.00" torqueLoss="84.00" />
-                <Entry inputSpeed="600.00" inputTorque="-1200.00" torqueLoss="96.00" />
-                <Entry inputSpeed="600.00" inputTorque="-1600.00" torqueLoss="112.00" />
-                <Entry inputSpeed="600.00" inputTorque="-2000.00" torqueLoss="128.00" />
-                <Entry inputSpeed="600.00" inputTorque="-2500.00" torqueLoss="148.00" />
-                <Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00" />
-                <Entry inputSpeed="900.00" inputTorque="-200.00" torqueLoss="65.00" />
-                <Entry inputSpeed="900.00" inputTorque="-400.00" torqueLoss="73.00" />
-                <Entry inputSpeed="900.00" inputTorque="-600.00" torqueLoss="81.00" />
-                <Entry inputSpeed="900.00" inputTorque="-900.00" torqueLoss="93.00" />
-                <Entry inputSpeed="900.00" inputTorque="-1200.00" torqueLoss="105.00" />
-                <Entry inputSpeed="900.00" inputTorque="-1600.00" torqueLoss="121.00" />
-                <Entry inputSpeed="900.00" inputTorque="-2000.00" torqueLoss="137.00" />
-                <Entry inputSpeed="900.00" inputTorque="-2500.00" torqueLoss="157.00" />
-                <Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-200.00" torqueLoss="74.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-400.00" torqueLoss="82.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-600.00" torqueLoss="90.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-900.00" torqueLoss="102.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-1200.00" torqueLoss="114.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-1600.00" torqueLoss="130.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-2000.00" torqueLoss="146.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-2500.00" torqueLoss="166.00" />
-                <Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-200.00" torqueLoss="86.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-400.00" torqueLoss="94.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-600.00" torqueLoss="102.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-900.00" torqueLoss="114.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-1200.00" torqueLoss="126.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-1600.00" torqueLoss="142.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-2000.00" torqueLoss="158.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-2500.00" torqueLoss="178.00" />
-                <Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-200.00" torqueLoss="98.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-400.00" torqueLoss="106.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-600.00" torqueLoss="114.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-900.00" torqueLoss="126.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-1200.00" torqueLoss="138.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-1600.00" torqueLoss="154.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-2000.00" torqueLoss="170.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-2500.00" torqueLoss="190.00" />
-                <Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-200.00" torqueLoss="113.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-400.00" torqueLoss="121.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-600.00" torqueLoss="129.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-900.00" torqueLoss="141.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-1200.00" torqueLoss="153.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-1600.00" torqueLoss="169.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-2000.00" torqueLoss="185.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-2500.00" torqueLoss="205.00" />
-                <Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-200.00" torqueLoss="128.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-400.00" torqueLoss="136.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-600.00" torqueLoss="144.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-900.00" torqueLoss="156.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-1200.00" torqueLoss="168.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-1600.00" torqueLoss="184.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-2000.00" torqueLoss="200.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-2500.00" torqueLoss="220.00" />
-                <Entry inputSpeed="1300.00" inputTorque="2610.00" torqueLoss="66.00" />
-                <Entry inputSpeed="1300.00" inputTorque="2842.00" torqueLoss="71.00" />
-                <Entry inputSpeed="1500.00" inputTorque="-812.00" torqueLoss="46.00" />
-                <Entry inputSpeed="1500.00" inputTorque="-348.00" torqueLoss="37.00" />
-                <Entry inputSpeed="1500.00" inputTorque="0.00" torqueLoss="13.00" />
-                <Entry inputSpeed="1500.00" inputTorque="58.00" torqueLoss="16.00" />
-                <Entry inputSpeed="1500.00" inputTorque="290.00" torqueLoss="21.00" />
-                <Entry inputSpeed="1500.00" inputTorque="522.00" torqueLoss="26.00" />
-                <Entry inputSpeed="1500.00" inputTorque="754.00" torqueLoss="30.00" />
-                <Entry inputSpeed="1500.00" inputTorque="986.00" torqueLoss="35.00" />
-                <Entry inputSpeed="1500.00" inputTorque="1218.00" torqueLoss="39.00" />
-                <Entry inputSpeed="1500.00" inputTorque="1450.00" torqueLoss="44.00" />
-                <Entry inputSpeed="1500.00" inputTorque="1682.00" torqueLoss="49.00" />
-                <Entry inputSpeed="1500.00" inputTorque="1914.00" torqueLoss="53.00" />
-                <Entry inputSpeed="1500.00" inputTorque="2146.00" torqueLoss="58.00" />
-                <Entry inputSpeed="1500.00" inputTorque="2378.00" torqueLoss="63.00" />
-                <Entry inputSpeed="1500.00" inputTorque="2610.00" torqueLoss="67.00" />
-                <Entry inputSpeed="1500.00" inputTorque="2842.00" torqueLoss="72.00" />
-                <Entry inputSpeed="1700.00" inputTorque="-812.00" torqueLoss="49.00" />
-                <Entry inputSpeed="1700.00" inputTorque="-348.00" torqueLoss="39.00" />
-                <Entry inputSpeed="1700.00" inputTorque="0.00" torqueLoss="14.00" />
-                <Entry inputSpeed="1700.00" inputTorque="58.00" torqueLoss="17.00" />
-                <Entry inputSpeed="1700.00" inputTorque="290.00" torqueLoss="22.00" />
-                <Entry inputSpeed="1700.00" inputTorque="522.00" torqueLoss="27.00" />
-                <Entry inputSpeed="1700.00" inputTorque="754.00" torqueLoss="31.00" />
-                <Entry inputSpeed="1700.00" inputTorque="986.00" torqueLoss="36.00" />
-                <Entry inputSpeed="1700.00" inputTorque="1218.00" torqueLoss="41.00" />
-                <Entry inputSpeed="1700.00" inputTorque="1450.00" torqueLoss="45.00" />
-                <Entry inputSpeed="1700.00" inputTorque="1682.00" torqueLoss="50.00" />
-                <Entry inputSpeed="1700.00" inputTorque="1914.00" torqueLoss="55.00" />
-                <Entry inputSpeed="1700.00" inputTorque="2146.00" torqueLoss="59.00" />
-                <Entry inputSpeed="1700.00" inputTorque="2378.00" torqueLoss="64.00" />
-                <Entry inputSpeed="1700.00" inputTorque="2610.00" torqueLoss="68.00" />
-                <Entry inputSpeed="1700.00" inputTorque="2842.00" torqueLoss="73.00" />
-                <Entry inputSpeed="1900.00" inputTorque="-812.00" torqueLoss="51.00" />
-                <Entry inputSpeed="1900.00" inputTorque="-348.00" torqueLoss="42.00" />
-                <Entry inputSpeed="1900.00" inputTorque="0.00" torqueLoss="15.00" />
-                <Entry inputSpeed="1900.00" inputTorque="58.00" torqueLoss="19.00" />
-                <Entry inputSpeed="1900.00" inputTorque="290.00" torqueLoss="23.00" />
-                <Entry inputSpeed="1900.00" inputTorque="522.00" torqueLoss="28.00" />
-                <Entry inputSpeed="1900.00" inputTorque="754.00" torqueLoss="32.00" />
-                <Entry inputSpeed="1900.00" inputTorque="986.00" torqueLoss="37.00" />
-                <Entry inputSpeed="1900.00" inputTorque="1218.00" torqueLoss="42.00" />
-                <Entry inputSpeed="1900.00" inputTorque="1450.00" torqueLoss="46.00" />
-                <Entry inputSpeed="1900.00" inputTorque="1682.00" torqueLoss="51.00" />
-                <Entry inputSpeed="1900.00" inputTorque="1914.00" torqueLoss="56.00" />
-                <Entry inputSpeed="1900.00" inputTorque="2146.00" torqueLoss="60.00" />
-                <Entry inputSpeed="1900.00" inputTorque="2378.00" torqueLoss="65.00" />
-                <Entry inputSpeed="1900.00" inputTorque="2610.00" torqueLoss="70.00" />
-                <Entry inputSpeed="1900.00" inputTorque="2842.00" torqueLoss="74.00" />
-                <Entry inputSpeed="2100.00" inputTorque="-812.00" torqueLoss="53.00" />
-                <Entry inputSpeed="2100.00" inputTorque="-348.00" torqueLoss="44.00" />
-                <Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="16.00" />
-                <Entry inputSpeed="2100.00" inputTorque="58.00" torqueLoss="20.00" />
-                <Entry inputSpeed="2100.00" inputTorque="290.00" torqueLoss="24.00" />
-                <Entry inputSpeed="2100.00" inputTorque="522.00" torqueLoss="29.00" />
-                <Entry inputSpeed="2100.00" inputTorque="754.00" torqueLoss="34.00" />
-                <Entry inputSpeed="2100.00" inputTorque="986.00" torqueLoss="38.00" />
-                <Entry inputSpeed="2100.00" inputTorque="1218.00" torqueLoss="43.00" />
-                <Entry inputSpeed="2100.00" inputTorque="1450.00" torqueLoss="48.00" />
-                <Entry inputSpeed="2100.00" inputTorque="1682.00" torqueLoss="52.00" />
-                <Entry inputSpeed="2100.00" inputTorque="1914.00" torqueLoss="57.00" />
-                <Entry inputSpeed="2100.00" inputTorque="2146.00" torqueLoss="61.00" />
-                <Entry inputSpeed="2100.00" inputTorque="2378.00" torqueLoss="66.00" />
-                <Entry inputSpeed="2100.00" inputTorque="2610.00" torqueLoss="71.00" />
-                <Entry inputSpeed="2100.00" inputTorque="2842.00" torqueLoss="75.00" />
-              </TorqueLossMap>
-            </Gear>
-            <Gear number="2">
-              <Ratio>1.860</Ratio>
-              <TorqueLossMap>
-                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="48.00" />
-                <Entry inputSpeed="0.00" inputTorque="200.00" torqueLoss="56.00" />
-                <Entry inputSpeed="0.00" inputTorque="400.00" torqueLoss="64.00" />
-                <Entry inputSpeed="0.00" inputTorque="600.00" torqueLoss="72.00" />
-                <Entry inputSpeed="0.00" inputTorque="900.00" torqueLoss="84.00" />
-                <Entry inputSpeed="0.00" inputTorque="1200.00" torqueLoss="96.00" />
-                <Entry inputSpeed="0.00" inputTorque="1600.00" torqueLoss="112.00" />
-                <Entry inputSpeed="0.00" inputTorque="2000.00" torqueLoss="128.00" />
-                <Entry inputSpeed="0.00" inputTorque="2500.00" torqueLoss="148.00" />
-                <Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00" />
-                <Entry inputSpeed="600.00" inputTorque="200.00" torqueLoss="56.00" />
-                <Entry inputSpeed="600.00" inputTorque="400.00" torqueLoss="64.00" />
-                <Entry inputSpeed="600.00" inputTorque="600.00" torqueLoss="72.00" />
-                <Entry inputSpeed="600.00" inputTorque="900.00" torqueLoss="84.00" />
-                <Entry inputSpeed="600.00" inputTorque="1200.00" torqueLoss="96.00" />
-                <Entry inputSpeed="600.00" inputTorque="1600.00" torqueLoss="112.00" />
-                <Entry inputSpeed="600.00" inputTorque="2000.00" torqueLoss="128.00" />
-                <Entry inputSpeed="600.00" inputTorque="2500.00" torqueLoss="148.00" />
-                <Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00" />
-                <Entry inputSpeed="900.00" inputTorque="200.00" torqueLoss="65.00" />
-                <Entry inputSpeed="900.00" inputTorque="400.00" torqueLoss="73.00" />
-                <Entry inputSpeed="900.00" inputTorque="600.00" torqueLoss="81.00" />
-                <Entry inputSpeed="900.00" inputTorque="900.00" torqueLoss="93.00" />
-                <Entry inputSpeed="900.00" inputTorque="1200.00" torqueLoss="105.00" />
-                <Entry inputSpeed="900.00" inputTorque="1600.00" torqueLoss="121.00" />
-                <Entry inputSpeed="900.00" inputTorque="2000.00" torqueLoss="137.00" />
-                <Entry inputSpeed="900.00" inputTorque="2500.00" torqueLoss="157.00" />
-                <Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00" />
-                <Entry inputSpeed="1200.00" inputTorque="200.00" torqueLoss="74.00" />
-                <Entry inputSpeed="1200.00" inputTorque="400.00" torqueLoss="82.00" />
-                <Entry inputSpeed="1200.00" inputTorque="600.00" torqueLoss="90.00" />
-                <Entry inputSpeed="1200.00" inputTorque="900.00" torqueLoss="102.00" />
-                <Entry inputSpeed="1200.00" inputTorque="1200.00" torqueLoss="114.00" />
-                <Entry inputSpeed="1200.00" inputTorque="1600.00" torqueLoss="130.00" />
-                <Entry inputSpeed="1200.00" inputTorque="2000.00" torqueLoss="146.00" />
-                <Entry inputSpeed="1200.00" inputTorque="2500.00" torqueLoss="166.00" />
-                <Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00" />
-                <Entry inputSpeed="1600.00" inputTorque="200.00" torqueLoss="86.00" />
-                <Entry inputSpeed="1600.00" inputTorque="400.00" torqueLoss="94.00" />
-                <Entry inputSpeed="1600.00" inputTorque="600.00" torqueLoss="102.00" />
-                <Entry inputSpeed="1600.00" inputTorque="900.00" torqueLoss="114.00" />
-                <Entry inputSpeed="1600.00" inputTorque="1200.00" torqueLoss="126.00" />
-                <Entry inputSpeed="1600.00" inputTorque="1600.00" torqueLoss="142.00" />
-                <Entry inputSpeed="1600.00" inputTorque="2000.00" torqueLoss="158.00" />
-                <Entry inputSpeed="1600.00" inputTorque="2500.00" torqueLoss="178.00" />
-                <Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00" />
-                <Entry inputSpeed="2000.00" inputTorque="200.00" torqueLoss="98.00" />
-                <Entry inputSpeed="2000.00" inputTorque="400.00" torqueLoss="106.00" />
-                <Entry inputSpeed="2000.00" inputTorque="600.00" torqueLoss="114.00" />
-                <Entry inputSpeed="2000.00" inputTorque="900.00" torqueLoss="126.00" />
-                <Entry inputSpeed="2000.00" inputTorque="1200.00" torqueLoss="138.00" />
-                <Entry inputSpeed="2000.00" inputTorque="1600.00" torqueLoss="154.00" />
-                <Entry inputSpeed="2000.00" inputTorque="2000.00" torqueLoss="170.00" />
-                <Entry inputSpeed="2000.00" inputTorque="2500.00" torqueLoss="190.00" />
-                <Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00" />
-                <Entry inputSpeed="2500.00" inputTorque="200.00" torqueLoss="113.00" />
-                <Entry inputSpeed="2500.00" inputTorque="400.00" torqueLoss="121.00" />
-                <Entry inputSpeed="2500.00" inputTorque="600.00" torqueLoss="129.00" />
-                <Entry inputSpeed="2500.00" inputTorque="900.00" torqueLoss="141.00" />
-                <Entry inputSpeed="2500.00" inputTorque="1200.00" torqueLoss="153.00" />
-                <Entry inputSpeed="2500.00" inputTorque="1600.00" torqueLoss="169.00" />
-                <Entry inputSpeed="2500.00" inputTorque="2000.00" torqueLoss="185.00" />
-                <Entry inputSpeed="2500.00" inputTorque="2500.00" torqueLoss="205.00" />
-                <Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00" />
-                <Entry inputSpeed="3000.00" inputTorque="200.00" torqueLoss="128.00" />
-                <Entry inputSpeed="3000.00" inputTorque="400.00" torqueLoss="136.00" />
-                <Entry inputSpeed="3000.00" inputTorque="600.00" torqueLoss="144.00" />
-                <Entry inputSpeed="3000.00" inputTorque="900.00" torqueLoss="156.00" />
-                <Entry inputSpeed="3000.00" inputTorque="1200.00" torqueLoss="168.00" />
-                <Entry inputSpeed="3000.00" inputTorque="1600.00" torqueLoss="184.00" />
-                <Entry inputSpeed="3000.00" inputTorque="2000.00" torqueLoss="200.00" />
-                <Entry inputSpeed="3000.00" inputTorque="2500.00" torqueLoss="220.00" />
-                <Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00" />
-                <Entry inputSpeed="600.00" inputTorque="-200.00" torqueLoss="56.00" />
-                <Entry inputSpeed="600.00" inputTorque="-400.00" torqueLoss="64.00" />
-                <Entry inputSpeed="600.00" inputTorque="-600.00" torqueLoss="72.00" />
-                <Entry inputSpeed="600.00" inputTorque="-900.00" torqueLoss="84.00" />
-                <Entry inputSpeed="600.00" inputTorque="-1200.00" torqueLoss="96.00" />
-                <Entry inputSpeed="600.00" inputTorque="-1600.00" torqueLoss="112.00" />
-                <Entry inputSpeed="600.00" inputTorque="-2000.00" torqueLoss="128.00" />
-                <Entry inputSpeed="600.00" inputTorque="-2500.00" torqueLoss="148.00" />
-                <Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00" />
-                <Entry inputSpeed="900.00" inputTorque="-200.00" torqueLoss="65.00" />
-                <Entry inputSpeed="900.00" inputTorque="-400.00" torqueLoss="73.00" />
-                <Entry inputSpeed="900.00" inputTorque="-600.00" torqueLoss="81.00" />
-                <Entry inputSpeed="900.00" inputTorque="-900.00" torqueLoss="93.00" />
-                <Entry inputSpeed="900.00" inputTorque="-1200.00" torqueLoss="105.00" />
-                <Entry inputSpeed="900.00" inputTorque="-1600.00" torqueLoss="121.00" />
-                <Entry inputSpeed="900.00" inputTorque="-2000.00" torqueLoss="137.00" />
-                <Entry inputSpeed="900.00" inputTorque="-2500.00" torqueLoss="157.00" />
-                <Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-200.00" torqueLoss="74.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-400.00" torqueLoss="82.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-600.00" torqueLoss="90.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-900.00" torqueLoss="102.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-1200.00" torqueLoss="114.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-1600.00" torqueLoss="130.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-2000.00" torqueLoss="146.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-2500.00" torqueLoss="166.00" />
-                <Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-200.00" torqueLoss="86.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-400.00" torqueLoss="94.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-600.00" torqueLoss="102.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-900.00" torqueLoss="114.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-1200.00" torqueLoss="126.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-1600.00" torqueLoss="142.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-2000.00" torqueLoss="158.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-2500.00" torqueLoss="178.00" />
-                <Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-200.00" torqueLoss="98.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-400.00" torqueLoss="106.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-600.00" torqueLoss="114.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-900.00" torqueLoss="126.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-1200.00" torqueLoss="138.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-1600.00" torqueLoss="154.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-2000.00" torqueLoss="170.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-2500.00" torqueLoss="190.00" />
-                <Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-200.00" torqueLoss="113.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-400.00" torqueLoss="121.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-600.00" torqueLoss="129.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-900.00" torqueLoss="141.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-1200.00" torqueLoss="153.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-1600.00" torqueLoss="169.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-2000.00" torqueLoss="185.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-2500.00" torqueLoss="205.00" />
-                <Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-200.00" torqueLoss="128.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-400.00" torqueLoss="136.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-600.00" torqueLoss="144.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-900.00" torqueLoss="156.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-1200.00" torqueLoss="168.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-1600.00" torqueLoss="184.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-2000.00" torqueLoss="200.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-2500.00" torqueLoss="220.00" />
-              </TorqueLossMap>
-            </Gear>
-            <Gear number="3">
-              <Ratio>1.410</Ratio>
-              <TorqueLossMap>
-                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="48.00" />
-                <Entry inputSpeed="0.00" inputTorque="200.00" torqueLoss="56.00" />
-                <Entry inputSpeed="0.00" inputTorque="400.00" torqueLoss="64.00" />
-                <Entry inputSpeed="0.00" inputTorque="600.00" torqueLoss="72.00" />
-                <Entry inputSpeed="0.00" inputTorque="900.00" torqueLoss="84.00" />
-                <Entry inputSpeed="0.00" inputTorque="1200.00" torqueLoss="96.00" />
-                <Entry inputSpeed="0.00" inputTorque="1600.00" torqueLoss="112.00" />
-                <Entry inputSpeed="0.00" inputTorque="2000.00" torqueLoss="128.00" />
-                <Entry inputSpeed="0.00" inputTorque="2500.00" torqueLoss="148.00" />
-                <Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00" />
-                <Entry inputSpeed="600.00" inputTorque="200.00" torqueLoss="56.00" />
-                <Entry inputSpeed="600.00" inputTorque="400.00" torqueLoss="64.00" />
-                <Entry inputSpeed="600.00" inputTorque="600.00" torqueLoss="72.00" />
-                <Entry inputSpeed="600.00" inputTorque="900.00" torqueLoss="84.00" />
-                <Entry inputSpeed="600.00" inputTorque="1200.00" torqueLoss="96.00" />
-                <Entry inputSpeed="600.00" inputTorque="1600.00" torqueLoss="112.00" />
-                <Entry inputSpeed="600.00" inputTorque="2000.00" torqueLoss="128.00" />
-                <Entry inputSpeed="600.00" inputTorque="2500.00" torqueLoss="148.00" />
-                <Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00" />
-                <Entry inputSpeed="900.00" inputTorque="200.00" torqueLoss="65.00" />
-                <Entry inputSpeed="900.00" inputTorque="400.00" torqueLoss="73.00" />
-                <Entry inputSpeed="900.00" inputTorque="600.00" torqueLoss="81.00" />
-                <Entry inputSpeed="900.00" inputTorque="900.00" torqueLoss="93.00" />
-                <Entry inputSpeed="900.00" inputTorque="1200.00" torqueLoss="105.00" />
-                <Entry inputSpeed="900.00" inputTorque="1600.00" torqueLoss="121.00" />
-                <Entry inputSpeed="900.00" inputTorque="2000.00" torqueLoss="137.00" />
-                <Entry inputSpeed="900.00" inputTorque="2500.00" torqueLoss="157.00" />
-                <Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00" />
-                <Entry inputSpeed="1200.00" inputTorque="200.00" torqueLoss="74.00" />
-                <Entry inputSpeed="1200.00" inputTorque="400.00" torqueLoss="82.00" />
-                <Entry inputSpeed="1200.00" inputTorque="600.00" torqueLoss="90.00" />
-                <Entry inputSpeed="1200.00" inputTorque="900.00" torqueLoss="102.00" />
-                <Entry inputSpeed="1200.00" inputTorque="1200.00" torqueLoss="114.00" />
-                <Entry inputSpeed="1200.00" inputTorque="1600.00" torqueLoss="130.00" />
-                <Entry inputSpeed="1200.00" inputTorque="2000.00" torqueLoss="146.00" />
-                <Entry inputSpeed="1200.00" inputTorque="2500.00" torqueLoss="166.00" />
-                <Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00" />
-                <Entry inputSpeed="1600.00" inputTorque="200.00" torqueLoss="86.00" />
-                <Entry inputSpeed="1600.00" inputTorque="400.00" torqueLoss="94.00" />
-                <Entry inputSpeed="1600.00" inputTorque="600.00" torqueLoss="102.00" />
-                <Entry inputSpeed="1600.00" inputTorque="900.00" torqueLoss="114.00" />
-                <Entry inputSpeed="1600.00" inputTorque="1200.00" torqueLoss="126.00" />
-                <Entry inputSpeed="1600.00" inputTorque="1600.00" torqueLoss="142.00" />
-                <Entry inputSpeed="1600.00" inputTorque="2000.00" torqueLoss="158.00" />
-                <Entry inputSpeed="1600.00" inputTorque="2500.00" torqueLoss="178.00" />
-                <Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00" />
-                <Entry inputSpeed="2000.00" inputTorque="200.00" torqueLoss="98.00" />
-                <Entry inputSpeed="2000.00" inputTorque="400.00" torqueLoss="106.00" />
-                <Entry inputSpeed="2000.00" inputTorque="600.00" torqueLoss="114.00" />
-                <Entry inputSpeed="2000.00" inputTorque="900.00" torqueLoss="126.00" />
-                <Entry inputSpeed="2000.00" inputTorque="1200.00" torqueLoss="138.00" />
-                <Entry inputSpeed="2000.00" inputTorque="1600.00" torqueLoss="154.00" />
-                <Entry inputSpeed="2000.00" inputTorque="2000.00" torqueLoss="170.00" />
-                <Entry inputSpeed="2000.00" inputTorque="2500.00" torqueLoss="190.00" />
-                <Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00" />
-                <Entry inputSpeed="2500.00" inputTorque="200.00" torqueLoss="113.00" />
-                <Entry inputSpeed="2500.00" inputTorque="400.00" torqueLoss="121.00" />
-                <Entry inputSpeed="2500.00" inputTorque="600.00" torqueLoss="129.00" />
-                <Entry inputSpeed="2500.00" inputTorque="900.00" torqueLoss="141.00" />
-                <Entry inputSpeed="2500.00" inputTorque="1200.00" torqueLoss="153.00" />
-                <Entry inputSpeed="2500.00" inputTorque="1600.00" torqueLoss="169.00" />
-                <Entry inputSpeed="2500.00" inputTorque="2000.00" torqueLoss="185.00" />
-                <Entry inputSpeed="2500.00" inputTorque="2500.00" torqueLoss="205.00" />
-                <Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00" />
-                <Entry inputSpeed="3000.00" inputTorque="200.00" torqueLoss="128.00" />
-                <Entry inputSpeed="3000.00" inputTorque="400.00" torqueLoss="136.00" />
-                <Entry inputSpeed="3000.00" inputTorque="600.00" torqueLoss="144.00" />
-                <Entry inputSpeed="3000.00" inputTorque="900.00" torqueLoss="156.00" />
-                <Entry inputSpeed="3000.00" inputTorque="1200.00" torqueLoss="168.00" />
-                <Entry inputSpeed="3000.00" inputTorque="1600.00" torqueLoss="184.00" />
-                <Entry inputSpeed="3000.00" inputTorque="2000.00" torqueLoss="200.00" />
-                <Entry inputSpeed="3000.00" inputTorque="2500.00" torqueLoss="220.00" />
-                <Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00" />
-                <Entry inputSpeed="600.00" inputTorque="-200.00" torqueLoss="56.00" />
-                <Entry inputSpeed="600.00" inputTorque="-400.00" torqueLoss="64.00" />
-                <Entry inputSpeed="600.00" inputTorque="-600.00" torqueLoss="72.00" />
-                <Entry inputSpeed="600.00" inputTorque="-900.00" torqueLoss="84.00" />
-                <Entry inputSpeed="600.00" inputTorque="-1200.00" torqueLoss="96.00" />
-                <Entry inputSpeed="600.00" inputTorque="-1600.00" torqueLoss="112.00" />
-                <Entry inputSpeed="600.00" inputTorque="-2000.00" torqueLoss="128.00" />
-                <Entry inputSpeed="600.00" inputTorque="-2500.00" torqueLoss="148.00" />
-                <Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00" />
-                <Entry inputSpeed="900.00" inputTorque="-200.00" torqueLoss="65.00" />
-                <Entry inputSpeed="900.00" inputTorque="-400.00" torqueLoss="73.00" />
-                <Entry inputSpeed="900.00" inputTorque="-600.00" torqueLoss="81.00" />
-                <Entry inputSpeed="900.00" inputTorque="-900.00" torqueLoss="93.00" />
-                <Entry inputSpeed="900.00" inputTorque="-1200.00" torqueLoss="105.00" />
-                <Entry inputSpeed="900.00" inputTorque="-1600.00" torqueLoss="121.00" />
-                <Entry inputSpeed="900.00" inputTorque="-2000.00" torqueLoss="137.00" />
-                <Entry inputSpeed="900.00" inputTorque="-2500.00" torqueLoss="157.00" />
-                <Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-200.00" torqueLoss="74.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-400.00" torqueLoss="82.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-600.00" torqueLoss="90.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-900.00" torqueLoss="102.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-1200.00" torqueLoss="114.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-1600.00" torqueLoss="130.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-2000.00" torqueLoss="146.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-2500.00" torqueLoss="166.00" />
-                <Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-200.00" torqueLoss="86.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-400.00" torqueLoss="94.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-600.00" torqueLoss="102.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-900.00" torqueLoss="114.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-1200.00" torqueLoss="126.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-1600.00" torqueLoss="142.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-2000.00" torqueLoss="158.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-2500.00" torqueLoss="178.00" />
-                <Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-200.00" torqueLoss="98.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-400.00" torqueLoss="106.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-600.00" torqueLoss="114.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-900.00" torqueLoss="126.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-1200.00" torqueLoss="138.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-1600.00" torqueLoss="154.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-2000.00" torqueLoss="170.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-2500.00" torqueLoss="190.00" />
-                <Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-200.00" torqueLoss="113.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-400.00" torqueLoss="121.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-600.00" torqueLoss="129.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-900.00" torqueLoss="141.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-1200.00" torqueLoss="153.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-1600.00" torqueLoss="169.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-2000.00" torqueLoss="185.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-2500.00" torqueLoss="205.00" />
-                <Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-200.00" torqueLoss="128.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-400.00" torqueLoss="136.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-600.00" torqueLoss="144.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-900.00" torqueLoss="156.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-1200.00" torqueLoss="168.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-1600.00" torqueLoss="184.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-2000.00" torqueLoss="200.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-2500.00" torqueLoss="220.00" />
-              </TorqueLossMap>
-            </Gear>
-            <Gear number="4">
-              <Ratio>1.000</Ratio>
-              <TorqueLossMap>
-                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="48.00" />
-                <Entry inputSpeed="0.00" inputTorque="200.00" torqueLoss="50.00" />
-                <Entry inputSpeed="0.00" inputTorque="400.00" torqueLoss="52.00" />
-                <Entry inputSpeed="0.00" inputTorque="600.00" torqueLoss="54.00" />
-                <Entry inputSpeed="0.00" inputTorque="900.00" torqueLoss="57.00" />
-                <Entry inputSpeed="0.00" inputTorque="1200.00" torqueLoss="60.00" />
-                <Entry inputSpeed="0.00" inputTorque="1600.00" torqueLoss="64.00" />
-                <Entry inputSpeed="0.00" inputTorque="2000.00" torqueLoss="68.00" />
-                <Entry inputSpeed="0.00" inputTorque="2500.00" torqueLoss="73.00" />
-                <Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00" />
-                <Entry inputSpeed="600.00" inputTorque="200.00" torqueLoss="50.00" />
-                <Entry inputSpeed="600.00" inputTorque="400.00" torqueLoss="52.00" />
-                <Entry inputSpeed="600.00" inputTorque="600.00" torqueLoss="54.00" />
-                <Entry inputSpeed="600.00" inputTorque="900.00" torqueLoss="57.00" />
-                <Entry inputSpeed="600.00" inputTorque="1200.00" torqueLoss="60.00" />
-                <Entry inputSpeed="600.00" inputTorque="1600.00" torqueLoss="64.00" />
-                <Entry inputSpeed="600.00" inputTorque="2000.00" torqueLoss="68.00" />
-                <Entry inputSpeed="600.00" inputTorque="2500.00" torqueLoss="73.00" />
-                <Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00" />
-                <Entry inputSpeed="900.00" inputTorque="200.00" torqueLoss="59.00" />
-                <Entry inputSpeed="900.00" inputTorque="400.00" torqueLoss="61.00" />
-                <Entry inputSpeed="900.00" inputTorque="600.00" torqueLoss="63.00" />
-                <Entry inputSpeed="900.00" inputTorque="900.00" torqueLoss="66.00" />
-                <Entry inputSpeed="900.00" inputTorque="1200.00" torqueLoss="69.00" />
-                <Entry inputSpeed="900.00" inputTorque="1600.00" torqueLoss="73.00" />
-                <Entry inputSpeed="900.00" inputTorque="2000.00" torqueLoss="77.00" />
-                <Entry inputSpeed="900.00" inputTorque="2500.00" torqueLoss="82.00" />
-                <Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00" />
-                <Entry inputSpeed="1200.00" inputTorque="200.00" torqueLoss="68.00" />
-                <Entry inputSpeed="1200.00" inputTorque="400.00" torqueLoss="70.00" />
-                <Entry inputSpeed="1200.00" inputTorque="600.00" torqueLoss="72.00" />
-                <Entry inputSpeed="1200.00" inputTorque="900.00" torqueLoss="75.00" />
-                <Entry inputSpeed="1200.00" inputTorque="1200.00" torqueLoss="78.00" />
-                <Entry inputSpeed="1200.00" inputTorque="1600.00" torqueLoss="82.00" />
-                <Entry inputSpeed="1200.00" inputTorque="2000.00" torqueLoss="86.00" />
-                <Entry inputSpeed="1200.00" inputTorque="2500.00" torqueLoss="91.00" />
-                <Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00" />
-                <Entry inputSpeed="1600.00" inputTorque="200.00" torqueLoss="80.00" />
-                <Entry inputSpeed="1600.00" inputTorque="400.00" torqueLoss="82.00" />
-                <Entry inputSpeed="1600.00" inputTorque="600.00" torqueLoss="84.00" />
-                <Entry inputSpeed="1600.00" inputTorque="900.00" torqueLoss="87.00" />
-                <Entry inputSpeed="1600.00" inputTorque="1200.00" torqueLoss="90.00" />
-                <Entry inputSpeed="1600.00" inputTorque="1600.00" torqueLoss="94.00" />
-                <Entry inputSpeed="1600.00" inputTorque="2000.00" torqueLoss="98.00" />
-                <Entry inputSpeed="1600.00" inputTorque="2500.00" torqueLoss="103.00" />
-                <Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00" />
-                <Entry inputSpeed="2000.00" inputTorque="200.00" torqueLoss="92.00" />
-                <Entry inputSpeed="2000.00" inputTorque="400.00" torqueLoss="94.00" />
-                <Entry inputSpeed="2000.00" inputTorque="600.00" torqueLoss="96.00" />
-                <Entry inputSpeed="2000.00" inputTorque="900.00" torqueLoss="99.00" />
-                <Entry inputSpeed="2000.00" inputTorque="1200.00" torqueLoss="102.00" />
-                <Entry inputSpeed="2000.00" inputTorque="1600.00" torqueLoss="106.00" />
-                <Entry inputSpeed="2000.00" inputTorque="2000.00" torqueLoss="110.00" />
-                <Entry inputSpeed="2000.00" inputTorque="2500.00" torqueLoss="115.00" />
-                <Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00" />
-                <Entry inputSpeed="2500.00" inputTorque="200.00" torqueLoss="107.00" />
-                <Entry inputSpeed="2500.00" inputTorque="400.00" torqueLoss="109.00" />
-                <Entry inputSpeed="2500.00" inputTorque="600.00" torqueLoss="111.00" />
-                <Entry inputSpeed="2500.00" inputTorque="900.00" torqueLoss="114.00" />
-                <Entry inputSpeed="2500.00" inputTorque="1200.00" torqueLoss="117.00" />
-                <Entry inputSpeed="2500.00" inputTorque="1600.00" torqueLoss="121.00" />
-                <Entry inputSpeed="2500.00" inputTorque="2000.00" torqueLoss="125.00" />
-                <Entry inputSpeed="2500.00" inputTorque="2500.00" torqueLoss="130.00" />
-                <Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00" />
-                <Entry inputSpeed="3000.00" inputTorque="200.00" torqueLoss="122.00" />
-                <Entry inputSpeed="3000.00" inputTorque="400.00" torqueLoss="124.00" />
-                <Entry inputSpeed="3000.00" inputTorque="600.00" torqueLoss="126.00" />
-                <Entry inputSpeed="3000.00" inputTorque="900.00" torqueLoss="129.00" />
-                <Entry inputSpeed="3000.00" inputTorque="1200.00" torqueLoss="132.00" />
-                <Entry inputSpeed="3000.00" inputTorque="1600.00" torqueLoss="136.00" />
-                <Entry inputSpeed="3000.00" inputTorque="2000.00" torqueLoss="140.00" />
-                <Entry inputSpeed="3000.00" inputTorque="2500.00" torqueLoss="145.00" />
-                <Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00" />
-                <Entry inputSpeed="600.00" inputTorque="-200.00" torqueLoss="50.00" />
-                <Entry inputSpeed="600.00" inputTorque="-400.00" torqueLoss="52.00" />
-                <Entry inputSpeed="600.00" inputTorque="-600.00" torqueLoss="54.00" />
-                <Entry inputSpeed="600.00" inputTorque="-900.00" torqueLoss="57.00" />
-                <Entry inputSpeed="600.00" inputTorque="-1200.00" torqueLoss="60.00" />
-                <Entry inputSpeed="600.00" inputTorque="-1600.00" torqueLoss="64.00" />
-                <Entry inputSpeed="600.00" inputTorque="-2000.00" torqueLoss="68.00" />
-                <Entry inputSpeed="600.00" inputTorque="-2500.00" torqueLoss="73.00" />
-                <Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00" />
-                <Entry inputSpeed="900.00" inputTorque="-200.00" torqueLoss="59.00" />
-                <Entry inputSpeed="900.00" inputTorque="-400.00" torqueLoss="61.00" />
-                <Entry inputSpeed="900.00" inputTorque="-600.00" torqueLoss="63.00" />
-                <Entry inputSpeed="900.00" inputTorque="-900.00" torqueLoss="66.00" />
-                <Entry inputSpeed="900.00" inputTorque="-1200.00" torqueLoss="69.00" />
-                <Entry inputSpeed="900.00" inputTorque="-1600.00" torqueLoss="73.00" />
-                <Entry inputSpeed="900.00" inputTorque="-2000.00" torqueLoss="77.00" />
-                <Entry inputSpeed="900.00" inputTorque="-2500.00" torqueLoss="82.00" />
-                <Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-200.00" torqueLoss="68.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-400.00" torqueLoss="70.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-600.00" torqueLoss="72.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-900.00" torqueLoss="75.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-1200.00" torqueLoss="78.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-1600.00" torqueLoss="82.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-2000.00" torqueLoss="86.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-2500.00" torqueLoss="91.00" />
-                <Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-200.00" torqueLoss="80.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-400.00" torqueLoss="82.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-600.00" torqueLoss="84.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-900.00" torqueLoss="87.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-1200.00" torqueLoss="90.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-1600.00" torqueLoss="94.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-2000.00" torqueLoss="98.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-2500.00" torqueLoss="103.00" />
-                <Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-200.00" torqueLoss="92.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-400.00" torqueLoss="94.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-600.00" torqueLoss="96.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-900.00" torqueLoss="99.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-1200.00" torqueLoss="102.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-1600.00" torqueLoss="106.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-2000.00" torqueLoss="110.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-2500.00" torqueLoss="115.00" />
-                <Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-200.00" torqueLoss="107.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-400.00" torqueLoss="109.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-600.00" torqueLoss="111.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-900.00" torqueLoss="114.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-1200.00" torqueLoss="117.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-1600.00" torqueLoss="121.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-2000.00" torqueLoss="125.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-2500.00" torqueLoss="130.00" />
-                <Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-200.00" torqueLoss="122.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-400.00" torqueLoss="124.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-600.00" torqueLoss="126.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-900.00" torqueLoss="129.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-1200.00" torqueLoss="132.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-1600.00" torqueLoss="136.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-2000.00" torqueLoss="140.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-2500.00" torqueLoss="145.00" />
-              </TorqueLossMap>
-            </Gear>
-            <Gear number="5">
-              <Ratio>0.750</Ratio>
-              <TorqueLossMap>
-                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="48.00" />
-                <Entry inputSpeed="0.00" inputTorque="200.00" torqueLoss="56.00" />
-                <Entry inputSpeed="0.00" inputTorque="400.00" torqueLoss="64.00" />
-                <Entry inputSpeed="0.00" inputTorque="600.00" torqueLoss="72.00" />
-                <Entry inputSpeed="0.00" inputTorque="900.00" torqueLoss="84.00" />
-                <Entry inputSpeed="0.00" inputTorque="1200.00" torqueLoss="96.00" />
-                <Entry inputSpeed="0.00" inputTorque="1600.00" torqueLoss="112.00" />
-                <Entry inputSpeed="0.00" inputTorque="2000.00" torqueLoss="128.00" />
-                <Entry inputSpeed="0.00" inputTorque="2500.00" torqueLoss="148.00" />
-                <Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00" />
-                <Entry inputSpeed="600.00" inputTorque="200.00" torqueLoss="56.00" />
-                <Entry inputSpeed="600.00" inputTorque="400.00" torqueLoss="64.00" />
-                <Entry inputSpeed="600.00" inputTorque="600.00" torqueLoss="72.00" />
-                <Entry inputSpeed="600.00" inputTorque="900.00" torqueLoss="84.00" />
-                <Entry inputSpeed="600.00" inputTorque="1200.00" torqueLoss="96.00" />
-                <Entry inputSpeed="600.00" inputTorque="1600.00" torqueLoss="112.00" />
-                <Entry inputSpeed="600.00" inputTorque="2000.00" torqueLoss="128.00" />
-                <Entry inputSpeed="600.00" inputTorque="2500.00" torqueLoss="148.00" />
-                <Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00" />
-                <Entry inputSpeed="900.00" inputTorque="200.00" torqueLoss="65.00" />
-                <Entry inputSpeed="900.00" inputTorque="400.00" torqueLoss="73.00" />
-                <Entry inputSpeed="900.00" inputTorque="600.00" torqueLoss="81.00" />
-                <Entry inputSpeed="900.00" inputTorque="900.00" torqueLoss="93.00" />
-                <Entry inputSpeed="900.00" inputTorque="1200.00" torqueLoss="105.00" />
-                <Entry inputSpeed="900.00" inputTorque="1600.00" torqueLoss="121.00" />
-                <Entry inputSpeed="900.00" inputTorque="2000.00" torqueLoss="137.00" />
-                <Entry inputSpeed="900.00" inputTorque="2500.00" torqueLoss="157.00" />
-                <Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00" />
-                <Entry inputSpeed="1200.00" inputTorque="200.00" torqueLoss="74.00" />
-                <Entry inputSpeed="1200.00" inputTorque="400.00" torqueLoss="82.00" />
-                <Entry inputSpeed="1200.00" inputTorque="600.00" torqueLoss="90.00" />
-                <Entry inputSpeed="1200.00" inputTorque="900.00" torqueLoss="102.00" />
-                <Entry inputSpeed="1200.00" inputTorque="1200.00" torqueLoss="114.00" />
-                <Entry inputSpeed="1200.00" inputTorque="1600.00" torqueLoss="130.00" />
-                <Entry inputSpeed="1200.00" inputTorque="2000.00" torqueLoss="146.00" />
-                <Entry inputSpeed="1200.00" inputTorque="2500.00" torqueLoss="166.00" />
-                <Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00" />
-                <Entry inputSpeed="1600.00" inputTorque="200.00" torqueLoss="86.00" />
-                <Entry inputSpeed="1600.00" inputTorque="400.00" torqueLoss="94.00" />
-                <Entry inputSpeed="1600.00" inputTorque="600.00" torqueLoss="102.00" />
-                <Entry inputSpeed="1600.00" inputTorque="900.00" torqueLoss="114.00" />
-                <Entry inputSpeed="1600.00" inputTorque="1200.00" torqueLoss="126.00" />
-                <Entry inputSpeed="1600.00" inputTorque="1600.00" torqueLoss="142.00" />
-                <Entry inputSpeed="1600.00" inputTorque="2000.00" torqueLoss="158.00" />
-                <Entry inputSpeed="1600.00" inputTorque="2500.00" torqueLoss="178.00" />
-                <Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00" />
-                <Entry inputSpeed="2000.00" inputTorque="200.00" torqueLoss="98.00" />
-                <Entry inputSpeed="2000.00" inputTorque="400.00" torqueLoss="106.00" />
-                <Entry inputSpeed="2000.00" inputTorque="600.00" torqueLoss="114.00" />
-                <Entry inputSpeed="2000.00" inputTorque="900.00" torqueLoss="126.00" />
-                <Entry inputSpeed="2000.00" inputTorque="1200.00" torqueLoss="138.00" />
-                <Entry inputSpeed="2000.00" inputTorque="1600.00" torqueLoss="154.00" />
-                <Entry inputSpeed="2000.00" inputTorque="2000.00" torqueLoss="170.00" />
-                <Entry inputSpeed="2000.00" inputTorque="2500.00" torqueLoss="190.00" />
-                <Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00" />
-                <Entry inputSpeed="2500.00" inputTorque="200.00" torqueLoss="113.00" />
-                <Entry inputSpeed="2500.00" inputTorque="400.00" torqueLoss="121.00" />
-                <Entry inputSpeed="2500.00" inputTorque="600.00" torqueLoss="129.00" />
-                <Entry inputSpeed="2500.00" inputTorque="900.00" torqueLoss="141.00" />
-                <Entry inputSpeed="2500.00" inputTorque="1200.00" torqueLoss="153.00" />
-                <Entry inputSpeed="2500.00" inputTorque="1600.00" torqueLoss="169.00" />
-                <Entry inputSpeed="2500.00" inputTorque="2000.00" torqueLoss="185.00" />
-                <Entry inputSpeed="2500.00" inputTorque="2500.00" torqueLoss="205.00" />
-                <Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00" />
-                <Entry inputSpeed="3000.00" inputTorque="200.00" torqueLoss="128.00" />
-                <Entry inputSpeed="3000.00" inputTorque="400.00" torqueLoss="136.00" />
-                <Entry inputSpeed="3000.00" inputTorque="600.00" torqueLoss="144.00" />
-                <Entry inputSpeed="3000.00" inputTorque="900.00" torqueLoss="156.00" />
-                <Entry inputSpeed="3000.00" inputTorque="1200.00" torqueLoss="168.00" />
-                <Entry inputSpeed="3000.00" inputTorque="1600.00" torqueLoss="184.00" />
-                <Entry inputSpeed="3000.00" inputTorque="2000.00" torqueLoss="200.00" />
-                <Entry inputSpeed="3000.00" inputTorque="2500.00" torqueLoss="220.00" />
-                <Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00" />
-                <Entry inputSpeed="600.00" inputTorque="-200.00" torqueLoss="56.00" />
-                <Entry inputSpeed="600.00" inputTorque="-400.00" torqueLoss="64.00" />
-                <Entry inputSpeed="600.00" inputTorque="-600.00" torqueLoss="72.00" />
-                <Entry inputSpeed="600.00" inputTorque="-900.00" torqueLoss="84.00" />
-                <Entry inputSpeed="600.00" inputTorque="-1200.00" torqueLoss="96.00" />
-                <Entry inputSpeed="600.00" inputTorque="-1600.00" torqueLoss="112.00" />
-                <Entry inputSpeed="600.00" inputTorque="-2000.00" torqueLoss="128.00" />
-                <Entry inputSpeed="600.00" inputTorque="-2500.00" torqueLoss="148.00" />
-                <Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00" />
-                <Entry inputSpeed="900.00" inputTorque="-200.00" torqueLoss="65.00" />
-                <Entry inputSpeed="900.00" inputTorque="-400.00" torqueLoss="73.00" />
-                <Entry inputSpeed="900.00" inputTorque="-600.00" torqueLoss="81.00" />
-                <Entry inputSpeed="900.00" inputTorque="-900.00" torqueLoss="93.00" />
-                <Entry inputSpeed="900.00" inputTorque="-1200.00" torqueLoss="105.00" />
-                <Entry inputSpeed="900.00" inputTorque="-1600.00" torqueLoss="121.00" />
-                <Entry inputSpeed="900.00" inputTorque="-2000.00" torqueLoss="137.00" />
-                <Entry inputSpeed="900.00" inputTorque="-2500.00" torqueLoss="157.00" />
-                <Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-200.00" torqueLoss="74.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-400.00" torqueLoss="82.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-600.00" torqueLoss="90.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-900.00" torqueLoss="102.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-1200.00" torqueLoss="114.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-1600.00" torqueLoss="130.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-2000.00" torqueLoss="146.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-2500.00" torqueLoss="166.00" />
-                <Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-200.00" torqueLoss="86.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-400.00" torqueLoss="94.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-600.00" torqueLoss="102.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-900.00" torqueLoss="114.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-1200.00" torqueLoss="126.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-1600.00" torqueLoss="142.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-2000.00" torqueLoss="158.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-2500.00" torqueLoss="178.00" />
-                <Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-200.00" torqueLoss="98.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-400.00" torqueLoss="106.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-600.00" torqueLoss="114.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-900.00" torqueLoss="126.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-1200.00" torqueLoss="138.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-1600.00" torqueLoss="154.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-2000.00" torqueLoss="170.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-2500.00" torqueLoss="190.00" />
-                <Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-200.00" torqueLoss="113.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-400.00" torqueLoss="121.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-600.00" torqueLoss="129.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-900.00" torqueLoss="141.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-1200.00" torqueLoss="153.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-1600.00" torqueLoss="169.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-2000.00" torqueLoss="185.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-2500.00" torqueLoss="205.00" />
-                <Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-200.00" torqueLoss="128.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-400.00" torqueLoss="136.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-600.00" torqueLoss="144.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-900.00" torqueLoss="156.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-1200.00" torqueLoss="168.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-1600.00" torqueLoss="184.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-2000.00" torqueLoss="200.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-2500.00" torqueLoss="220.00" />
-              </TorqueLossMap>
-            </Gear>
-            <Gear number="6">
-              <Ratio>0.650</Ratio>
-              <TorqueLossMap>
-                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="48.00" />
-                <Entry inputSpeed="0.00" inputTorque="200.00" torqueLoss="56.00" />
-                <Entry inputSpeed="0.00" inputTorque="400.00" torqueLoss="64.00" />
-                <Entry inputSpeed="0.00" inputTorque="600.00" torqueLoss="72.00" />
-                <Entry inputSpeed="0.00" inputTorque="900.00" torqueLoss="84.00" />
-                <Entry inputSpeed="0.00" inputTorque="1200.00" torqueLoss="96.00" />
-                <Entry inputSpeed="0.00" inputTorque="1600.00" torqueLoss="112.00" />
-                <Entry inputSpeed="0.00" inputTorque="2000.00" torqueLoss="128.00" />
-                <Entry inputSpeed="0.00" inputTorque="2500.00" torqueLoss="148.00" />
-                <Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00" />
-                <Entry inputSpeed="600.00" inputTorque="200.00" torqueLoss="56.00" />
-                <Entry inputSpeed="600.00" inputTorque="400.00" torqueLoss="64.00" />
-                <Entry inputSpeed="600.00" inputTorque="600.00" torqueLoss="72.00" />
-                <Entry inputSpeed="600.00" inputTorque="900.00" torqueLoss="84.00" />
-                <Entry inputSpeed="600.00" inputTorque="1200.00" torqueLoss="96.00" />
-                <Entry inputSpeed="600.00" inputTorque="1600.00" torqueLoss="112.00" />
-                <Entry inputSpeed="600.00" inputTorque="2000.00" torqueLoss="128.00" />
-                <Entry inputSpeed="600.00" inputTorque="2500.00" torqueLoss="148.00" />
-                <Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00" />
-                <Entry inputSpeed="900.00" inputTorque="200.00" torqueLoss="65.00" />
-                <Entry inputSpeed="900.00" inputTorque="400.00" torqueLoss="73.00" />
-                <Entry inputSpeed="900.00" inputTorque="600.00" torqueLoss="81.00" />
-                <Entry inputSpeed="900.00" inputTorque="900.00" torqueLoss="93.00" />
-                <Entry inputSpeed="900.00" inputTorque="1200.00" torqueLoss="105.00" />
-                <Entry inputSpeed="900.00" inputTorque="1600.00" torqueLoss="121.00" />
-                <Entry inputSpeed="900.00" inputTorque="2000.00" torqueLoss="137.00" />
-                <Entry inputSpeed="900.00" inputTorque="2500.00" torqueLoss="157.00" />
-                <Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00" />
-                <Entry inputSpeed="1200.00" inputTorque="200.00" torqueLoss="74.00" />
-                <Entry inputSpeed="1200.00" inputTorque="400.00" torqueLoss="82.00" />
-                <Entry inputSpeed="1200.00" inputTorque="600.00" torqueLoss="90.00" />
-                <Entry inputSpeed="1200.00" inputTorque="900.00" torqueLoss="102.00" />
-                <Entry inputSpeed="1200.00" inputTorque="1200.00" torqueLoss="114.00" />
-                <Entry inputSpeed="1200.00" inputTorque="1600.00" torqueLoss="130.00" />
-                <Entry inputSpeed="1200.00" inputTorque="2000.00" torqueLoss="146.00" />
-                <Entry inputSpeed="1200.00" inputTorque="2500.00" torqueLoss="166.00" />
-                <Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00" />
-                <Entry inputSpeed="1600.00" inputTorque="200.00" torqueLoss="86.00" />
-                <Entry inputSpeed="1600.00" inputTorque="400.00" torqueLoss="94.00" />
-                <Entry inputSpeed="1600.00" inputTorque="600.00" torqueLoss="102.00" />
-                <Entry inputSpeed="1600.00" inputTorque="900.00" torqueLoss="114.00" />
-                <Entry inputSpeed="1600.00" inputTorque="1200.00" torqueLoss="126.00" />
-                <Entry inputSpeed="1600.00" inputTorque="1600.00" torqueLoss="142.00" />
-                <Entry inputSpeed="1600.00" inputTorque="2000.00" torqueLoss="158.00" />
-                <Entry inputSpeed="1600.00" inputTorque="2500.00" torqueLoss="178.00" />
-                <Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00" />
-                <Entry inputSpeed="2000.00" inputTorque="200.00" torqueLoss="98.00" />
-                <Entry inputSpeed="2000.00" inputTorque="400.00" torqueLoss="106.00" />
-                <Entry inputSpeed="2000.00" inputTorque="600.00" torqueLoss="114.00" />
-                <Entry inputSpeed="2000.00" inputTorque="900.00" torqueLoss="126.00" />
-                <Entry inputSpeed="2000.00" inputTorque="1200.00" torqueLoss="138.00" />
-                <Entry inputSpeed="2000.00" inputTorque="1600.00" torqueLoss="154.00" />
-                <Entry inputSpeed="2000.00" inputTorque="2000.00" torqueLoss="170.00" />
-                <Entry inputSpeed="2000.00" inputTorque="2500.00" torqueLoss="190.00" />
-                <Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00" />
-                <Entry inputSpeed="2500.00" inputTorque="200.00" torqueLoss="113.00" />
-                <Entry inputSpeed="2500.00" inputTorque="400.00" torqueLoss="121.00" />
-                <Entry inputSpeed="2500.00" inputTorque="600.00" torqueLoss="129.00" />
-                <Entry inputSpeed="2500.00" inputTorque="900.00" torqueLoss="141.00" />
-                <Entry inputSpeed="2500.00" inputTorque="1200.00" torqueLoss="153.00" />
-                <Entry inputSpeed="2500.00" inputTorque="1600.00" torqueLoss="169.00" />
-                <Entry inputSpeed="2500.00" inputTorque="2000.00" torqueLoss="185.00" />
-                <Entry inputSpeed="2500.00" inputTorque="2500.00" torqueLoss="205.00" />
-                <Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00" />
-                <Entry inputSpeed="3000.00" inputTorque="200.00" torqueLoss="128.00" />
-                <Entry inputSpeed="3000.00" inputTorque="400.00" torqueLoss="136.00" />
-                <Entry inputSpeed="3000.00" inputTorque="600.00" torqueLoss="144.00" />
-                <Entry inputSpeed="3000.00" inputTorque="900.00" torqueLoss="156.00" />
-                <Entry inputSpeed="3000.00" inputTorque="1200.00" torqueLoss="168.00" />
-                <Entry inputSpeed="3000.00" inputTorque="1600.00" torqueLoss="184.00" />
-                <Entry inputSpeed="3000.00" inputTorque="2000.00" torqueLoss="200.00" />
-                <Entry inputSpeed="3000.00" inputTorque="2500.00" torqueLoss="220.00" />
-                <Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00" />
-                <Entry inputSpeed="600.00" inputTorque="-200.00" torqueLoss="56.00" />
-                <Entry inputSpeed="600.00" inputTorque="-400.00" torqueLoss="64.00" />
-                <Entry inputSpeed="600.00" inputTorque="-600.00" torqueLoss="72.00" />
-                <Entry inputSpeed="600.00" inputTorque="-900.00" torqueLoss="84.00" />
-                <Entry inputSpeed="600.00" inputTorque="-1200.00" torqueLoss="96.00" />
-                <Entry inputSpeed="600.00" inputTorque="-1600.00" torqueLoss="112.00" />
-                <Entry inputSpeed="600.00" inputTorque="-2000.00" torqueLoss="128.00" />
-                <Entry inputSpeed="600.00" inputTorque="-2500.00" torqueLoss="148.00" />
-                <Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00" />
-                <Entry inputSpeed="900.00" inputTorque="-200.00" torqueLoss="65.00" />
-                <Entry inputSpeed="900.00" inputTorque="-400.00" torqueLoss="73.00" />
-                <Entry inputSpeed="900.00" inputTorque="-600.00" torqueLoss="81.00" />
-                <Entry inputSpeed="900.00" inputTorque="-900.00" torqueLoss="93.00" />
-                <Entry inputSpeed="900.00" inputTorque="-1200.00" torqueLoss="105.00" />
-                <Entry inputSpeed="900.00" inputTorque="-1600.00" torqueLoss="121.00" />
-                <Entry inputSpeed="900.00" inputTorque="-2000.00" torqueLoss="137.00" />
-                <Entry inputSpeed="900.00" inputTorque="-2500.00" torqueLoss="157.00" />
-                <Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-200.00" torqueLoss="74.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-400.00" torqueLoss="82.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-600.00" torqueLoss="90.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-900.00" torqueLoss="102.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-1200.00" torqueLoss="114.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-1600.00" torqueLoss="130.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-2000.00" torqueLoss="146.00" />
-                <Entry inputSpeed="1200.00" inputTorque="-2500.00" torqueLoss="166.00" />
-                <Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-200.00" torqueLoss="86.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-400.00" torqueLoss="94.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-600.00" torqueLoss="102.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-900.00" torqueLoss="114.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-1200.00" torqueLoss="126.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-1600.00" torqueLoss="142.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-2000.00" torqueLoss="158.00" />
-                <Entry inputSpeed="1600.00" inputTorque="-2500.00" torqueLoss="178.00" />
-                <Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-200.00" torqueLoss="98.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-400.00" torqueLoss="106.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-600.00" torqueLoss="114.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-900.00" torqueLoss="126.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-1200.00" torqueLoss="138.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-1600.00" torqueLoss="154.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-2000.00" torqueLoss="170.00" />
-                <Entry inputSpeed="2000.00" inputTorque="-2500.00" torqueLoss="190.00" />
-                <Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-200.00" torqueLoss="113.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-400.00" torqueLoss="121.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-600.00" torqueLoss="129.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-900.00" torqueLoss="141.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-1200.00" torqueLoss="153.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-1600.00" torqueLoss="169.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-2000.00" torqueLoss="185.00" />
-                <Entry inputSpeed="2500.00" inputTorque="-2500.00" torqueLoss="205.00" />
-                <Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-200.00" torqueLoss="128.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-400.00" torqueLoss="136.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-600.00" torqueLoss="144.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-900.00" torqueLoss="156.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-1200.00" torqueLoss="168.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-1600.00" torqueLoss="184.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-2000.00" torqueLoss="200.00" />
-                <Entry inputSpeed="3000.00" inputTorque="-2500.00" torqueLoss="220.00" />
-              </TorqueLossMap>
-            </Gear>
-          </Gears>
-        </Data>
-        <Signature>
-          <Reference URI="#GBX-APT-SGenericTqMax1200" 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></DigestValue>
-          </Reference>
-        </Signature>
-        </Gearbox>
-        <TorqueConverter xsi:type="TorqueConverterComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
-          <Data id="TC-APT-SGenericTqMax1200" xsi:type="v2.0:TorqueConverterDataDeclarationType">
-            <Manufacturer>TUG Generic</Manufacturer>
-            <Model>APT-S Generic TqMax1200</Model>
-            <CertificationNumber>N/A</CertificationNumber>
-            <Date>2019-02-27T09:39:05.3410801Z</Date>
-            <AppVersion>VectoCore</AppVersion>
-            <CertificationMethod>Standard values</CertificationMethod>
-            <Characteristics>
-              <Entry speedRatio="0.0000" torqueRatio="1.80" inputTorqueRef="404.79" />
-              <Entry speedRatio="0.1000" torqueRatio="1.71" inputTorqueRef="391.30" />
-              <Entry speedRatio="0.2000" torqueRatio="1.61" inputTorqueRef="377.80" />
-              <Entry speedRatio="0.3000" torqueRatio="1.52" inputTorqueRef="364.31" />
-              <Entry speedRatio="0.4000" torqueRatio="1.42" inputTorqueRef="350.82" />
-              <Entry speedRatio="0.5000" torqueRatio="1.33" inputTorqueRef="337.33" />
-              <Entry speedRatio="0.6000" torqueRatio="1.23" inputTorqueRef="323.83" />
-              <Entry speedRatio="0.6500" torqueRatio="1.19" inputTorqueRef="303.59" />
-              <Entry speedRatio="0.7000" torqueRatio="1.14" inputTorqueRef="283.35" />
-              <Entry speedRatio="0.7500" torqueRatio="1.09" inputTorqueRef="263.11" />
-              <Entry speedRatio="0.8000" torqueRatio="1.04" inputTorqueRef="242.87" />
-              <Entry speedRatio="0.8500" torqueRatio="1.00" inputTorqueRef="222.63" />
-              <Entry speedRatio="0.9000" torqueRatio="0.95" inputTorqueRef="202.40" />
-              <Entry speedRatio="0.9500" torqueRatio="0.95" inputTorqueRef="101.20" />
-              <Entry speedRatio="1.0000" torqueRatio="0.95" inputTorqueRef="0.00" />
-              <Entry speedRatio="1.1000" torqueRatio="1.00" inputTorqueRef="-40.34" />
-              <Entry speedRatio="1.2220" torqueRatio="1.00" inputTorqueRef="-80.34" />
-              <Entry speedRatio="1.3750" torqueRatio="1.00" inputTorqueRef="-136.11" />
-              <Entry speedRatio="1.5710" torqueRatio="1.00" inputTorqueRef="-216.52" />
-              <Entry speedRatio="1.8330" torqueRatio="1.00" inputTorqueRef="-335.19" />
-              <Entry speedRatio="2.2000" torqueRatio="1.00" inputTorqueRef="-528.77" />
-              <Entry speedRatio="2.5000" torqueRatio="1.00" inputTorqueRef="-721.00" />
-              <Entry speedRatio="3.0000" torqueRatio="1.00" inputTorqueRef="-1122.00" />
-              <Entry speedRatio="3.5000" torqueRatio="1.00" inputTorqueRef="-1648.00" />
-              <Entry speedRatio="4.0000" torqueRatio="1.00" inputTorqueRef="-2326.00" />
-              <Entry speedRatio="4.5000" torqueRatio="1.00" inputTorqueRef="-3182.00" />
-              <Entry speedRatio="5.0000" torqueRatio="1.00" inputTorqueRef="-4242.00" />
-            </Characteristics>
-          </Data>
-          <Signature>
-            <Reference URI="#TC-APT-SGenericTqMax1200" 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></DigestValue>
-            </Reference>
-          </Signature>
-        </TorqueConverter>
-      <Axlegear xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxlegearComponentDeclarationType">
-        <v2.0:Data id="AXLGEAR-6.500" xsi:type="v1.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
-          <Manufacturer>TUG Generic</Manufacturer>
-          <Model>N.A.</Model>
-          <CertificationNumber>AXLGEAR-6.500</CertificationNumber>
-          <Date>2019-02-27T09:39:05.3410801Z</Date>
-          <AppVersion>VectoCore</AppVersion>
-          <LineType>Single portal axle</LineType>
-          <Ratio>6.500</Ratio>
-          <CertificationMethod>Standard values</CertificationMethod>
-          <TorqueLossMap>
-            <Entry inputSpeed="0.00" inputTorque="31.96" torqueLoss="31.96" />
-            <Entry inputSpeed="0.00" inputTorque="70.42" torqueLoss="31.96" />
-            <Entry inputSpeed="0.00" inputTorque="110.07" torqueLoss="33.15" />
-            <Entry inputSpeed="0.00" inputTorque="149.72" torqueLoss="34.34" />
-            <Entry inputSpeed="0.00" inputTorque="189.37" torqueLoss="35.53" />
-            <Entry inputSpeed="0.00" inputTorque="268.68" torqueLoss="37.91" />
-            <Entry inputSpeed="0.00" inputTorque="347.98" torqueLoss="40.29" />
-            <Entry inputSpeed="0.00" inputTorque="506.58" torqueLoss="45.04" />
-            <Entry inputSpeed="0.00" inputTorque="665.19" torqueLoss="49.80" />
-            <Entry inputSpeed="0.00" inputTorque="823.79" torqueLoss="54.56" />
-            <Entry inputSpeed="0.00" inputTorque="982.39" torqueLoss="59.32" />
-            <Entry inputSpeed="0.00" inputTorque="1141.00" torqueLoss="64.08" />
-            <Entry inputSpeed="0.00" inputTorque="1299.60" torqueLoss="68.83" />
-            <Entry inputSpeed="0.00" inputTorque="1458.21" torqueLoss="73.59" />
-            <Entry inputSpeed="0.00" inputTorque="1616.81" torqueLoss="78.35" />
-            <Entry inputSpeed="0.00" inputTorque="1934.02" torqueLoss="87.87" />
-            <Entry inputSpeed="0.00" inputTorque="2251.23" torqueLoss="97.38" />
-            <Entry inputSpeed="0.00" inputTorque="2568.44" torqueLoss="106.90" />
-            <Entry inputSpeed="0.00" inputTorque="2885.65" torqueLoss="116.42" />
-            <Entry inputSpeed="0.00" inputTorque="3202.85" torqueLoss="125.93" />
-            <Entry inputSpeed="0.00" inputTorque="3520.06" torqueLoss="135.45" />
-            <Entry inputSpeed="0.00" inputTorque="3837.27" torqueLoss="144.96" />
-            <Entry inputSpeed="0.00" inputTorque="4154.48" torqueLoss="154.48" />
-            <Entry inputSpeed="0.00" inputTorque="4471.69" torqueLoss="164.00" />
-            <Entry inputSpeed="0.00" inputTorque="4788.90" torqueLoss="173.51" />
-            <Entry inputSpeed="0.00" inputTorque="5106.11" torqueLoss="183.03" />
-            <Entry inputSpeed="0.00" inputTorque="5423.31" torqueLoss="192.55" />
-            <Entry inputSpeed="0.00" inputTorque="5740.52" torqueLoss="202.06" />
-            <Entry inputSpeed="0.00" inputTorque="6057.73" torqueLoss="211.58" />
-            <Entry inputSpeed="0.00" inputTorque="6374.94" torqueLoss="221.09" />
-            <Entry inputSpeed="0.00" inputTorque="6692.15" torqueLoss="230.61" />
-            <Entry inputSpeed="0.00" inputTorque="7009.36" torqueLoss="240.13" />
-            <Entry inputSpeed="0.00" inputTorque="7326.57" torqueLoss="249.64" />
-            <Entry inputSpeed="0.00" inputTorque="7643.77" torqueLoss="259.16" />
-            <Entry inputSpeed="0.00" inputTorque="7960.98" torqueLoss="268.68" />
-            <Entry inputSpeed="325.00" inputTorque="31.96" torqueLoss="31.96" />
-            <Entry inputSpeed="325.00" inputTorque="70.42" torqueLoss="31.96" />
-            <Entry inputSpeed="325.00" inputTorque="110.07" torqueLoss="33.15" />
-            <Entry inputSpeed="325.00" inputTorque="149.72" torqueLoss="34.34" />
-            <Entry inputSpeed="325.00" inputTorque="189.37" torqueLoss="35.53" />
-            <Entry inputSpeed="325.00" inputTorque="268.68" torqueLoss="37.91" />
-            <Entry inputSpeed="325.00" inputTorque="347.98" torqueLoss="40.29" />
-            <Entry inputSpeed="325.00" inputTorque="506.58" torqueLoss="45.04" />
-            <Entry inputSpeed="325.00" inputTorque="665.19" torqueLoss="49.80" />
-            <Entry inputSpeed="325.00" inputTorque="823.79" torqueLoss="54.56" />
-            <Entry inputSpeed="325.00" inputTorque="982.39" torqueLoss="59.32" />
-            <Entry inputSpeed="325.00" inputTorque="1141.00" torqueLoss="64.08" />
-            <Entry inputSpeed="325.00" inputTorque="1299.60" torqueLoss="68.83" />
-            <Entry inputSpeed="325.00" inputTorque="1458.21" torqueLoss="73.59" />
-            <Entry inputSpeed="325.00" inputTorque="1616.81" torqueLoss="78.35" />
-            <Entry inputSpeed="325.00" inputTorque="1934.02" torqueLoss="87.87" />
-            <Entry inputSpeed="325.00" inputTorque="2251.23" torqueLoss="97.38" />
-            <Entry inputSpeed="325.00" inputTorque="2568.44" torqueLoss="106.90" />
-            <Entry inputSpeed="325.00" inputTorque="2885.65" torqueLoss="116.42" />
-            <Entry inputSpeed="325.00" inputTorque="3202.85" torqueLoss="125.93" />
-            <Entry inputSpeed="325.00" inputTorque="3520.06" torqueLoss="135.45" />
-            <Entry inputSpeed="325.00" inputTorque="3837.27" torqueLoss="144.96" />
-            <Entry inputSpeed="325.00" inputTorque="4154.48" torqueLoss="154.48" />
-            <Entry inputSpeed="325.00" inputTorque="4471.69" torqueLoss="164.00" />
-            <Entry inputSpeed="325.00" inputTorque="4788.90" torqueLoss="173.51" />
-            <Entry inputSpeed="325.00" inputTorque="5106.11" torqueLoss="183.03" />
-            <Entry inputSpeed="325.00" inputTorque="5423.31" torqueLoss="192.55" />
-            <Entry inputSpeed="325.00" inputTorque="5740.52" torqueLoss="202.06" />
-            <Entry inputSpeed="325.00" inputTorque="6057.73" torqueLoss="211.58" />
-            <Entry inputSpeed="325.00" inputTorque="6374.94" torqueLoss="221.09" />
-            <Entry inputSpeed="325.00" inputTorque="6692.15" torqueLoss="230.61" />
-            <Entry inputSpeed="325.00" inputTorque="7009.36" torqueLoss="240.13" />
-            <Entry inputSpeed="325.00" inputTorque="7326.57" torqueLoss="249.64" />
-            <Entry inputSpeed="325.00" inputTorque="7643.77" torqueLoss="259.16" />
-            <Entry inputSpeed="325.00" inputTorque="7960.98" torqueLoss="268.68" />
-            <Entry inputSpeed="650.00" inputTorque="31.96" torqueLoss="31.96" />
-            <Entry inputSpeed="650.00" inputTorque="70.42" torqueLoss="31.96" />
-            <Entry inputSpeed="650.00" inputTorque="110.07" torqueLoss="33.15" />
-            <Entry inputSpeed="650.00" inputTorque="149.72" torqueLoss="34.34" />
-            <Entry inputSpeed="650.00" inputTorque="189.37" torqueLoss="35.53" />
-            <Entry inputSpeed="650.00" inputTorque="268.68" torqueLoss="37.91" />
-            <Entry inputSpeed="650.00" inputTorque="347.98" torqueLoss="40.29" />
-            <Entry inputSpeed="650.00" inputTorque="506.58" torqueLoss="45.04" />
-            <Entry inputSpeed="650.00" inputTorque="665.19" torqueLoss="49.80" />
-            <Entry inputSpeed="650.00" inputTorque="823.79" torqueLoss="54.56" />
-            <Entry inputSpeed="650.00" inputTorque="982.39" torqueLoss="59.32" />
-            <Entry inputSpeed="650.00" inputTorque="1141.00" torqueLoss="64.08" />
-            <Entry inputSpeed="650.00" inputTorque="1299.60" torqueLoss="68.83" />
-            <Entry inputSpeed="650.00" inputTorque="1458.21" torqueLoss="73.59" />
-            <Entry inputSpeed="650.00" inputTorque="1616.81" torqueLoss="78.35" />
-            <Entry inputSpeed="650.00" inputTorque="1934.02" torqueLoss="87.87" />
-            <Entry inputSpeed="650.00" inputTorque="2251.23" torqueLoss="97.38" />
-            <Entry inputSpeed="650.00" inputTorque="2568.44" torqueLoss="106.90" />
-            <Entry inputSpeed="650.00" inputTorque="2885.65" torqueLoss="116.42" />
-            <Entry inputSpeed="650.00" inputTorque="3202.85" torqueLoss="125.93" />
-            <Entry inputSpeed="650.00" inputTorque="3520.06" torqueLoss="135.45" />
-            <Entry inputSpeed="650.00" inputTorque="3837.27" torqueLoss="144.96" />
-            <Entry inputSpeed="650.00" inputTorque="4154.48" torqueLoss="154.48" />
-            <Entry inputSpeed="650.00" inputTorque="4471.69" torqueLoss="164.00" />
-            <Entry inputSpeed="650.00" inputTorque="4788.90" torqueLoss="173.51" />
-            <Entry inputSpeed="650.00" inputTorque="5106.11" torqueLoss="183.03" />
-            <Entry inputSpeed="650.00" inputTorque="5423.31" torqueLoss="192.55" />
-            <Entry inputSpeed="650.00" inputTorque="5740.52" torqueLoss="202.06" />
-            <Entry inputSpeed="650.00" inputTorque="6057.73" torqueLoss="211.58" />
-            <Entry inputSpeed="650.00" inputTorque="6374.94" torqueLoss="221.09" />
-            <Entry inputSpeed="650.00" inputTorque="6692.15" torqueLoss="230.61" />
-            <Entry inputSpeed="650.00" inputTorque="7009.36" torqueLoss="240.13" />
-            <Entry inputSpeed="650.00" inputTorque="7326.57" torqueLoss="249.64" />
-            <Entry inputSpeed="650.00" inputTorque="7643.77" torqueLoss="259.16" />
-            <Entry inputSpeed="650.00" inputTorque="7960.98" torqueLoss="268.68" />
-            <Entry inputSpeed="975.00" inputTorque="31.96" torqueLoss="31.96" />
-            <Entry inputSpeed="975.00" inputTorque="70.42" torqueLoss="31.96" />
-            <Entry inputSpeed="975.00" inputTorque="110.07" torqueLoss="33.15" />
-            <Entry inputSpeed="975.00" inputTorque="149.72" torqueLoss="34.34" />
-            <Entry inputSpeed="975.00" inputTorque="189.37" torqueLoss="35.53" />
-            <Entry inputSpeed="975.00" inputTorque="268.68" torqueLoss="37.91" />
-            <Entry inputSpeed="975.00" inputTorque="347.98" torqueLoss="40.29" />
-            <Entry inputSpeed="975.00" inputTorque="506.58" torqueLoss="45.04" />
-            <Entry inputSpeed="975.00" inputTorque="665.19" torqueLoss="49.80" />
-            <Entry inputSpeed="975.00" inputTorque="823.79" torqueLoss="54.56" />
-            <Entry inputSpeed="975.00" inputTorque="982.39" torqueLoss="59.32" />
-            <Entry inputSpeed="975.00" inputTorque="1141.00" torqueLoss="64.08" />
-            <Entry inputSpeed="975.00" inputTorque="1299.60" torqueLoss="68.83" />
-            <Entry inputSpeed="975.00" inputTorque="1458.21" torqueLoss="73.59" />
-            <Entry inputSpeed="975.00" inputTorque="1616.81" torqueLoss="78.35" />
-            <Entry inputSpeed="975.00" inputTorque="1934.02" torqueLoss="87.87" />
-            <Entry inputSpeed="975.00" inputTorque="2251.23" torqueLoss="97.38" />
-            <Entry inputSpeed="975.00" inputTorque="2568.44" torqueLoss="106.90" />
-            <Entry inputSpeed="975.00" inputTorque="2885.65" torqueLoss="116.42" />
-            <Entry inputSpeed="975.00" inputTorque="3202.85" torqueLoss="125.93" />
-            <Entry inputSpeed="975.00" inputTorque="3520.06" torqueLoss="135.45" />
-            <Entry inputSpeed="975.00" inputTorque="3837.27" torqueLoss="144.96" />
-            <Entry inputSpeed="975.00" inputTorque="4154.48" torqueLoss="154.48" />
-            <Entry inputSpeed="975.00" inputTorque="4471.69" torqueLoss="164.00" />
-            <Entry inputSpeed="975.00" inputTorque="4788.90" torqueLoss="173.51" />
-            <Entry inputSpeed="975.00" inputTorque="5106.11" torqueLoss="183.03" />
-            <Entry inputSpeed="975.00" inputTorque="5423.31" torqueLoss="192.55" />
-            <Entry inputSpeed="975.00" inputTorque="5740.52" torqueLoss="202.06" />
-            <Entry inputSpeed="975.00" inputTorque="6057.73" torqueLoss="211.58" />
-            <Entry inputSpeed="975.00" inputTorque="6374.94" torqueLoss="221.09" />
-            <Entry inputSpeed="975.00" inputTorque="6692.15" torqueLoss="230.61" />
-            <Entry inputSpeed="975.00" inputTorque="7009.36" torqueLoss="240.13" />
-            <Entry inputSpeed="975.00" inputTorque="7326.57" torqueLoss="249.64" />
-            <Entry inputSpeed="975.00" inputTorque="7643.77" torqueLoss="259.16" />
-            <Entry inputSpeed="975.00" inputTorque="7960.98" torqueLoss="268.68" />
-            <Entry inputSpeed="1300.00" inputTorque="31.96" torqueLoss="31.96" />
-            <Entry inputSpeed="1300.00" inputTorque="70.42" torqueLoss="31.96" />
-            <Entry inputSpeed="1300.00" inputTorque="110.07" torqueLoss="33.15" />
-            <Entry inputSpeed="1300.00" inputTorque="149.72" torqueLoss="34.34" />
-            <Entry inputSpeed="1300.00" inputTorque="189.37" torqueLoss="35.53" />
-            <Entry inputSpeed="1300.00" inputTorque="268.68" torqueLoss="37.91" />
-            <Entry inputSpeed="1300.00" inputTorque="347.98" torqueLoss="40.29" />
-            <Entry inputSpeed="1300.00" inputTorque="506.58" torqueLoss="45.04" />
-            <Entry inputSpeed="1300.00" inputTorque="665.19" torqueLoss="49.80" />
-            <Entry inputSpeed="1300.00" inputTorque="823.79" torqueLoss="54.56" />
-            <Entry inputSpeed="1300.00" inputTorque="982.39" torqueLoss="59.32" />
-            <Entry inputSpeed="1300.00" inputTorque="1141.00" torqueLoss="64.08" />
-            <Entry inputSpeed="1300.00" inputTorque="1299.60" torqueLoss="68.83" />
-            <Entry inputSpeed="1300.00" inputTorque="1458.21" torqueLoss="73.59" />
-            <Entry inputSpeed="1300.00" inputTorque="1616.81" torqueLoss="78.35" />
-            <Entry inputSpeed="1300.00" inputTorque="1934.02" torqueLoss="87.87" />
-            <Entry inputSpeed="1300.00" inputTorque="2251.23" torqueLoss="97.38" />
-            <Entry inputSpeed="1300.00" inputTorque="2568.44" torqueLoss="106.90" />
-            <Entry inputSpeed="1300.00" inputTorque="2885.65" torqueLoss="116.42" />
-            <Entry inputSpeed="1300.00" inputTorque="3202.85" torqueLoss="125.93" />
-            <Entry inputSpeed="1300.00" inputTorque="3520.06" torqueLoss="135.45" />
-            <Entry inputSpeed="1300.00" inputTorque="3837.27" torqueLoss="144.96" />
-            <Entry inputSpeed="1300.00" inputTorque="4154.48" torqueLoss="154.48" />
-            <Entry inputSpeed="1300.00" inputTorque="4471.69" torqueLoss="164.00" />
-            <Entry inputSpeed="1300.00" inputTorque="4788.90" torqueLoss="173.51" />
-            <Entry inputSpeed="1300.00" inputTorque="5106.11" torqueLoss="183.03" />
-            <Entry inputSpeed="1300.00" inputTorque="5423.31" torqueLoss="192.55" />
-            <Entry inputSpeed="1300.00" inputTorque="5740.52" torqueLoss="202.06" />
-            <Entry inputSpeed="1300.00" inputTorque="6057.73" torqueLoss="211.58" />
-            <Entry inputSpeed="1300.00" inputTorque="6374.94" torqueLoss="221.09" />
-            <Entry inputSpeed="1300.00" inputTorque="6692.15" torqueLoss="230.61" />
-            <Entry inputSpeed="1300.00" inputTorque="7009.36" torqueLoss="240.13" />
-            <Entry inputSpeed="1300.00" inputTorque="7326.57" torqueLoss="249.64" />
-            <Entry inputSpeed="1300.00" inputTorque="7643.77" torqueLoss="259.16" />
-            <Entry inputSpeed="1300.00" inputTorque="7960.98" torqueLoss="268.68" />
-            <Entry inputSpeed="1625.00" inputTorque="31.96" torqueLoss="31.96" />
-            <Entry inputSpeed="1625.00" inputTorque="70.42" torqueLoss="31.96" />
-            <Entry inputSpeed="1625.00" inputTorque="110.07" torqueLoss="33.15" />
-            <Entry inputSpeed="1625.00" inputTorque="149.72" torqueLoss="34.34" />
-            <Entry inputSpeed="1625.00" inputTorque="189.37" torqueLoss="35.53" />
-            <Entry inputSpeed="1625.00" inputTorque="268.68" torqueLoss="37.91" />
-            <Entry inputSpeed="1625.00" inputTorque="347.98" torqueLoss="40.29" />
-            <Entry inputSpeed="1625.00" inputTorque="506.58" torqueLoss="45.04" />
-            <Entry inputSpeed="1625.00" inputTorque="665.19" torqueLoss="49.80" />
-            <Entry inputSpeed="1625.00" inputTorque="823.79" torqueLoss="54.56" />
-            <Entry inputSpeed="1625.00" inputTorque="982.39" torqueLoss="59.32" />
-            <Entry inputSpeed="1625.00" inputTorque="1141.00" torqueLoss="64.08" />
-            <Entry inputSpeed="1625.00" inputTorque="1299.60" torqueLoss="68.83" />
-            <Entry inputSpeed="1625.00" inputTorque="1458.21" torqueLoss="73.59" />
-            <Entry inputSpeed="1625.00" inputTorque="1616.81" torqueLoss="78.35" />
-            <Entry inputSpeed="1625.00" inputTorque="1934.02" torqueLoss="87.87" />
-            <Entry inputSpeed="1625.00" inputTorque="2251.23" torqueLoss="97.38" />
-            <Entry inputSpeed="1625.00" inputTorque="2568.44" torqueLoss="106.90" />
-            <Entry inputSpeed="1625.00" inputTorque="2885.65" torqueLoss="116.42" />
-            <Entry inputSpeed="1625.00" inputTorque="3202.85" torqueLoss="125.93" />
-            <Entry inputSpeed="1625.00" inputTorque="3520.06" torqueLoss="135.45" />
-            <Entry inputSpeed="1625.00" inputTorque="3837.27" torqueLoss="144.96" />
-            <Entry inputSpeed="1625.00" inputTorque="4154.48" torqueLoss="154.48" />
-            <Entry inputSpeed="1625.00" inputTorque="4471.69" torqueLoss="164.00" />
-            <Entry inputSpeed="1625.00" inputTorque="4788.90" torqueLoss="173.51" />
-            <Entry inputSpeed="1625.00" inputTorque="5106.11" torqueLoss="183.03" />
-            <Entry inputSpeed="1625.00" inputTorque="5423.31" torqueLoss="192.55" />
-            <Entry inputSpeed="1625.00" inputTorque="5740.52" torqueLoss="202.06" />
-            <Entry inputSpeed="1625.00" inputTorque="6057.73" torqueLoss="211.58" />
-            <Entry inputSpeed="1625.00" inputTorque="6374.94" torqueLoss="221.09" />
-            <Entry inputSpeed="1625.00" inputTorque="6692.15" torqueLoss="230.61" />
-            <Entry inputSpeed="1625.00" inputTorque="7009.36" torqueLoss="240.13" />
-            <Entry inputSpeed="1625.00" inputTorque="7326.57" torqueLoss="249.64" />
-            <Entry inputSpeed="1625.00" inputTorque="7643.77" torqueLoss="259.16" />
-            <Entry inputSpeed="1625.00" inputTorque="7960.98" torqueLoss="268.68" />
-            <Entry inputSpeed="1950.00" inputTorque="31.96" torqueLoss="31.96" />
-            <Entry inputSpeed="1950.00" inputTorque="70.42" torqueLoss="31.96" />
-            <Entry inputSpeed="1950.00" inputTorque="110.07" torqueLoss="33.15" />
-            <Entry inputSpeed="1950.00" inputTorque="149.72" torqueLoss="34.34" />
-            <Entry inputSpeed="1950.00" inputTorque="189.37" torqueLoss="35.53" />
-            <Entry inputSpeed="1950.00" inputTorque="268.68" torqueLoss="37.91" />
-            <Entry inputSpeed="1950.00" inputTorque="347.98" torqueLoss="40.29" />
-            <Entry inputSpeed="1950.00" inputTorque="506.58" torqueLoss="45.04" />
-            <Entry inputSpeed="1950.00" inputTorque="665.19" torqueLoss="49.80" />
-            <Entry inputSpeed="1950.00" inputTorque="823.79" torqueLoss="54.56" />
-            <Entry inputSpeed="1950.00" inputTorque="982.39" torqueLoss="59.32" />
-            <Entry inputSpeed="1950.00" inputTorque="1141.00" torqueLoss="64.08" />
-            <Entry inputSpeed="1950.00" inputTorque="1299.60" torqueLoss="68.83" />
-            <Entry inputSpeed="1950.00" inputTorque="1458.21" torqueLoss="73.59" />
-            <Entry inputSpeed="1950.00" inputTorque="1616.81" torqueLoss="78.35" />
-            <Entry inputSpeed="1950.00" inputTorque="1934.02" torqueLoss="87.87" />
-            <Entry inputSpeed="1950.00" inputTorque="2251.23" torqueLoss="97.38" />
-            <Entry inputSpeed="1950.00" inputTorque="2568.44" torqueLoss="106.90" />
-            <Entry inputSpeed="1950.00" inputTorque="2885.65" torqueLoss="116.42" />
-            <Entry inputSpeed="1950.00" inputTorque="3202.85" torqueLoss="125.93" />
-            <Entry inputSpeed="1950.00" inputTorque="3520.06" torqueLoss="135.45" />
-            <Entry inputSpeed="1950.00" inputTorque="3837.27" torqueLoss="144.96" />
-            <Entry inputSpeed="1950.00" inputTorque="4154.48" torqueLoss="154.48" />
-            <Entry inputSpeed="1950.00" inputTorque="4471.69" torqueLoss="164.00" />
-            <Entry inputSpeed="1950.00" inputTorque="4788.90" torqueLoss="173.51" />
-            <Entry inputSpeed="1950.00" inputTorque="5106.11" torqueLoss="183.03" />
-            <Entry inputSpeed="1950.00" inputTorque="5423.31" torqueLoss="192.55" />
-            <Entry inputSpeed="1950.00" inputTorque="5740.52" torqueLoss="202.06" />
-            <Entry inputSpeed="1950.00" inputTorque="6057.73" torqueLoss="211.58" />
-            <Entry inputSpeed="1950.00" inputTorque="6374.94" torqueLoss="221.09" />
-            <Entry inputSpeed="1950.00" inputTorque="6692.15" torqueLoss="230.61" />
-            <Entry inputSpeed="1950.00" inputTorque="7009.36" torqueLoss="240.13" />
-            <Entry inputSpeed="1950.00" inputTorque="7326.57" torqueLoss="249.64" />
-            <Entry inputSpeed="1950.00" inputTorque="7643.77" torqueLoss="259.16" />
-            <Entry inputSpeed="1950.00" inputTorque="7960.98" torqueLoss="268.68" />
-            <Entry inputSpeed="2275.00" inputTorque="31.96" torqueLoss="31.96" />
-            <Entry inputSpeed="2275.00" inputTorque="70.42" torqueLoss="31.96" />
-            <Entry inputSpeed="2275.00" inputTorque="110.07" torqueLoss="33.15" />
-            <Entry inputSpeed="2275.00" inputTorque="149.72" torqueLoss="34.34" />
-            <Entry inputSpeed="2275.00" inputTorque="189.37" torqueLoss="35.53" />
-            <Entry inputSpeed="2275.00" inputTorque="268.68" torqueLoss="37.91" />
-            <Entry inputSpeed="2275.00" inputTorque="347.98" torqueLoss="40.29" />
-            <Entry inputSpeed="2275.00" inputTorque="506.58" torqueLoss="45.04" />
-            <Entry inputSpeed="2275.00" inputTorque="665.19" torqueLoss="49.80" />
-            <Entry inputSpeed="2275.00" inputTorque="823.79" torqueLoss="54.56" />
-            <Entry inputSpeed="2275.00" inputTorque="982.39" torqueLoss="59.32" />
-            <Entry inputSpeed="2275.00" inputTorque="1141.00" torqueLoss="64.08" />
-            <Entry inputSpeed="2275.00" inputTorque="1299.60" torqueLoss="68.83" />
-            <Entry inputSpeed="2275.00" inputTorque="1458.21" torqueLoss="73.59" />
-            <Entry inputSpeed="2275.00" inputTorque="1616.81" torqueLoss="78.35" />
-            <Entry inputSpeed="2275.00" inputTorque="1934.02" torqueLoss="87.87" />
-            <Entry inputSpeed="2275.00" inputTorque="2251.23" torqueLoss="97.38" />
-            <Entry inputSpeed="2275.00" inputTorque="2568.44" torqueLoss="106.90" />
-            <Entry inputSpeed="2275.00" inputTorque="2885.65" torqueLoss="116.42" />
-            <Entry inputSpeed="2275.00" inputTorque="3202.85" torqueLoss="125.93" />
-            <Entry inputSpeed="2275.00" inputTorque="3520.06" torqueLoss="135.45" />
-            <Entry inputSpeed="2275.00" inputTorque="3837.27" torqueLoss="144.96" />
-            <Entry inputSpeed="2275.00" inputTorque="4154.48" torqueLoss="154.48" />
-            <Entry inputSpeed="2275.00" inputTorque="4471.69" torqueLoss="164.00" />
-            <Entry inputSpeed="2275.00" inputTorque="4788.90" torqueLoss="173.51" />
-            <Entry inputSpeed="2275.00" inputTorque="5106.11" torqueLoss="183.03" />
-            <Entry inputSpeed="2275.00" inputTorque="5423.31" torqueLoss="192.55" />
-            <Entry inputSpeed="2275.00" inputTorque="5740.52" torqueLoss="202.06" />
-            <Entry inputSpeed="2275.00" inputTorque="6057.73" torqueLoss="211.58" />
-            <Entry inputSpeed="2275.00" inputTorque="6374.94" torqueLoss="221.09" />
-            <Entry inputSpeed="2275.00" inputTorque="6692.15" torqueLoss="230.61" />
-            <Entry inputSpeed="2275.00" inputTorque="7009.36" torqueLoss="240.13" />
-            <Entry inputSpeed="2275.00" inputTorque="7326.57" torqueLoss="249.64" />
-            <Entry inputSpeed="2275.00" inputTorque="7643.77" torqueLoss="259.16" />
-            <Entry inputSpeed="2275.00" inputTorque="7960.98" torqueLoss="268.68" />
-            <Entry inputSpeed="2600.00" inputTorque="31.96" torqueLoss="31.96" />
-            <Entry inputSpeed="2600.00" inputTorque="70.42" torqueLoss="31.96" />
-            <Entry inputSpeed="2600.00" inputTorque="110.07" torqueLoss="33.15" />
-            <Entry inputSpeed="2600.00" inputTorque="149.72" torqueLoss="34.34" />
-            <Entry inputSpeed="2600.00" inputTorque="189.37" torqueLoss="35.53" />
-            <Entry inputSpeed="2600.00" inputTorque="268.68" torqueLoss="37.91" />
-            <Entry inputSpeed="2600.00" inputTorque="347.98" torqueLoss="40.29" />
-            <Entry inputSpeed="2600.00" inputTorque="506.58" torqueLoss="45.04" />
-            <Entry inputSpeed="2600.00" inputTorque="665.19" torqueLoss="49.80" />
-            <Entry inputSpeed="2600.00" inputTorque="823.79" torqueLoss="54.56" />
-            <Entry inputSpeed="2600.00" inputTorque="982.39" torqueLoss="59.32" />
-            <Entry inputSpeed="2600.00" inputTorque="1141.00" torqueLoss="64.08" />
-            <Entry inputSpeed="2600.00" inputTorque="1299.60" torqueLoss="68.83" />
-            <Entry inputSpeed="2600.00" inputTorque="1458.21" torqueLoss="73.59" />
-            <Entry inputSpeed="2600.00" inputTorque="1616.81" torqueLoss="78.35" />
-            <Entry inputSpeed="2600.00" inputTorque="1934.02" torqueLoss="87.87" />
-            <Entry inputSpeed="2600.00" inputTorque="2251.23" torqueLoss="97.38" />
-            <Entry inputSpeed="2600.00" inputTorque="2568.44" torqueLoss="106.90" />
-            <Entry inputSpeed="2600.00" inputTorque="2885.65" torqueLoss="116.42" />
-            <Entry inputSpeed="2600.00" inputTorque="3202.85" torqueLoss="125.93" />
-            <Entry inputSpeed="2600.00" inputTorque="3520.06" torqueLoss="135.45" />
-            <Entry inputSpeed="2600.00" inputTorque="3837.27" torqueLoss="144.96" />
-            <Entry inputSpeed="2600.00" inputTorque="4154.48" torqueLoss="154.48" />
-            <Entry inputSpeed="2600.00" inputTorque="4471.69" torqueLoss="164.00" />
-            <Entry inputSpeed="2600.00" inputTorque="4788.90" torqueLoss="173.51" />
-            <Entry inputSpeed="2600.00" inputTorque="5106.11" torqueLoss="183.03" />
-            <Entry inputSpeed="2600.00" inputTorque="5423.31" torqueLoss="192.55" />
-            <Entry inputSpeed="2600.00" inputTorque="5740.52" torqueLoss="202.06" />
-            <Entry inputSpeed="2600.00" inputTorque="6057.73" torqueLoss="211.58" />
-            <Entry inputSpeed="2600.00" inputTorque="6374.94" torqueLoss="221.09" />
-            <Entry inputSpeed="2600.00" inputTorque="6692.15" torqueLoss="230.61" />
-            <Entry inputSpeed="2600.00" inputTorque="7009.36" torqueLoss="240.13" />
-            <Entry inputSpeed="2600.00" inputTorque="7326.57" torqueLoss="249.64" />
-            <Entry inputSpeed="2600.00" inputTorque="7643.77" torqueLoss="259.16" />
-            <Entry inputSpeed="2600.00" inputTorque="7960.98" torqueLoss="268.68" />
-            <Entry inputSpeed="2925.00" inputTorque="31.96" torqueLoss="31.96" />
-            <Entry inputSpeed="2925.00" inputTorque="70.42" torqueLoss="31.96" />
-            <Entry inputSpeed="2925.00" inputTorque="110.07" torqueLoss="33.15" />
-            <Entry inputSpeed="2925.00" inputTorque="149.72" torqueLoss="34.34" />
-            <Entry inputSpeed="2925.00" inputTorque="189.37" torqueLoss="35.53" />
-            <Entry inputSpeed="2925.00" inputTorque="268.68" torqueLoss="37.91" />
-            <Entry inputSpeed="2925.00" inputTorque="347.98" torqueLoss="40.29" />
-            <Entry inputSpeed="2925.00" inputTorque="506.58" torqueLoss="45.04" />
-            <Entry inputSpeed="2925.00" inputTorque="665.19" torqueLoss="49.80" />
-            <Entry inputSpeed="2925.00" inputTorque="823.79" torqueLoss="54.56" />
-            <Entry inputSpeed="2925.00" inputTorque="982.39" torqueLoss="59.32" />
-            <Entry inputSpeed="2925.00" inputTorque="1141.00" torqueLoss="64.08" />
-            <Entry inputSpeed="2925.00" inputTorque="1299.60" torqueLoss="68.83" />
-            <Entry inputSpeed="2925.00" inputTorque="1458.21" torqueLoss="73.59" />
-            <Entry inputSpeed="2925.00" inputTorque="1616.81" torqueLoss="78.35" />
-            <Entry inputSpeed="2925.00" inputTorque="1934.02" torqueLoss="87.87" />
-            <Entry inputSpeed="2925.00" inputTorque="2251.23" torqueLoss="97.38" />
-            <Entry inputSpeed="2925.00" inputTorque="2568.44" torqueLoss="106.90" />
-            <Entry inputSpeed="2925.00" inputTorque="2885.65" torqueLoss="116.42" />
-            <Entry inputSpeed="2925.00" inputTorque="3202.85" torqueLoss="125.93" />
-            <Entry inputSpeed="2925.00" inputTorque="3520.06" torqueLoss="135.45" />
-            <Entry inputSpeed="2925.00" inputTorque="3837.27" torqueLoss="144.96" />
-            <Entry inputSpeed="2925.00" inputTorque="4154.48" torqueLoss="154.48" />
-            <Entry inputSpeed="2925.00" inputTorque="4471.69" torqueLoss="164.00" />
-            <Entry inputSpeed="2925.00" inputTorque="4788.90" torqueLoss="173.51" />
-            <Entry inputSpeed="2925.00" inputTorque="5106.11" torqueLoss="183.03" />
-            <Entry inputSpeed="2925.00" inputTorque="5423.31" torqueLoss="192.55" />
-            <Entry inputSpeed="2925.00" inputTorque="5740.52" torqueLoss="202.06" />
-            <Entry inputSpeed="2925.00" inputTorque="6057.73" torqueLoss="211.58" />
-            <Entry inputSpeed="2925.00" inputTorque="6374.94" torqueLoss="221.09" />
-            <Entry inputSpeed="2925.00" inputTorque="6692.15" torqueLoss="230.61" />
-            <Entry inputSpeed="2925.00" inputTorque="7009.36" torqueLoss="240.13" />
-            <Entry inputSpeed="2925.00" inputTorque="7326.57" torqueLoss="249.64" />
-            <Entry inputSpeed="2925.00" inputTorque="7643.77" torqueLoss="259.16" />
-            <Entry inputSpeed="2925.00" inputTorque="7960.98" torqueLoss="268.68" />
-            <Entry inputSpeed="3250.00" inputTorque="31.96" torqueLoss="31.96" />
-            <Entry inputSpeed="3250.00" inputTorque="70.42" torqueLoss="31.96" />
-            <Entry inputSpeed="3250.00" inputTorque="110.07" torqueLoss="33.15" />
-            <Entry inputSpeed="3250.00" inputTorque="149.72" torqueLoss="34.34" />
-            <Entry inputSpeed="3250.00" inputTorque="189.37" torqueLoss="35.53" />
-            <Entry inputSpeed="3250.00" inputTorque="268.68" torqueLoss="37.91" />
-            <Entry inputSpeed="3250.00" inputTorque="347.98" torqueLoss="40.29" />
-            <Entry inputSpeed="3250.00" inputTorque="506.58" torqueLoss="45.04" />
-            <Entry inputSpeed="3250.00" inputTorque="665.19" torqueLoss="49.80" />
-            <Entry inputSpeed="3250.00" inputTorque="823.79" torqueLoss="54.56" />
-            <Entry inputSpeed="3250.00" inputTorque="982.39" torqueLoss="59.32" />
-            <Entry inputSpeed="3250.00" inputTorque="1141.00" torqueLoss="64.08" />
-            <Entry inputSpeed="3250.00" inputTorque="1299.60" torqueLoss="68.83" />
-            <Entry inputSpeed="3250.00" inputTorque="1458.21" torqueLoss="73.59" />
-            <Entry inputSpeed="3250.00" inputTorque="1616.81" torqueLoss="78.35" />
-            <Entry inputSpeed="3250.00" inputTorque="1934.02" torqueLoss="87.87" />
-            <Entry inputSpeed="3250.00" inputTorque="2251.23" torqueLoss="97.38" />
-            <Entry inputSpeed="3250.00" inputTorque="2568.44" torqueLoss="106.90" />
-            <Entry inputSpeed="3250.00" inputTorque="2885.65" torqueLoss="116.42" />
-            <Entry inputSpeed="3250.00" inputTorque="3202.85" torqueLoss="125.93" />
-            <Entry inputSpeed="3250.00" inputTorque="3520.06" torqueLoss="135.45" />
-            <Entry inputSpeed="3250.00" inputTorque="3837.27" torqueLoss="144.96" />
-            <Entry inputSpeed="3250.00" inputTorque="4154.48" torqueLoss="154.48" />
-            <Entry inputSpeed="3250.00" inputTorque="4471.69" torqueLoss="164.00" />
-            <Entry inputSpeed="3250.00" inputTorque="4788.90" torqueLoss="173.51" />
-            <Entry inputSpeed="3250.00" inputTorque="5106.11" torqueLoss="183.03" />
-            <Entry inputSpeed="3250.00" inputTorque="5423.31" torqueLoss="192.55" />
-            <Entry inputSpeed="3250.00" inputTorque="5740.52" torqueLoss="202.06" />
-            <Entry inputSpeed="3250.00" inputTorque="6057.73" torqueLoss="211.58" />
-            <Entry inputSpeed="3250.00" inputTorque="6374.94" torqueLoss="221.09" />
-            <Entry inputSpeed="3250.00" inputTorque="6692.15" torqueLoss="230.61" />
-            <Entry inputSpeed="3250.00" inputTorque="7009.36" torqueLoss="240.13" />
-            <Entry inputSpeed="3250.00" inputTorque="7326.57" torqueLoss="249.64" />
-            <Entry inputSpeed="3250.00" inputTorque="7643.77" torqueLoss="259.16" />
-            <Entry inputSpeed="3250.00" inputTorque="7960.98" torqueLoss="268.68" />
-            <Entry inputSpeed="0.00" inputTorque="-31.96" torqueLoss="31.96" />
-            <Entry inputSpeed="0.00" inputTorque="-70.42" torqueLoss="31.96" />
-            <Entry inputSpeed="0.00" inputTorque="-110.07" torqueLoss="33.15" />
-            <Entry inputSpeed="0.00" inputTorque="-149.72" torqueLoss="34.34" />
-            <Entry inputSpeed="0.00" inputTorque="-189.37" torqueLoss="35.53" />
-            <Entry inputSpeed="0.00" inputTorque="-268.68" torqueLoss="37.91" />
-            <Entry inputSpeed="0.00" inputTorque="-347.98" torqueLoss="40.29" />
-            <Entry inputSpeed="0.00" inputTorque="-506.58" torqueLoss="45.04" />
-            <Entry inputSpeed="0.00" inputTorque="-665.19" torqueLoss="49.80" />
-            <Entry inputSpeed="0.00" inputTorque="-823.79" torqueLoss="54.56" />
-            <Entry inputSpeed="0.00" inputTorque="-982.39" torqueLoss="59.32" />
-            <Entry inputSpeed="0.00" inputTorque="-1141.00" torqueLoss="64.08" />
-            <Entry inputSpeed="0.00" inputTorque="-1299.60" torqueLoss="68.83" />
-            <Entry inputSpeed="0.00" inputTorque="-1458.21" torqueLoss="73.59" />
-            <Entry inputSpeed="0.00" inputTorque="-1616.81" torqueLoss="78.35" />
-            <Entry inputSpeed="0.00" inputTorque="-1934.02" torqueLoss="87.87" />
-            <Entry inputSpeed="0.00" inputTorque="-2251.23" torqueLoss="97.38" />
-            <Entry inputSpeed="0.00" inputTorque="-2568.44" torqueLoss="106.90" />
-            <Entry inputSpeed="0.00" inputTorque="-2885.65" torqueLoss="116.42" />
-            <Entry inputSpeed="0.00" inputTorque="-3202.85" torqueLoss="125.93" />
-            <Entry inputSpeed="0.00" inputTorque="-3520.06" torqueLoss="135.45" />
-            <Entry inputSpeed="0.00" inputTorque="-3837.27" torqueLoss="144.96" />
-            <Entry inputSpeed="0.00" inputTorque="-4154.48" torqueLoss="154.48" />
-            <Entry inputSpeed="0.00" inputTorque="-4471.69" torqueLoss="164.00" />
-            <Entry inputSpeed="0.00" inputTorque="-4788.90" torqueLoss="173.51" />
-            <Entry inputSpeed="0.00" inputTorque="-5106.11" torqueLoss="183.03" />
-            <Entry inputSpeed="0.00" inputTorque="-5423.31" torqueLoss="192.55" />
-            <Entry inputSpeed="0.00" inputTorque="-5740.52" torqueLoss="202.06" />
-            <Entry inputSpeed="0.00" inputTorque="-6057.73" torqueLoss="211.58" />
-            <Entry inputSpeed="0.00" inputTorque="-6374.94" torqueLoss="221.09" />
-            <Entry inputSpeed="0.00" inputTorque="-6692.15" torqueLoss="230.61" />
-            <Entry inputSpeed="0.00" inputTorque="-7009.36" torqueLoss="240.13" />
-            <Entry inputSpeed="0.00" inputTorque="-7326.57" torqueLoss="249.64" />
-            <Entry inputSpeed="0.00" inputTorque="-7643.77" torqueLoss="259.16" />
-            <Entry inputSpeed="0.00" inputTorque="-7960.98" torqueLoss="268.68" />
-            <Entry inputSpeed="325.00" inputTorque="-31.96" torqueLoss="31.96" />
-            <Entry inputSpeed="325.00" inputTorque="-70.42" torqueLoss="31.96" />
-            <Entry inputSpeed="325.00" inputTorque="-110.07" torqueLoss="33.15" />
-            <Entry inputSpeed="325.00" inputTorque="-149.72" torqueLoss="34.34" />
-            <Entry inputSpeed="325.00" inputTorque="-189.37" torqueLoss="35.53" />
-            <Entry inputSpeed="325.00" inputTorque="-268.68" torqueLoss="37.91" />
-            <Entry inputSpeed="325.00" inputTorque="-347.98" torqueLoss="40.29" />
-            <Entry inputSpeed="325.00" inputTorque="-506.58" torqueLoss="45.04" />
-            <Entry inputSpeed="325.00" inputTorque="-665.19" torqueLoss="49.80" />
-            <Entry inputSpeed="325.00" inputTorque="-823.79" torqueLoss="54.56" />
-            <Entry inputSpeed="325.00" inputTorque="-982.39" torqueLoss="59.32" />
-            <Entry inputSpeed="325.00" inputTorque="-1141.00" torqueLoss="64.08" />
-            <Entry inputSpeed="325.00" inputTorque="-1299.60" torqueLoss="68.83" />
-            <Entry inputSpeed="325.00" inputTorque="-1458.21" torqueLoss="73.59" />
-            <Entry inputSpeed="325.00" inputTorque="-1616.81" torqueLoss="78.35" />
-            <Entry inputSpeed="325.00" inputTorque="-1934.02" torqueLoss="87.87" />
-            <Entry inputSpeed="325.00" inputTorque="-2251.23" torqueLoss="97.38" />
-            <Entry inputSpeed="325.00" inputTorque="-2568.44" torqueLoss="106.90" />
-            <Entry inputSpeed="325.00" inputTorque="-2885.65" torqueLoss="116.42" />
-            <Entry inputSpeed="325.00" inputTorque="-3202.85" torqueLoss="125.93" />
-            <Entry inputSpeed="325.00" inputTorque="-3520.06" torqueLoss="135.45" />
-            <Entry inputSpeed="325.00" inputTorque="-3837.27" torqueLoss="144.96" />
-            <Entry inputSpeed="325.00" inputTorque="-4154.48" torqueLoss="154.48" />
-            <Entry inputSpeed="325.00" inputTorque="-4471.69" torqueLoss="164.00" />
-            <Entry inputSpeed="325.00" inputTorque="-4788.90" torqueLoss="173.51" />
-            <Entry inputSpeed="325.00" inputTorque="-5106.11" torqueLoss="183.03" />
-            <Entry inputSpeed="325.00" inputTorque="-5423.31" torqueLoss="192.55" />
-            <Entry inputSpeed="325.00" inputTorque="-5740.52" torqueLoss="202.06" />
-            <Entry inputSpeed="325.00" inputTorque="-6057.73" torqueLoss="211.58" />
-            <Entry inputSpeed="325.00" inputTorque="-6374.94" torqueLoss="221.09" />
-            <Entry inputSpeed="325.00" inputTorque="-6692.15" torqueLoss="230.61" />
-            <Entry inputSpeed="325.00" inputTorque="-7009.36" torqueLoss="240.13" />
-            <Entry inputSpeed="325.00" inputTorque="-7326.57" torqueLoss="249.64" />
-            <Entry inputSpeed="325.00" inputTorque="-7643.77" torqueLoss="259.16" />
-            <Entry inputSpeed="325.00" inputTorque="-7960.98" torqueLoss="268.68" />
-            <Entry inputSpeed="650.00" inputTorque="-31.96" torqueLoss="31.96" />
-            <Entry inputSpeed="650.00" inputTorque="-70.42" torqueLoss="31.96" />
-            <Entry inputSpeed="650.00" inputTorque="-110.07" torqueLoss="33.15" />
-            <Entry inputSpeed="650.00" inputTorque="-149.72" torqueLoss="34.34" />
-            <Entry inputSpeed="650.00" inputTorque="-189.37" torqueLoss="35.53" />
-            <Entry inputSpeed="650.00" inputTorque="-268.68" torqueLoss="37.91" />
-            <Entry inputSpeed="650.00" inputTorque="-347.98" torqueLoss="40.29" />
-            <Entry inputSpeed="650.00" inputTorque="-506.58" torqueLoss="45.04" />
-            <Entry inputSpeed="650.00" inputTorque="-665.19" torqueLoss="49.80" />
-            <Entry inputSpeed="650.00" inputTorque="-823.79" torqueLoss="54.56" />
-            <Entry inputSpeed="650.00" inputTorque="-982.39" torqueLoss="59.32" />
-            <Entry inputSpeed="650.00" inputTorque="-1141.00" torqueLoss="64.08" />
-            <Entry inputSpeed="650.00" inputTorque="-1299.60" torqueLoss="68.83" />
-            <Entry inputSpeed="650.00" inputTorque="-1458.21" torqueLoss="73.59" />
-            <Entry inputSpeed="650.00" inputTorque="-1616.81" torqueLoss="78.35" />
-            <Entry inputSpeed="650.00" inputTorque="-1934.02" torqueLoss="87.87" />
-            <Entry inputSpeed="650.00" inputTorque="-2251.23" torqueLoss="97.38" />
-            <Entry inputSpeed="650.00" inputTorque="-2568.44" torqueLoss="106.90" />
-            <Entry inputSpeed="650.00" inputTorque="-2885.65" torqueLoss="116.42" />
-            <Entry inputSpeed="650.00" inputTorque="-3202.85" torqueLoss="125.93" />
-            <Entry inputSpeed="650.00" inputTorque="-3520.06" torqueLoss="135.45" />
-            <Entry inputSpeed="650.00" inputTorque="-3837.27" torqueLoss="144.96" />
-            <Entry inputSpeed="650.00" inputTorque="-4154.48" torqueLoss="154.48" />
-            <Entry inputSpeed="650.00" inputTorque="-4471.69" torqueLoss="164.00" />
-            <Entry inputSpeed="650.00" inputTorque="-4788.90" torqueLoss="173.51" />
-            <Entry inputSpeed="650.00" inputTorque="-5106.11" torqueLoss="183.03" />
-            <Entry inputSpeed="650.00" inputTorque="-5423.31" torqueLoss="192.55" />
-            <Entry inputSpeed="650.00" inputTorque="-5740.52" torqueLoss="202.06" />
-            <Entry inputSpeed="650.00" inputTorque="-6057.73" torqueLoss="211.58" />
-            <Entry inputSpeed="650.00" inputTorque="-6374.94" torqueLoss="221.09" />
-            <Entry inputSpeed="650.00" inputTorque="-6692.15" torqueLoss="230.61" />
-            <Entry inputSpeed="650.00" inputTorque="-7009.36" torqueLoss="240.13" />
-            <Entry inputSpeed="650.00" inputTorque="-7326.57" torqueLoss="249.64" />
-            <Entry inputSpeed="650.00" inputTorque="-7643.77" torqueLoss="259.16" />
-            <Entry inputSpeed="650.00" inputTorque="-7960.98" torqueLoss="268.68" />
-            <Entry inputSpeed="975.00" inputTorque="-31.96" torqueLoss="31.96" />
-            <Entry inputSpeed="975.00" inputTorque="-70.42" torqueLoss="31.96" />
-            <Entry inputSpeed="975.00" inputTorque="-110.07" torqueLoss="33.15" />
-            <Entry inputSpeed="975.00" inputTorque="-149.72" torqueLoss="34.34" />
-            <Entry inputSpeed="975.00" inputTorque="-189.37" torqueLoss="35.53" />
-            <Entry inputSpeed="975.00" inputTorque="-268.68" torqueLoss="37.91" />
-            <Entry inputSpeed="975.00" inputTorque="-347.98" torqueLoss="40.29" />
-            <Entry inputSpeed="975.00" inputTorque="-506.58" torqueLoss="45.04" />
-            <Entry inputSpeed="975.00" inputTorque="-665.19" torqueLoss="49.80" />
-            <Entry inputSpeed="975.00" inputTorque="-823.79" torqueLoss="54.56" />
-            <Entry inputSpeed="975.00" inputTorque="-982.39" torqueLoss="59.32" />
-            <Entry inputSpeed="975.00" inputTorque="-1141.00" torqueLoss="64.08" />
-            <Entry inputSpeed="975.00" inputTorque="-1299.60" torqueLoss="68.83" />
-            <Entry inputSpeed="975.00" inputTorque="-1458.21" torqueLoss="73.59" />
-            <Entry inputSpeed="975.00" inputTorque="-1616.81" torqueLoss="78.35" />
-            <Entry inputSpeed="975.00" inputTorque="-1934.02" torqueLoss="87.87" />
-            <Entry inputSpeed="975.00" inputTorque="-2251.23" torqueLoss="97.38" />
-            <Entry inputSpeed="975.00" inputTorque="-2568.44" torqueLoss="106.90" />
-            <Entry inputSpeed="975.00" inputTorque="-2885.65" torqueLoss="116.42" />
-            <Entry inputSpeed="975.00" inputTorque="-3202.85" torqueLoss="125.93" />
-            <Entry inputSpeed="975.00" inputTorque="-3520.06" torqueLoss="135.45" />
-            <Entry inputSpeed="975.00" inputTorque="-3837.27" torqueLoss="144.96" />
-            <Entry inputSpeed="975.00" inputTorque="-4154.48" torqueLoss="154.48" />
-            <Entry inputSpeed="975.00" inputTorque="-4471.69" torqueLoss="164.00" />
-            <Entry inputSpeed="975.00" inputTorque="-4788.90" torqueLoss="173.51" />
-            <Entry inputSpeed="975.00" inputTorque="-5106.11" torqueLoss="183.03" />
-            <Entry inputSpeed="975.00" inputTorque="-5423.31" torqueLoss="192.55" />
-            <Entry inputSpeed="975.00" inputTorque="-5740.52" torqueLoss="202.06" />
-            <Entry inputSpeed="975.00" inputTorque="-6057.73" torqueLoss="211.58" />
-            <Entry inputSpeed="975.00" inputTorque="-6374.94" torqueLoss="221.09" />
-            <Entry inputSpeed="975.00" inputTorque="-6692.15" torqueLoss="230.61" />
-            <Entry inputSpeed="975.00" inputTorque="-7009.36" torqueLoss="240.13" />
-            <Entry inputSpeed="975.00" inputTorque="-7326.57" torqueLoss="249.64" />
-            <Entry inputSpeed="975.00" inputTorque="-7643.77" torqueLoss="259.16" />
-            <Entry inputSpeed="975.00" inputTorque="-7960.98" torqueLoss="268.68" />
-            <Entry inputSpeed="1300.00" inputTorque="-31.96" torqueLoss="31.96" />
-            <Entry inputSpeed="1300.00" inputTorque="-70.42" torqueLoss="31.96" />
-            <Entry inputSpeed="1300.00" inputTorque="-110.07" torqueLoss="33.15" />
-            <Entry inputSpeed="1300.00" inputTorque="-149.72" torqueLoss="34.34" />
-            <Entry inputSpeed="1300.00" inputTorque="-189.37" torqueLoss="35.53" />
-            <Entry inputSpeed="1300.00" inputTorque="-268.68" torqueLoss="37.91" />
-            <Entry inputSpeed="1300.00" inputTorque="-347.98" torqueLoss="40.29" />
-            <Entry inputSpeed="1300.00" inputTorque="-506.58" torqueLoss="45.04" />
-            <Entry inputSpeed="1300.00" inputTorque="-665.19" torqueLoss="49.80" />
-            <Entry inputSpeed="1300.00" inputTorque="-823.79" torqueLoss="54.56" />
-            <Entry inputSpeed="1300.00" inputTorque="-982.39" torqueLoss="59.32" />
-            <Entry inputSpeed="1300.00" inputTorque="-1141.00" torqueLoss="64.08" />
-            <Entry inputSpeed="1300.00" inputTorque="-1299.60" torqueLoss="68.83" />
-            <Entry inputSpeed="1300.00" inputTorque="-1458.21" torqueLoss="73.59" />
-            <Entry inputSpeed="1300.00" inputTorque="-1616.81" torqueLoss="78.35" />
-            <Entry inputSpeed="1300.00" inputTorque="-1934.02" torqueLoss="87.87" />
-            <Entry inputSpeed="1300.00" inputTorque="-2251.23" torqueLoss="97.38" />
-            <Entry inputSpeed="1300.00" inputTorque="-2568.44" torqueLoss="106.90" />
-            <Entry inputSpeed="1300.00" inputTorque="-2885.65" torqueLoss="116.42" />
-            <Entry inputSpeed="1300.00" inputTorque="-3202.85" torqueLoss="125.93" />
-            <Entry inputSpeed="1300.00" inputTorque="-3520.06" torqueLoss="135.45" />
-            <Entry inputSpeed="1300.00" inputTorque="-3837.27" torqueLoss="144.96" />
-            <Entry inputSpeed="1300.00" inputTorque="-4154.48" torqueLoss="154.48" />
-            <Entry inputSpeed="1300.00" inputTorque="-4471.69" torqueLoss="164.00" />
-            <Entry inputSpeed="1300.00" inputTorque="-4788.90" torqueLoss="173.51" />
-            <Entry inputSpeed="1300.00" inputTorque="-5106.11" torqueLoss="183.03" />
-            <Entry inputSpeed="1300.00" inputTorque="-5423.31" torqueLoss="192.55" />
-            <Entry inputSpeed="1300.00" inputTorque="-5740.52" torqueLoss="202.06" />
-            <Entry inputSpeed="1300.00" inputTorque="-6057.73" torqueLoss="211.58" />
-            <Entry inputSpeed="1300.00" inputTorque="-6374.94" torqueLoss="221.09" />
-            <Entry inputSpeed="1300.00" inputTorque="-6692.15" torqueLoss="230.61" />
-            <Entry inputSpeed="1300.00" inputTorque="-7009.36" torqueLoss="240.13" />
-            <Entry inputSpeed="1300.00" inputTorque="-7326.57" torqueLoss="249.64" />
-            <Entry inputSpeed="1300.00" inputTorque="-7643.77" torqueLoss="259.16" />
-            <Entry inputSpeed="1300.00" inputTorque="-7960.98" torqueLoss="268.68" />
-            <Entry inputSpeed="1625.00" inputTorque="-31.96" torqueLoss="31.96" />
-            <Entry inputSpeed="1625.00" inputTorque="-70.42" torqueLoss="31.96" />
-            <Entry inputSpeed="1625.00" inputTorque="-110.07" torqueLoss="33.15" />
-            <Entry inputSpeed="1625.00" inputTorque="-149.72" torqueLoss="34.34" />
-            <Entry inputSpeed="1625.00" inputTorque="-189.37" torqueLoss="35.53" />
-            <Entry inputSpeed="1625.00" inputTorque="-268.68" torqueLoss="37.91" />
-            <Entry inputSpeed="1625.00" inputTorque="-347.98" torqueLoss="40.29" />
-            <Entry inputSpeed="1625.00" inputTorque="-506.58" torqueLoss="45.04" />
-            <Entry inputSpeed="1625.00" inputTorque="-665.19" torqueLoss="49.80" />
-            <Entry inputSpeed="1625.00" inputTorque="-823.79" torqueLoss="54.56" />
-            <Entry inputSpeed="1625.00" inputTorque="-982.39" torqueLoss="59.32" />
-            <Entry inputSpeed="1625.00" inputTorque="-1141.00" torqueLoss="64.08" />
-            <Entry inputSpeed="1625.00" inputTorque="-1299.60" torqueLoss="68.83" />
-            <Entry inputSpeed="1625.00" inputTorque="-1458.21" torqueLoss="73.59" />
-            <Entry inputSpeed="1625.00" inputTorque="-1616.81" torqueLoss="78.35" />
-            <Entry inputSpeed="1625.00" inputTorque="-1934.02" torqueLoss="87.87" />
-            <Entry inputSpeed="1625.00" inputTorque="-2251.23" torqueLoss="97.38" />
-            <Entry inputSpeed="1625.00" inputTorque="-2568.44" torqueLoss="106.90" />
-            <Entry inputSpeed="1625.00" inputTorque="-2885.65" torqueLoss="116.42" />
-            <Entry inputSpeed="1625.00" inputTorque="-3202.85" torqueLoss="125.93" />
-            <Entry inputSpeed="1625.00" inputTorque="-3520.06" torqueLoss="135.45" />
-            <Entry inputSpeed="1625.00" inputTorque="-3837.27" torqueLoss="144.96" />
-            <Entry inputSpeed="1625.00" inputTorque="-4154.48" torqueLoss="154.48" />
-            <Entry inputSpeed="1625.00" inputTorque="-4471.69" torqueLoss="164.00" />
-            <Entry inputSpeed="1625.00" inputTorque="-4788.90" torqueLoss="173.51" />
-            <Entry inputSpeed="1625.00" inputTorque="-5106.11" torqueLoss="183.03" />
-            <Entry inputSpeed="1625.00" inputTorque="-5423.31" torqueLoss="192.55" />
-            <Entry inputSpeed="1625.00" inputTorque="-5740.52" torqueLoss="202.06" />
-            <Entry inputSpeed="1625.00" inputTorque="-6057.73" torqueLoss="211.58" />
-            <Entry inputSpeed="1625.00" inputTorque="-6374.94" torqueLoss="221.09" />
-            <Entry inputSpeed="1625.00" inputTorque="-6692.15" torqueLoss="230.61" />
-            <Entry inputSpeed="1625.00" inputTorque="-7009.36" torqueLoss="240.13" />
-            <Entry inputSpeed="1625.00" inputTorque="-7326.57" torqueLoss="249.64" />
-            <Entry inputSpeed="1625.00" inputTorque="-7643.77" torqueLoss="259.16" />
-            <Entry inputSpeed="1625.00" inputTorque="-7960.98" torqueLoss="268.68" />
-            <Entry inputSpeed="1950.00" inputTorque="-31.96" torqueLoss="31.96" />
-            <Entry inputSpeed="1950.00" inputTorque="-70.42" torqueLoss="31.96" />
-            <Entry inputSpeed="1950.00" inputTorque="-110.07" torqueLoss="33.15" />
-            <Entry inputSpeed="1950.00" inputTorque="-149.72" torqueLoss="34.34" />
-            <Entry inputSpeed="1950.00" inputTorque="-189.37" torqueLoss="35.53" />
-            <Entry inputSpeed="1950.00" inputTorque="-268.68" torqueLoss="37.91" />
-            <Entry inputSpeed="1950.00" inputTorque="-347.98" torqueLoss="40.29" />
-            <Entry inputSpeed="1950.00" inputTorque="-506.58" torqueLoss="45.04" />
-            <Entry inputSpeed="1950.00" inputTorque="-665.19" torqueLoss="49.80" />
-            <Entry inputSpeed="1950.00" inputTorque="-823.79" torqueLoss="54.56" />
-            <Entry inputSpeed="1950.00" inputTorque="-982.39" torqueLoss="59.32" />
-            <Entry inputSpeed="1950.00" inputTorque="-1141.00" torqueLoss="64.08" />
-            <Entry inputSpeed="1950.00" inputTorque="-1299.60" torqueLoss="68.83" />
-            <Entry inputSpeed="1950.00" inputTorque="-1458.21" torqueLoss="73.59" />
-            <Entry inputSpeed="1950.00" inputTorque="-1616.81" torqueLoss="78.35" />
-            <Entry inputSpeed="1950.00" inputTorque="-1934.02" torqueLoss="87.87" />
-            <Entry inputSpeed="1950.00" inputTorque="-2251.23" torqueLoss="97.38" />
-            <Entry inputSpeed="1950.00" inputTorque="-2568.44" torqueLoss="106.90" />
-            <Entry inputSpeed="1950.00" inputTorque="-2885.65" torqueLoss="116.42" />
-            <Entry inputSpeed="1950.00" inputTorque="-3202.85" torqueLoss="125.93" />
-            <Entry inputSpeed="1950.00" inputTorque="-3520.06" torqueLoss="135.45" />
-            <Entry inputSpeed="1950.00" inputTorque="-3837.27" torqueLoss="144.96" />
-            <Entry inputSpeed="1950.00" inputTorque="-4154.48" torqueLoss="154.48" />
-            <Entry inputSpeed="1950.00" inputTorque="-4471.69" torqueLoss="164.00" />
-            <Entry inputSpeed="1950.00" inputTorque="-4788.90" torqueLoss="173.51" />
-            <Entry inputSpeed="1950.00" inputTorque="-5106.11" torqueLoss="183.03" />
-            <Entry inputSpeed="1950.00" inputTorque="-5423.31" torqueLoss="192.55" />
-            <Entry inputSpeed="1950.00" inputTorque="-5740.52" torqueLoss="202.06" />
-            <Entry inputSpeed="1950.00" inputTorque="-6057.73" torqueLoss="211.58" />
-            <Entry inputSpeed="1950.00" inputTorque="-6374.94" torqueLoss="221.09" />
-            <Entry inputSpeed="1950.00" inputTorque="-6692.15" torqueLoss="230.61" />
-            <Entry inputSpeed="1950.00" inputTorque="-7009.36" torqueLoss="240.13" />
-            <Entry inputSpeed="1950.00" inputTorque="-7326.57" torqueLoss="249.64" />
-            <Entry inputSpeed="1950.00" inputTorque="-7643.77" torqueLoss="259.16" />
-            <Entry inputSpeed="1950.00" inputTorque="-7960.98" torqueLoss="268.68" />
-            <Entry inputSpeed="2275.00" inputTorque="-31.96" torqueLoss="31.96" />
-            <Entry inputSpeed="2275.00" inputTorque="-70.42" torqueLoss="31.96" />
-            <Entry inputSpeed="2275.00" inputTorque="-110.07" torqueLoss="33.15" />
-            <Entry inputSpeed="2275.00" inputTorque="-149.72" torqueLoss="34.34" />
-            <Entry inputSpeed="2275.00" inputTorque="-189.37" torqueLoss="35.53" />
-            <Entry inputSpeed="2275.00" inputTorque="-268.68" torqueLoss="37.91" />
-            <Entry inputSpeed="2275.00" inputTorque="-347.98" torqueLoss="40.29" />
-            <Entry inputSpeed="2275.00" inputTorque="-506.58" torqueLoss="45.04" />
-            <Entry inputSpeed="2275.00" inputTorque="-665.19" torqueLoss="49.80" />
-            <Entry inputSpeed="2275.00" inputTorque="-823.79" torqueLoss="54.56" />
-            <Entry inputSpeed="2275.00" inputTorque="-982.39" torqueLoss="59.32" />
-            <Entry inputSpeed="2275.00" inputTorque="-1141.00" torqueLoss="64.08" />
-            <Entry inputSpeed="2275.00" inputTorque="-1299.60" torqueLoss="68.83" />
-            <Entry inputSpeed="2275.00" inputTorque="-1458.21" torqueLoss="73.59" />
-            <Entry inputSpeed="2275.00" inputTorque="-1616.81" torqueLoss="78.35" />
-            <Entry inputSpeed="2275.00" inputTorque="-1934.02" torqueLoss="87.87" />
-            <Entry inputSpeed="2275.00" inputTorque="-2251.23" torqueLoss="97.38" />
-            <Entry inputSpeed="2275.00" inputTorque="-2568.44" torqueLoss="106.90" />
-            <Entry inputSpeed="2275.00" inputTorque="-2885.65" torqueLoss="116.42" />
-            <Entry inputSpeed="2275.00" inputTorque="-3202.85" torqueLoss="125.93" />
-            <Entry inputSpeed="2275.00" inputTorque="-3520.06" torqueLoss="135.45" />
-            <Entry inputSpeed="2275.00" inputTorque="-3837.27" torqueLoss="144.96" />
-            <Entry inputSpeed="2275.00" inputTorque="-4154.48" torqueLoss="154.48" />
-            <Entry inputSpeed="2275.00" inputTorque="-4471.69" torqueLoss="164.00" />
-            <Entry inputSpeed="2275.00" inputTorque="-4788.90" torqueLoss="173.51" />
-            <Entry inputSpeed="2275.00" inputTorque="-5106.11" torqueLoss="183.03" />
-            <Entry inputSpeed="2275.00" inputTorque="-5423.31" torqueLoss="192.55" />
-            <Entry inputSpeed="2275.00" inputTorque="-5740.52" torqueLoss="202.06" />
-            <Entry inputSpeed="2275.00" inputTorque="-6057.73" torqueLoss="211.58" />
-            <Entry inputSpeed="2275.00" inputTorque="-6374.94" torqueLoss="221.09" />
-            <Entry inputSpeed="2275.00" inputTorque="-6692.15" torqueLoss="230.61" />
-            <Entry inputSpeed="2275.00" inputTorque="-7009.36" torqueLoss="240.13" />
-            <Entry inputSpeed="2275.00" inputTorque="-7326.57" torqueLoss="249.64" />
-            <Entry inputSpeed="2275.00" inputTorque="-7643.77" torqueLoss="259.16" />
-            <Entry inputSpeed="2275.00" inputTorque="-7960.98" torqueLoss="268.68" />
-            <Entry inputSpeed="2600.00" inputTorque="-31.96" torqueLoss="31.96" />
-            <Entry inputSpeed="2600.00" inputTorque="-70.42" torqueLoss="31.96" />
-            <Entry inputSpeed="2600.00" inputTorque="-110.07" torqueLoss="33.15" />
-            <Entry inputSpeed="2600.00" inputTorque="-149.72" torqueLoss="34.34" />
-            <Entry inputSpeed="2600.00" inputTorque="-189.37" torqueLoss="35.53" />
-            <Entry inputSpeed="2600.00" inputTorque="-268.68" torqueLoss="37.91" />
-            <Entry inputSpeed="2600.00" inputTorque="-347.98" torqueLoss="40.29" />
-            <Entry inputSpeed="2600.00" inputTorque="-506.58" torqueLoss="45.04" />
-            <Entry inputSpeed="2600.00" inputTorque="-665.19" torqueLoss="49.80" />
-            <Entry inputSpeed="2600.00" inputTorque="-823.79" torqueLoss="54.56" />
-            <Entry inputSpeed="2600.00" inputTorque="-982.39" torqueLoss="59.32" />
-            <Entry inputSpeed="2600.00" inputTorque="-1141.00" torqueLoss="64.08" />
-            <Entry inputSpeed="2600.00" inputTorque="-1299.60" torqueLoss="68.83" />
-            <Entry inputSpeed="2600.00" inputTorque="-1458.21" torqueLoss="73.59" />
-            <Entry inputSpeed="2600.00" inputTorque="-1616.81" torqueLoss="78.35" />
-            <Entry inputSpeed="2600.00" inputTorque="-1934.02" torqueLoss="87.87" />
-            <Entry inputSpeed="2600.00" inputTorque="-2251.23" torqueLoss="97.38" />
-            <Entry inputSpeed="2600.00" inputTorque="-2568.44" torqueLoss="106.90" />
-            <Entry inputSpeed="2600.00" inputTorque="-2885.65" torqueLoss="116.42" />
-            <Entry inputSpeed="2600.00" inputTorque="-3202.85" torqueLoss="125.93" />
-            <Entry inputSpeed="2600.00" inputTorque="-3520.06" torqueLoss="135.45" />
-            <Entry inputSpeed="2600.00" inputTorque="-3837.27" torqueLoss="144.96" />
-            <Entry inputSpeed="2600.00" inputTorque="-4154.48" torqueLoss="154.48" />
-            <Entry inputSpeed="2600.00" inputTorque="-4471.69" torqueLoss="164.00" />
-            <Entry inputSpeed="2600.00" inputTorque="-4788.90" torqueLoss="173.51" />
-            <Entry inputSpeed="2600.00" inputTorque="-5106.11" torqueLoss="183.03" />
-            <Entry inputSpeed="2600.00" inputTorque="-5423.31" torqueLoss="192.55" />
-            <Entry inputSpeed="2600.00" inputTorque="-5740.52" torqueLoss="202.06" />
-            <Entry inputSpeed="2600.00" inputTorque="-6057.73" torqueLoss="211.58" />
-            <Entry inputSpeed="2600.00" inputTorque="-6374.94" torqueLoss="221.09" />
-            <Entry inputSpeed="2600.00" inputTorque="-6692.15" torqueLoss="230.61" />
-            <Entry inputSpeed="2600.00" inputTorque="-7009.36" torqueLoss="240.13" />
-            <Entry inputSpeed="2600.00" inputTorque="-7326.57" torqueLoss="249.64" />
-            <Entry inputSpeed="2600.00" inputTorque="-7643.77" torqueLoss="259.16" />
-            <Entry inputSpeed="2600.00" inputTorque="-7960.98" torqueLoss="268.68" />
-            <Entry inputSpeed="2925.00" inputTorque="-31.96" torqueLoss="31.96" />
-            <Entry inputSpeed="2925.00" inputTorque="-70.42" torqueLoss="31.96" />
-            <Entry inputSpeed="2925.00" inputTorque="-110.07" torqueLoss="33.15" />
-            <Entry inputSpeed="2925.00" inputTorque="-149.72" torqueLoss="34.34" />
-            <Entry inputSpeed="2925.00" inputTorque="-189.37" torqueLoss="35.53" />
-            <Entry inputSpeed="2925.00" inputTorque="-268.68" torqueLoss="37.91" />
-            <Entry inputSpeed="2925.00" inputTorque="-347.98" torqueLoss="40.29" />
-            <Entry inputSpeed="2925.00" inputTorque="-506.58" torqueLoss="45.04" />
-            <Entry inputSpeed="2925.00" inputTorque="-665.19" torqueLoss="49.80" />
-            <Entry inputSpeed="2925.00" inputTorque="-823.79" torqueLoss="54.56" />
-            <Entry inputSpeed="2925.00" inputTorque="-982.39" torqueLoss="59.32" />
-            <Entry inputSpeed="2925.00" inputTorque="-1141.00" torqueLoss="64.08" />
-            <Entry inputSpeed="2925.00" inputTorque="-1299.60" torqueLoss="68.83" />
-            <Entry inputSpeed="2925.00" inputTorque="-1458.21" torqueLoss="73.59" />
-            <Entry inputSpeed="2925.00" inputTorque="-1616.81" torqueLoss="78.35" />
-            <Entry inputSpeed="2925.00" inputTorque="-1934.02" torqueLoss="87.87" />
-            <Entry inputSpeed="2925.00" inputTorque="-2251.23" torqueLoss="97.38" />
-            <Entry inputSpeed="2925.00" inputTorque="-2568.44" torqueLoss="106.90" />
-            <Entry inputSpeed="2925.00" inputTorque="-2885.65" torqueLoss="116.42" />
-            <Entry inputSpeed="2925.00" inputTorque="-3202.85" torqueLoss="125.93" />
-            <Entry inputSpeed="2925.00" inputTorque="-3520.06" torqueLoss="135.45" />
-            <Entry inputSpeed="2925.00" inputTorque="-3837.27" torqueLoss="144.96" />
-            <Entry inputSpeed="2925.00" inputTorque="-4154.48" torqueLoss="154.48" />
-            <Entry inputSpeed="2925.00" inputTorque="-4471.69" torqueLoss="164.00" />
-            <Entry inputSpeed="2925.00" inputTorque="-4788.90" torqueLoss="173.51" />
-            <Entry inputSpeed="2925.00" inputTorque="-5106.11" torqueLoss="183.03" />
-            <Entry inputSpeed="2925.00" inputTorque="-5423.31" torqueLoss="192.55" />
-            <Entry inputSpeed="2925.00" inputTorque="-5740.52" torqueLoss="202.06" />
-            <Entry inputSpeed="2925.00" inputTorque="-6057.73" torqueLoss="211.58" />
-            <Entry inputSpeed="2925.00" inputTorque="-6374.94" torqueLoss="221.09" />
-            <Entry inputSpeed="2925.00" inputTorque="-6692.15" torqueLoss="230.61" />
-            <Entry inputSpeed="2925.00" inputTorque="-7009.36" torqueLoss="240.13" />
-            <Entry inputSpeed="2925.00" inputTorque="-7326.57" torqueLoss="249.64" />
-            <Entry inputSpeed="2925.00" inputTorque="-7643.77" torqueLoss="259.16" />
-            <Entry inputSpeed="2925.00" inputTorque="-7960.98" torqueLoss="268.68" />
-            <Entry inputSpeed="3250.00" inputTorque="-31.96" torqueLoss="31.96" />
-            <Entry inputSpeed="3250.00" inputTorque="-70.42" torqueLoss="31.96" />
-            <Entry inputSpeed="3250.00" inputTorque="-110.07" torqueLoss="33.15" />
-            <Entry inputSpeed="3250.00" inputTorque="-149.72" torqueLoss="34.34" />
-            <Entry inputSpeed="3250.00" inputTorque="-189.37" torqueLoss="35.53" />
-            <Entry inputSpeed="3250.00" inputTorque="-268.68" torqueLoss="37.91" />
-            <Entry inputSpeed="3250.00" inputTorque="-347.98" torqueLoss="40.29" />
-            <Entry inputSpeed="3250.00" inputTorque="-506.58" torqueLoss="45.04" />
-            <Entry inputSpeed="3250.00" inputTorque="-665.19" torqueLoss="49.80" />
-            <Entry inputSpeed="3250.00" inputTorque="-823.79" torqueLoss="54.56" />
-            <Entry inputSpeed="3250.00" inputTorque="-982.39" torqueLoss="59.32" />
-            <Entry inputSpeed="3250.00" inputTorque="-1141.00" torqueLoss="64.08" />
-            <Entry inputSpeed="3250.00" inputTorque="-1299.60" torqueLoss="68.83" />
-            <Entry inputSpeed="3250.00" inputTorque="-1458.21" torqueLoss="73.59" />
-            <Entry inputSpeed="3250.00" inputTorque="-1616.81" torqueLoss="78.35" />
-            <Entry inputSpeed="3250.00" inputTorque="-1934.02" torqueLoss="87.87" />
-            <Entry inputSpeed="3250.00" inputTorque="-2251.23" torqueLoss="97.38" />
-            <Entry inputSpeed="3250.00" inputTorque="-2568.44" torqueLoss="106.90" />
-            <Entry inputSpeed="3250.00" inputTorque="-2885.65" torqueLoss="116.42" />
-            <Entry inputSpeed="3250.00" inputTorque="-3202.85" torqueLoss="125.93" />
-            <Entry inputSpeed="3250.00" inputTorque="-3520.06" torqueLoss="135.45" />
-            <Entry inputSpeed="3250.00" inputTorque="-3837.27" torqueLoss="144.96" />
-            <Entry inputSpeed="3250.00" inputTorque="-4154.48" torqueLoss="154.48" />
-            <Entry inputSpeed="3250.00" inputTorque="-4471.69" torqueLoss="164.00" />
-            <Entry inputSpeed="3250.00" inputTorque="-4788.90" torqueLoss="173.51" />
-            <Entry inputSpeed="3250.00" inputTorque="-5106.11" torqueLoss="183.03" />
-            <Entry inputSpeed="3250.00" inputTorque="-5423.31" torqueLoss="192.55" />
-            <Entry inputSpeed="3250.00" inputTorque="-5740.52" torqueLoss="202.06" />
-            <Entry inputSpeed="3250.00" inputTorque="-6057.73" torqueLoss="211.58" />
-            <Entry inputSpeed="3250.00" inputTorque="-6374.94" torqueLoss="221.09" />
-            <Entry inputSpeed="3250.00" inputTorque="-6692.15" torqueLoss="230.61" />
-            <Entry inputSpeed="3250.00" inputTorque="-7009.36" torqueLoss="240.13" />
-            <Entry inputSpeed="3250.00" inputTorque="-7326.57" torqueLoss="249.64" />
-            <Entry inputSpeed="3250.00" inputTorque="-7643.77" torqueLoss="259.16" />
-            <Entry inputSpeed="3250.00" inputTorque="-7960.98" torqueLoss="268.68" />
-          </TorqueLossMap>
-        </v2.0:Data>
-        <Signature>
-          <Reference URI="#AXLGEAR-6.500" 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></DigestValue>
-          </Reference>
-        </Signature>
-      </Axlegear>
-      <AxleWheels xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
-        <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="v2.0:TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
-                  <Manufacturer>TUG Generic</Manufacturer>
-                  <Model>315/70 R22.5</Model>
-                  <CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
-                  <Date>2019-02-27T09:39:05.3510849Z</Date>
-                  <AppVersion>VectoCore</AppVersion>
-                  <Dimension>315/70 R22.5</Dimension>
-                  <RRCDeclared>0.0055</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></DigestValue>
-                  </Reference>
-                </Signature>
-              </Tyre>
-            </Axle>
-            <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
-              <AxleType>VehicleDriven</AxleType>
-              <TwinTyres>true</TwinTyres>
-              <Steered>false</Steered>
-              <Tyre>
-                <v2.0:Data id="TYRE-315_70R22.5" xsi:type="v1.0:TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
-                  <Manufacturer>TUG Generic</Manufacturer>
-                  <Model>315/70 R22.5</Model>
-                  <CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
-                  <Date>2019-02-27T09:39:05.3510849Z</Date>
-                  <AppVersion>VectoCore</AppVersion>
-                  <Dimension>315/70 R22.5</Dimension>
-                  <RRCDeclared>0.0055</RRCDeclared>
-                  <FzISO>33350</FzISO>
-                </v2.0: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></DigestValue>
-                  </Reference>
-                </Signature>
-              </Tyre>
-            </Axle>
-            <Axle axleNumber="3" xsi:type="AxleDataDeclarationType">
-              <AxleType>VehicleNonDriven</AxleType>
-              <TwinTyres>false</TwinTyres>
-              <Steered>false</Steered>
-              <Tyre>
-                <v2.0:Data id="TYRE-315_70R22.5" xsi:type="v1.0:TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
-                  <Manufacturer>TUG Generic</Manufacturer>
-                  <Model>315/70 R22.5</Model>
-                  <CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
-                  <Date>2019-02-27T09:39:05.3510849Z</Date>
-                  <AppVersion>VectoCore</AppVersion>
-                  <Dimension>315/70 R22.5</Dimension>
-                  <RRCDeclared>0.0055</RRCDeclared>
-                  <FzISO>33350</FzISO>
-                </v2.0: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></DigestValue>
-                  </Reference>
-                </Signature>
-              </Tyre>
-            </Axle>
-          </Axles>
-        </Data>
-      </AxleWheels>
-      <Auxiliaries xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AuxiliariesComponentDeclarationType">
-        <Data xsi:type="AuxiliariesDataDeclarationType">
-          <Fan>
-            <Technology>Belt driven or driven via transm. - Electronically controlled visco clutch</Technology>
-          </Fan>
-          <SteeringPump>
-            <Technology>Fixed displacement</Technology>
-          </SteeringPump>
-          <ElectricSystem>
-            <Technology>Standard technology</Technology>
-          </ElectricSystem>
-          <PneumaticSystem>
-            <Technology>Medium Supply 2-stage + ESS + AMS</Technology>
-          </PneumaticSystem>
-          <HVAC>
-            <Technology>Default</Technology>
-          </HVAC>
-        </Data>
-      </Auxiliaries>
-      <AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AirDragComponentDeclarationType">
-        <Data id="Airdrag-N.A." xsi:type="AirDragDataDeclarationType">
-          <Manufacturer>TUG Generic</Manufacturer>
-          <Model>N.A.</Model>
-          <CertificationNumber>N.A.</CertificationNumber>
-          <Date>2019-02-27T09:39:05.3510849Z</Date>
-          <AppVersion>VectoCore</AppVersion>
-          <CdxA_0>5.80</CdxA_0>
-          <TransferredCdxA>5.80</TransferredCdxA>
-          <DeclaredCdxA>5.80</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></DigestValue>
-          </Reference>
-        </Signature>
-      </AirDrag>
-    </Components>
-  </v2.0:Vehicle>
-</tns:VectoInputDeclaration>
\ No newline at end of file
+			<!--<APTEcoRollReleaseLockupClutch>false</APTEcoRollReleaseLockupClutch>-->
+		</ADAS>
+		<Components xsi:type="v2.0:VehicleComponentsType">
+			<Engine xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="EngineComponentDeclarationType">
+				<Data id="ENG-Generic220kW7.7lEngine" xsi:type="EngineDataDeclarationType">
+					<Manufacturer>TUG Generic</Manufacturer>
+					<Model>Generic 220kW 7.7l Engine</Model>
+					<CertificationNumber>ENG-Generic 220kW 7.7l Engine</CertificationNumber>
+					<Date>2019-02-27T09:39:05.3241256Z</Date>
+					<AppVersion>VectoCore</AppVersion>
+					<Displacement>7700</Displacement>
+					<IdlingSpeed>600</IdlingSpeed>
+					<RatedSpeed>2200</RatedSpeed>
+					<RatedPower>219774</RatedPower>
+					<MaxEngineTorque>1200</MaxEngineTorque>
+					<WHTCUrban>1.0300</WHTCUrban>
+					<WHTCRural>1.0100</WHTCRural>
+					<WHTCMotorway>1.0000</WHTCMotorway>
+					<BFColdHot>1.0000</BFColdHot>
+					<CFRegPer>1.0000</CFRegPer>
+					<CFNCV>1.0000</CFNCV>
+					<FuelType>Diesel CI</FuelType>
+					<FuelConsumptionMap>
+						<Entry engineSpeed="600.00" torque="-144.58" fuelConsumption="0.00"/>
+						<Entry engineSpeed="600.00" torque="-44.58" fuelConsumption="0.00"/>
+						<Entry engineSpeed="600.00" torque="0.00" fuelConsumption="638.00"/>
+						<Entry engineSpeed="600.00" torque="70.00" fuelConsumption="1601.24"/>
+						<Entry engineSpeed="600.00" torque="100.00" fuelConsumption="2020.04"/>
+						<Entry engineSpeed="600.00" torque="200.00" fuelConsumption="3330.71"/>
+						<Entry engineSpeed="600.00" torque="300.00" fuelConsumption="4651.64"/>
+						<Entry engineSpeed="600.00" torque="400.00" fuelConsumption="5962.41"/>
+						<Entry engineSpeed="600.00" torque="500.00" fuelConsumption="7979.12"/>
+						<Entry engineSpeed="600.00" torque="600.00" fuelConsumption="10025.12"/>
+						<Entry engineSpeed="800.00" torque="-154.66" fuelConsumption="0.00"/>
+						<Entry engineSpeed="800.00" torque="-54.66" fuelConsumption="0.00"/>
+						<Entry engineSpeed="800.00" torque="0.00" fuelConsumption="914.26"/>
+						<Entry engineSpeed="800.00" torque="70.00" fuelConsumption="1862.24"/>
+						<Entry engineSpeed="800.00" torque="100.00" fuelConsumption="2367.75"/>
+						<Entry engineSpeed="800.00" torque="200.00" fuelConsumption="4006.79"/>
+						<Entry engineSpeed="800.00" torque="300.00" fuelConsumption="5667.98"/>
+						<Entry engineSpeed="800.00" torque="400.00" fuelConsumption="7335.35"/>
+						<Entry engineSpeed="800.00" torque="500.00" fuelConsumption="9511.02"/>
+						<Entry engineSpeed="800.00" torque="600.00" fuelConsumption="11650.65"/>
+						<Entry engineSpeed="800.00" torque="700.00" fuelConsumption="13773.98"/>
+						<Entry engineSpeed="800.00" torque="800.00" fuelConsumption="15797.43"/>
+						<Entry engineSpeed="800.00" torque="836.00" fuelConsumption="16529.92"/>
+						<Entry engineSpeed="1000.00" torque="-163.63" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1000.00" torque="-63.63" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1000.00" torque="0.00" fuelConsumption="1190.51"/>
+						<Entry engineSpeed="1000.00" torque="70.00" fuelConsumption="2123.23"/>
+						<Entry engineSpeed="1000.00" torque="100.00" fuelConsumption="2715.46"/>
+						<Entry engineSpeed="1000.00" torque="200.00" fuelConsumption="4682.86"/>
+						<Entry engineSpeed="1000.00" torque="300.00" fuelConsumption="6684.33"/>
+						<Entry engineSpeed="1000.00" torque="400.00" fuelConsumption="8708.28"/>
+						<Entry engineSpeed="1000.00" torque="500.00" fuelConsumption="11042.92"/>
+						<Entry engineSpeed="1000.00" torque="600.00" fuelConsumption="13276.18"/>
+						<Entry engineSpeed="1000.00" torque="700.00" fuelConsumption="15477.76"/>
+						<Entry engineSpeed="1000.00" torque="800.00" fuelConsumption="17682.68"/>
+						<Entry engineSpeed="1000.00" torque="900.00" fuelConsumption="19910.32"/>
+						<Entry engineSpeed="1000.00" torque="1000.00" fuelConsumption="22137.47"/>
+						<Entry engineSpeed="1000.00" torque="1070.00" fuelConsumption="23687.75"/>
+						<Entry engineSpeed="1200.00" torque="-174.94" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1200.00" torque="-74.94" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1200.00" torque="0.00" fuelConsumption="1466.77"/>
+						<Entry engineSpeed="1200.00" torque="70.00" fuelConsumption="2384.23"/>
+						<Entry engineSpeed="1200.00" torque="100.00" fuelConsumption="3063.16"/>
+						<Entry engineSpeed="1200.00" torque="200.00" fuelConsumption="5358.94"/>
+						<Entry engineSpeed="1200.00" torque="300.00" fuelConsumption="7700.67"/>
+						<Entry engineSpeed="1200.00" torque="400.00" fuelConsumption="10081.22"/>
+						<Entry engineSpeed="1200.00" torque="500.00" fuelConsumption="12574.82"/>
+						<Entry engineSpeed="1200.00" torque="600.00" fuelConsumption="14901.72"/>
+						<Entry engineSpeed="1200.00" torque="700.00" fuelConsumption="17181.54"/>
+						<Entry engineSpeed="1200.00" torque="800.00" fuelConsumption="19567.93"/>
+						<Entry engineSpeed="1200.00" torque="900.00" fuelConsumption="21988.50"/>
+						<Entry engineSpeed="1200.00" torque="1000.00" fuelConsumption="24410.55"/>
+						<Entry engineSpeed="1200.00" torque="1100.00" fuelConsumption="26818.12"/>
+						<Entry engineSpeed="1200.00" torque="1200.00" fuelConsumption="29600.85"/>
+						<Entry engineSpeed="1400.00" torque="-186.25" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1400.00" torque="-86.25" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1400.00" torque="0.00" fuelConsumption="1943.23"/>
+						<Entry engineSpeed="1400.00" torque="70.00" fuelConsumption="2867.47"/>
+						<Entry engineSpeed="1400.00" torque="100.00" fuelConsumption="3660.90"/>
+						<Entry engineSpeed="1400.00" torque="200.00" fuelConsumption="6305.67"/>
+						<Entry engineSpeed="1400.00" torque="300.00" fuelConsumption="9033.23"/>
+						<Entry engineSpeed="1400.00" torque="400.00" fuelConsumption="11786.02"/>
+						<Entry engineSpeed="1400.00" torque="500.00" fuelConsumption="14469.48"/>
+						<Entry engineSpeed="1400.00" torque="600.00" fuelConsumption="17183.33"/>
+						<Entry engineSpeed="1400.00" torque="700.00" fuelConsumption="20019.01"/>
+						<Entry engineSpeed="1400.00" torque="800.00" fuelConsumption="22833.01"/>
+						<Entry engineSpeed="1400.00" torque="900.00" fuelConsumption="25503.81"/>
+						<Entry engineSpeed="1400.00" torque="1000.00" fuelConsumption="28133.13"/>
+						<Entry engineSpeed="1400.00" torque="1100.00" fuelConsumption="30822.69"/>
+						<Entry engineSpeed="1400.00" torque="1200.00" fuelConsumption="33616.50"/>
+						<Entry engineSpeed="1600.00" torque="-197.57" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1600.00" torque="-97.57" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1600.00" torque="0.00" fuelConsumption="2390.68"/>
+						<Entry engineSpeed="1600.00" torque="70.00" fuelConsumption="3375.40"/>
+						<Entry engineSpeed="1600.00" torque="100.00" fuelConsumption="4270.71"/>
+						<Entry engineSpeed="1600.00" torque="200.00" fuelConsumption="7255.08"/>
+						<Entry engineSpeed="1600.00" torque="300.00" fuelConsumption="10395.25"/>
+						<Entry engineSpeed="1600.00" torque="400.00" fuelConsumption="13532.58"/>
+						<Entry engineSpeed="1600.00" torque="500.00" fuelConsumption="16706.54"/>
+						<Entry engineSpeed="1600.00" torque="600.00" fuelConsumption="19830.25"/>
+						<Entry engineSpeed="1600.00" torque="700.00" fuelConsumption="22960.50"/>
+						<Entry engineSpeed="1600.00" torque="800.00" fuelConsumption="26109.44"/>
+						<Entry engineSpeed="1600.00" torque="900.00" fuelConsumption="29158.70"/>
+						<Entry engineSpeed="1600.00" torque="1000.00" fuelConsumption="32050.23"/>
+						<Entry engineSpeed="1600.00" torque="1100.00" fuelConsumption="35223.83"/>
+						<Entry engineSpeed="1600.00" torque="1200.00" fuelConsumption="38415.23"/>
+						<Entry engineSpeed="1800.00" torque="-204.41" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1800.00" torque="-104.41" fuelConsumption="0.00"/>
+						<Entry engineSpeed="1800.00" torque="0.00" fuelConsumption="2890.46"/>
+						<Entry engineSpeed="1800.00" torque="70.00" fuelConsumption="3985.03"/>
+						<Entry engineSpeed="1800.00" torque="100.00" fuelConsumption="4965.43"/>
+						<Entry engineSpeed="1800.00" torque="200.00" fuelConsumption="8233.42"/>
+						<Entry engineSpeed="1800.00" torque="300.00" fuelConsumption="11783.43"/>
+						<Entry engineSpeed="1800.00" torque="400.00" fuelConsumption="15307.09"/>
+						<Entry engineSpeed="1800.00" torque="500.00" fuelConsumption="18849.16"/>
+						<Entry engineSpeed="1800.00" torque="600.00" fuelConsumption="22267.47"/>
+						<Entry engineSpeed="1800.00" torque="700.00" fuelConsumption="25749.16"/>
+						<Entry engineSpeed="1800.00" torque="800.00" fuelConsumption="29389.56"/>
+						<Entry engineSpeed="1800.00" torque="900.00" fuelConsumption="32951.65"/>
+						<Entry engineSpeed="1800.00" torque="1000.00" fuelConsumption="36567.98"/>
+						<Entry engineSpeed="1800.00" torque="1100.00" fuelConsumption="40354.88"/>
+						<Entry engineSpeed="1800.00" torque="1124.00" fuelConsumption="41263.46"/>
+						<Entry engineSpeed="2000.00" torque="-211.73" fuelConsumption="0.00"/>
+						<Entry engineSpeed="2000.00" torque="-111.73" fuelConsumption="0.00"/>
+						<Entry engineSpeed="2000.00" torque="0.00" fuelConsumption="3496.10"/>
+						<Entry engineSpeed="2000.00" torque="70.00" fuelConsumption="4806.79"/>
+						<Entry engineSpeed="2000.00" torque="100.00" fuelConsumption="5854.51"/>
+						<Entry engineSpeed="2000.00" torque="200.00" fuelConsumption="9346.91"/>
+						<Entry engineSpeed="2000.00" torque="300.00" fuelConsumption="13318.20"/>
+						<Entry engineSpeed="2000.00" torque="400.00" fuelConsumption="17192.16"/>
+						<Entry engineSpeed="2000.00" torque="500.00" fuelConsumption="21141.10"/>
+						<Entry engineSpeed="2000.00" torque="600.00" fuelConsumption="25063.69"/>
+						<Entry engineSpeed="2000.00" torque="700.00" fuelConsumption="28933.73"/>
+						<Entry engineSpeed="2000.00" torque="800.00" fuelConsumption="33033.20"/>
+						<Entry engineSpeed="2000.00" torque="900.00" fuelConsumption="37186.49"/>
+						<Entry engineSpeed="2000.00" torque="1000.00" fuelConsumption="41216.66"/>
+						<Entry engineSpeed="2000.00" torque="1038.00" fuelConsumption="42697.63"/>
+						<Entry engineSpeed="2200.00" torque="-225.56" fuelConsumption="0.00"/>
+						<Entry engineSpeed="2200.00" torque="-125.56" fuelConsumption="0.00"/>
+						<Entry engineSpeed="2200.00" torque="0.00" fuelConsumption="4247.18"/>
+						<Entry engineSpeed="2200.00" torque="70.00" fuelConsumption="5534.02"/>
+						<Entry engineSpeed="2200.00" torque="100.00" fuelConsumption="6687.77"/>
+						<Entry engineSpeed="2200.00" torque="200.00" fuelConsumption="10533.61"/>
+						<Entry engineSpeed="2200.00" torque="300.00" fuelConsumption="14853.02"/>
+						<Entry engineSpeed="2200.00" torque="400.00" fuelConsumption="19148.40"/>
+						<Entry engineSpeed="2200.00" torque="500.00" fuelConsumption="23390.99"/>
+						<Entry engineSpeed="2200.00" torque="600.00" fuelConsumption="27829.44"/>
+						<Entry engineSpeed="2200.00" torque="700.00" fuelConsumption="32500.75"/>
+						<Entry engineSpeed="2200.00" torque="800.00" fuelConsumption="37123.63"/>
+						<Entry engineSpeed="2200.00" torque="900.00" fuelConsumption="41612.31"/>
+						<Entry engineSpeed="2200.00" torque="955.00" fuelConsumption="44050.20"/>
+						<Entry engineSpeed="2400.00" torque="-235.72" fuelConsumption="0.00"/>
+						<Entry engineSpeed="2400.00" torque="-135.72" fuelConsumption="0.00"/>
+						<Entry engineSpeed="2400.00" torque="0.00" fuelConsumption="4945.10"/>
+						<Entry engineSpeed="2400.00" torque="70.00" fuelConsumption="6234.18"/>
+						<Entry engineSpeed="2400.00" torque="100.00" fuelConsumption="7525.66"/>
+						<Entry engineSpeed="2400.00" torque="200.00" fuelConsumption="11830.60"/>
+						<Entry engineSpeed="2400.00" torque="300.00" fuelConsumption="16443.47"/>
+						<Entry engineSpeed="2400.00" torque="400.00" fuelConsumption="21308.19"/>
+						<Entry engineSpeed="2400.00" torque="500.00" fuelConsumption="26325.66"/>
+						<Entry engineSpeed="2400.00" torque="600.00" fuelConsumption="31335.42"/>
+						<Entry engineSpeed="2400.00" torque="700.00" fuelConsumption="36716.19"/>
+						<Entry engineSpeed="2400.00" torque="800.00" fuelConsumption="42106.80"/>
+						<Entry engineSpeed="2400.00" torque="815.00" fuelConsumption="42844.11"/>
+						<Entry engineSpeed="2400.00" torque="915.00" fuelConsumption="42844.11"/>
+						<Entry engineSpeed="2500.00" torque="-240.18" fuelConsumption="0.00"/>
+						<Entry engineSpeed="2500.00" torque="-140.18" fuelConsumption="0.00"/>
+						<Entry engineSpeed="2500.00" torque="0.00" fuelConsumption="5337.87"/>
+						<Entry engineSpeed="2500.00" torque="70.00" fuelConsumption="6286.76"/>
+						<Entry engineSpeed="2500.00" torque="100.00" fuelConsumption="7731.93"/>
+						<Entry engineSpeed="2500.00" torque="200.00" fuelConsumption="12386.92"/>
+						<Entry engineSpeed="2500.00" torque="300.00" fuelConsumption="17232.61"/>
+						<Entry engineSpeed="2500.00" torque="400.00" fuelConsumption="22335.99"/>
+						<Entry engineSpeed="2500.00" torque="500.00" fuelConsumption="27944.55"/>
+						<Entry engineSpeed="2500.00" torque="600.00" fuelConsumption="33199.92"/>
+						<Entry engineSpeed="2500.00" torque="710.00" fuelConsumption="39388.78"/>
+						<Entry engineSpeed="2600.00" torque="-146.13" fuelConsumption="0.00"/>
+						<Entry engineSpeed="2600.00" torque="0.00" fuelConsumption="5534.25"/>
+					</FuelConsumptionMap>
+					<FullLoadAndDragCurve>
+						<Entry engineSpeed="600.00" maxTorque="600.00" dragTorque="-43.58"/>
+						<Entry engineSpeed="800.00" maxTorque="836.00" dragTorque="-53.66"/>
+						<Entry engineSpeed="1000.00" maxTorque="1069.52" dragTorque="-62.03"/>
+						<Entry engineSpeed="1200.00" maxTorque="1200.00" dragTorque="-73.94"/>
+						<Entry engineSpeed="1400.00" maxTorque="1200.00" dragTorque="-85.25"/>
+						<Entry engineSpeed="1600.00" maxTorque="1200.00" dragTorque="-96.57"/>
+						<Entry engineSpeed="1800.00" maxTorque="1123.62" dragTorque="-103.41"/>
+						<Entry engineSpeed="2000.00" maxTorque="1037.52" dragTorque="-110.73"/>
+						<Entry engineSpeed="2200.00" maxTorque="953.95" dragTorque="-124.56"/>
+						<Entry engineSpeed="2400.00" maxTorque="815.35" dragTorque="-134.72"/>
+						<Entry engineSpeed="2500.00" maxTorque="711.29" dragTorque="-139.18"/>
+						<Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-145.13"/>
+					</FullLoadAndDragCurve>
+				</Data>
+				<Signature>
+					<Reference URI="#ENG-Generic220kW7.7lEngine" 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 xsi:type="GearboxComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+				<Data id="GBX-APT-SGenericTqMax1200" xsi:type="v2.0:GearboxDataDeclarationType">
+					<Manufacturer>TUG Generic</Manufacturer>
+					<Model>APT-S Generic TqMax1200</Model>
+					<CertificationNumber>GBX-APT-S Generic TqMax1200</CertificationNumber>
+					<Date>2019-02-27T09:39:05.3400867Z</Date>
+					<AppVersion>VectoCore</AppVersion>
+					<TransmissionType>APT-S</TransmissionType>
+					<MainCertificationMethod>Standard values</MainCertificationMethod>
+					<Gears xsi:type="GearsDeclarationType">
+						<Gear number="1">
+							<Ratio>3.490</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="48.00"/>
+								<Entry inputSpeed="0.00" inputTorque="200.00" torqueLoss="56.00"/>
+								<Entry inputSpeed="0.00" inputTorque="400.00" torqueLoss="64.00"/>
+								<Entry inputSpeed="0.00" inputTorque="600.00" torqueLoss="72.00"/>
+								<Entry inputSpeed="0.00" inputTorque="900.00" torqueLoss="84.00"/>
+								<Entry inputSpeed="0.00" inputTorque="1200.00" torqueLoss="96.00"/>
+								<Entry inputSpeed="0.00" inputTorque="1600.00" torqueLoss="112.00"/>
+								<Entry inputSpeed="0.00" inputTorque="2000.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="0.00" inputTorque="2500.00" torqueLoss="148.00"/>
+								<Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00"/>
+								<Entry inputSpeed="600.00" inputTorque="200.00" torqueLoss="56.00"/>
+								<Entry inputSpeed="600.00" inputTorque="400.00" torqueLoss="64.00"/>
+								<Entry inputSpeed="600.00" inputTorque="600.00" torqueLoss="72.00"/>
+								<Entry inputSpeed="600.00" inputTorque="900.00" torqueLoss="84.00"/>
+								<Entry inputSpeed="600.00" inputTorque="1200.00" torqueLoss="96.00"/>
+								<Entry inputSpeed="600.00" inputTorque="1600.00" torqueLoss="112.00"/>
+								<Entry inputSpeed="600.00" inputTorque="2000.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="600.00" inputTorque="2500.00" torqueLoss="148.00"/>
+								<Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00"/>
+								<Entry inputSpeed="900.00" inputTorque="200.00" torqueLoss="65.00"/>
+								<Entry inputSpeed="900.00" inputTorque="400.00" torqueLoss="73.00"/>
+								<Entry inputSpeed="900.00" inputTorque="600.00" torqueLoss="81.00"/>
+								<Entry inputSpeed="900.00" inputTorque="900.00" torqueLoss="93.00"/>
+								<Entry inputSpeed="900.00" inputTorque="1200.00" torqueLoss="105.00"/>
+								<Entry inputSpeed="900.00" inputTorque="1600.00" torqueLoss="121.00"/>
+								<Entry inputSpeed="900.00" inputTorque="2000.00" torqueLoss="137.00"/>
+								<Entry inputSpeed="900.00" inputTorque="2500.00" torqueLoss="157.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="200.00" torqueLoss="74.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="400.00" torqueLoss="82.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="600.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="900.00" torqueLoss="102.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="1200.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="1600.00" torqueLoss="130.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="2000.00" torqueLoss="146.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="2500.00" torqueLoss="166.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="200.00" torqueLoss="86.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="400.00" torqueLoss="94.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="600.00" torqueLoss="102.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="900.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="1200.00" torqueLoss="126.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="1600.00" torqueLoss="142.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="2000.00" torqueLoss="158.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="2500.00" torqueLoss="178.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="200.00" torqueLoss="98.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="400.00" torqueLoss="106.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="600.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="900.00" torqueLoss="126.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="1200.00" torqueLoss="138.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="1600.00" torqueLoss="154.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="2000.00" torqueLoss="170.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="2500.00" torqueLoss="190.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="200.00" torqueLoss="113.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="400.00" torqueLoss="121.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="600.00" torqueLoss="129.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="900.00" torqueLoss="141.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="1200.00" torqueLoss="153.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="1600.00" torqueLoss="169.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="2000.00" torqueLoss="185.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="2500.00" torqueLoss="205.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="200.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="400.00" torqueLoss="136.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="600.00" torqueLoss="144.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="900.00" torqueLoss="156.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="1200.00" torqueLoss="168.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="1600.00" torqueLoss="184.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="2000.00" torqueLoss="200.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="2500.00" torqueLoss="220.00"/>
+								<Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-200.00" torqueLoss="56.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-400.00" torqueLoss="64.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-600.00" torqueLoss="72.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-900.00" torqueLoss="84.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-1200.00" torqueLoss="96.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-1600.00" torqueLoss="112.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-2000.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-2500.00" torqueLoss="148.00"/>
+								<Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-200.00" torqueLoss="65.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-400.00" torqueLoss="73.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-600.00" torqueLoss="81.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-900.00" torqueLoss="93.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-1200.00" torqueLoss="105.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-1600.00" torqueLoss="121.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-2000.00" torqueLoss="137.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-2500.00" torqueLoss="157.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-200.00" torqueLoss="74.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-400.00" torqueLoss="82.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-600.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-900.00" torqueLoss="102.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-1200.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-1600.00" torqueLoss="130.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-2000.00" torqueLoss="146.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-2500.00" torqueLoss="166.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-200.00" torqueLoss="86.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-400.00" torqueLoss="94.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-600.00" torqueLoss="102.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-900.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-1200.00" torqueLoss="126.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-1600.00" torqueLoss="142.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-2000.00" torqueLoss="158.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-2500.00" torqueLoss="178.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-200.00" torqueLoss="98.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-400.00" torqueLoss="106.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-600.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-900.00" torqueLoss="126.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-1200.00" torqueLoss="138.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-1600.00" torqueLoss="154.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-2000.00" torqueLoss="170.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-2500.00" torqueLoss="190.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-200.00" torqueLoss="113.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-400.00" torqueLoss="121.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-600.00" torqueLoss="129.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-900.00" torqueLoss="141.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-1200.00" torqueLoss="153.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-1600.00" torqueLoss="169.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-2000.00" torqueLoss="185.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-2500.00" torqueLoss="205.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-200.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-400.00" torqueLoss="136.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-600.00" torqueLoss="144.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-900.00" torqueLoss="156.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-1200.00" torqueLoss="168.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-1600.00" torqueLoss="184.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-2000.00" torqueLoss="200.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-2500.00" torqueLoss="220.00"/>
+								<Entry inputSpeed="1300.00" inputTorque="2610.00" torqueLoss="66.00"/>
+								<Entry inputSpeed="1300.00" inputTorque="2842.00" torqueLoss="71.00"/>
+								<Entry inputSpeed="1500.00" inputTorque="-812.00" torqueLoss="46.00"/>
+								<Entry inputSpeed="1500.00" inputTorque="-348.00" torqueLoss="37.00"/>
+								<Entry inputSpeed="1500.00" inputTorque="0.00" torqueLoss="13.00"/>
+								<Entry inputSpeed="1500.00" inputTorque="58.00" torqueLoss="16.00"/>
+								<Entry inputSpeed="1500.00" inputTorque="290.00" torqueLoss="21.00"/>
+								<Entry inputSpeed="1500.00" inputTorque="522.00" torqueLoss="26.00"/>
+								<Entry inputSpeed="1500.00" inputTorque="754.00" torqueLoss="30.00"/>
+								<Entry inputSpeed="1500.00" inputTorque="986.00" torqueLoss="35.00"/>
+								<Entry inputSpeed="1500.00" inputTorque="1218.00" torqueLoss="39.00"/>
+								<Entry inputSpeed="1500.00" inputTorque="1450.00" torqueLoss="44.00"/>
+								<Entry inputSpeed="1500.00" inputTorque="1682.00" torqueLoss="49.00"/>
+								<Entry inputSpeed="1500.00" inputTorque="1914.00" torqueLoss="53.00"/>
+								<Entry inputSpeed="1500.00" inputTorque="2146.00" torqueLoss="58.00"/>
+								<Entry inputSpeed="1500.00" inputTorque="2378.00" torqueLoss="63.00"/>
+								<Entry inputSpeed="1500.00" inputTorque="2610.00" torqueLoss="67.00"/>
+								<Entry inputSpeed="1500.00" inputTorque="2842.00" torqueLoss="72.00"/>
+								<Entry inputSpeed="1700.00" inputTorque="-812.00" torqueLoss="49.00"/>
+								<Entry inputSpeed="1700.00" inputTorque="-348.00" torqueLoss="39.00"/>
+								<Entry inputSpeed="1700.00" inputTorque="0.00" torqueLoss="14.00"/>
+								<Entry inputSpeed="1700.00" inputTorque="58.00" torqueLoss="17.00"/>
+								<Entry inputSpeed="1700.00" inputTorque="290.00" torqueLoss="22.00"/>
+								<Entry inputSpeed="1700.00" inputTorque="522.00" torqueLoss="27.00"/>
+								<Entry inputSpeed="1700.00" inputTorque="754.00" torqueLoss="31.00"/>
+								<Entry inputSpeed="1700.00" inputTorque="986.00" torqueLoss="36.00"/>
+								<Entry inputSpeed="1700.00" inputTorque="1218.00" torqueLoss="41.00"/>
+								<Entry inputSpeed="1700.00" inputTorque="1450.00" torqueLoss="45.00"/>
+								<Entry inputSpeed="1700.00" inputTorque="1682.00" torqueLoss="50.00"/>
+								<Entry inputSpeed="1700.00" inputTorque="1914.00" torqueLoss="55.00"/>
+								<Entry inputSpeed="1700.00" inputTorque="2146.00" torqueLoss="59.00"/>
+								<Entry inputSpeed="1700.00" inputTorque="2378.00" torqueLoss="64.00"/>
+								<Entry inputSpeed="1700.00" inputTorque="2610.00" torqueLoss="68.00"/>
+								<Entry inputSpeed="1700.00" inputTorque="2842.00" torqueLoss="73.00"/>
+								<Entry inputSpeed="1900.00" inputTorque="-812.00" torqueLoss="51.00"/>
+								<Entry inputSpeed="1900.00" inputTorque="-348.00" torqueLoss="42.00"/>
+								<Entry inputSpeed="1900.00" inputTorque="0.00" torqueLoss="15.00"/>
+								<Entry inputSpeed="1900.00" inputTorque="58.00" torqueLoss="19.00"/>
+								<Entry inputSpeed="1900.00" inputTorque="290.00" torqueLoss="23.00"/>
+								<Entry inputSpeed="1900.00" inputTorque="522.00" torqueLoss="28.00"/>
+								<Entry inputSpeed="1900.00" inputTorque="754.00" torqueLoss="32.00"/>
+								<Entry inputSpeed="1900.00" inputTorque="986.00" torqueLoss="37.00"/>
+								<Entry inputSpeed="1900.00" inputTorque="1218.00" torqueLoss="42.00"/>
+								<Entry inputSpeed="1900.00" inputTorque="1450.00" torqueLoss="46.00"/>
+								<Entry inputSpeed="1900.00" inputTorque="1682.00" torqueLoss="51.00"/>
+								<Entry inputSpeed="1900.00" inputTorque="1914.00" torqueLoss="56.00"/>
+								<Entry inputSpeed="1900.00" inputTorque="2146.00" torqueLoss="60.00"/>
+								<Entry inputSpeed="1900.00" inputTorque="2378.00" torqueLoss="65.00"/>
+								<Entry inputSpeed="1900.00" inputTorque="2610.00" torqueLoss="70.00"/>
+								<Entry inputSpeed="1900.00" inputTorque="2842.00" torqueLoss="74.00"/>
+								<Entry inputSpeed="2100.00" inputTorque="-812.00" torqueLoss="53.00"/>
+								<Entry inputSpeed="2100.00" inputTorque="-348.00" torqueLoss="44.00"/>
+								<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="16.00"/>
+								<Entry inputSpeed="2100.00" inputTorque="58.00" torqueLoss="20.00"/>
+								<Entry inputSpeed="2100.00" inputTorque="290.00" torqueLoss="24.00"/>
+								<Entry inputSpeed="2100.00" inputTorque="522.00" torqueLoss="29.00"/>
+								<Entry inputSpeed="2100.00" inputTorque="754.00" torqueLoss="34.00"/>
+								<Entry inputSpeed="2100.00" inputTorque="986.00" torqueLoss="38.00"/>
+								<Entry inputSpeed="2100.00" inputTorque="1218.00" torqueLoss="43.00"/>
+								<Entry inputSpeed="2100.00" inputTorque="1450.00" torqueLoss="48.00"/>
+								<Entry inputSpeed="2100.00" inputTorque="1682.00" torqueLoss="52.00"/>
+								<Entry inputSpeed="2100.00" inputTorque="1914.00" torqueLoss="57.00"/>
+								<Entry inputSpeed="2100.00" inputTorque="2146.00" torqueLoss="61.00"/>
+								<Entry inputSpeed="2100.00" inputTorque="2378.00" torqueLoss="66.00"/>
+								<Entry inputSpeed="2100.00" inputTorque="2610.00" torqueLoss="71.00"/>
+								<Entry inputSpeed="2100.00" inputTorque="2842.00" torqueLoss="75.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="2">
+							<Ratio>1.860</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="48.00"/>
+								<Entry inputSpeed="0.00" inputTorque="200.00" torqueLoss="56.00"/>
+								<Entry inputSpeed="0.00" inputTorque="400.00" torqueLoss="64.00"/>
+								<Entry inputSpeed="0.00" inputTorque="600.00" torqueLoss="72.00"/>
+								<Entry inputSpeed="0.00" inputTorque="900.00" torqueLoss="84.00"/>
+								<Entry inputSpeed="0.00" inputTorque="1200.00" torqueLoss="96.00"/>
+								<Entry inputSpeed="0.00" inputTorque="1600.00" torqueLoss="112.00"/>
+								<Entry inputSpeed="0.00" inputTorque="2000.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="0.00" inputTorque="2500.00" torqueLoss="148.00"/>
+								<Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00"/>
+								<Entry inputSpeed="600.00" inputTorque="200.00" torqueLoss="56.00"/>
+								<Entry inputSpeed="600.00" inputTorque="400.00" torqueLoss="64.00"/>
+								<Entry inputSpeed="600.00" inputTorque="600.00" torqueLoss="72.00"/>
+								<Entry inputSpeed="600.00" inputTorque="900.00" torqueLoss="84.00"/>
+								<Entry inputSpeed="600.00" inputTorque="1200.00" torqueLoss="96.00"/>
+								<Entry inputSpeed="600.00" inputTorque="1600.00" torqueLoss="112.00"/>
+								<Entry inputSpeed="600.00" inputTorque="2000.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="600.00" inputTorque="2500.00" torqueLoss="148.00"/>
+								<Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00"/>
+								<Entry inputSpeed="900.00" inputTorque="200.00" torqueLoss="65.00"/>
+								<Entry inputSpeed="900.00" inputTorque="400.00" torqueLoss="73.00"/>
+								<Entry inputSpeed="900.00" inputTorque="600.00" torqueLoss="81.00"/>
+								<Entry inputSpeed="900.00" inputTorque="900.00" torqueLoss="93.00"/>
+								<Entry inputSpeed="900.00" inputTorque="1200.00" torqueLoss="105.00"/>
+								<Entry inputSpeed="900.00" inputTorque="1600.00" torqueLoss="121.00"/>
+								<Entry inputSpeed="900.00" inputTorque="2000.00" torqueLoss="137.00"/>
+								<Entry inputSpeed="900.00" inputTorque="2500.00" torqueLoss="157.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="200.00" torqueLoss="74.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="400.00" torqueLoss="82.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="600.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="900.00" torqueLoss="102.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="1200.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="1600.00" torqueLoss="130.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="2000.00" torqueLoss="146.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="2500.00" torqueLoss="166.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="200.00" torqueLoss="86.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="400.00" torqueLoss="94.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="600.00" torqueLoss="102.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="900.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="1200.00" torqueLoss="126.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="1600.00" torqueLoss="142.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="2000.00" torqueLoss="158.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="2500.00" torqueLoss="178.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="200.00" torqueLoss="98.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="400.00" torqueLoss="106.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="600.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="900.00" torqueLoss="126.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="1200.00" torqueLoss="138.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="1600.00" torqueLoss="154.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="2000.00" torqueLoss="170.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="2500.00" torqueLoss="190.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="200.00" torqueLoss="113.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="400.00" torqueLoss="121.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="600.00" torqueLoss="129.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="900.00" torqueLoss="141.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="1200.00" torqueLoss="153.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="1600.00" torqueLoss="169.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="2000.00" torqueLoss="185.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="2500.00" torqueLoss="205.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="200.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="400.00" torqueLoss="136.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="600.00" torqueLoss="144.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="900.00" torqueLoss="156.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="1200.00" torqueLoss="168.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="1600.00" torqueLoss="184.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="2000.00" torqueLoss="200.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="2500.00" torqueLoss="220.00"/>
+								<Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-200.00" torqueLoss="56.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-400.00" torqueLoss="64.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-600.00" torqueLoss="72.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-900.00" torqueLoss="84.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-1200.00" torqueLoss="96.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-1600.00" torqueLoss="112.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-2000.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-2500.00" torqueLoss="148.00"/>
+								<Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-200.00" torqueLoss="65.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-400.00" torqueLoss="73.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-600.00" torqueLoss="81.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-900.00" torqueLoss="93.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-1200.00" torqueLoss="105.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-1600.00" torqueLoss="121.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-2000.00" torqueLoss="137.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-2500.00" torqueLoss="157.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-200.00" torqueLoss="74.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-400.00" torqueLoss="82.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-600.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-900.00" torqueLoss="102.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-1200.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-1600.00" torqueLoss="130.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-2000.00" torqueLoss="146.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-2500.00" torqueLoss="166.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-200.00" torqueLoss="86.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-400.00" torqueLoss="94.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-600.00" torqueLoss="102.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-900.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-1200.00" torqueLoss="126.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-1600.00" torqueLoss="142.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-2000.00" torqueLoss="158.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-2500.00" torqueLoss="178.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-200.00" torqueLoss="98.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-400.00" torqueLoss="106.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-600.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-900.00" torqueLoss="126.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-1200.00" torqueLoss="138.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-1600.00" torqueLoss="154.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-2000.00" torqueLoss="170.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-2500.00" torqueLoss="190.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-200.00" torqueLoss="113.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-400.00" torqueLoss="121.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-600.00" torqueLoss="129.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-900.00" torqueLoss="141.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-1200.00" torqueLoss="153.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-1600.00" torqueLoss="169.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-2000.00" torqueLoss="185.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-2500.00" torqueLoss="205.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-200.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-400.00" torqueLoss="136.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-600.00" torqueLoss="144.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-900.00" torqueLoss="156.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-1200.00" torqueLoss="168.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-1600.00" torqueLoss="184.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-2000.00" torqueLoss="200.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-2500.00" torqueLoss="220.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="3">
+							<Ratio>1.410</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="48.00"/>
+								<Entry inputSpeed="0.00" inputTorque="200.00" torqueLoss="56.00"/>
+								<Entry inputSpeed="0.00" inputTorque="400.00" torqueLoss="64.00"/>
+								<Entry inputSpeed="0.00" inputTorque="600.00" torqueLoss="72.00"/>
+								<Entry inputSpeed="0.00" inputTorque="900.00" torqueLoss="84.00"/>
+								<Entry inputSpeed="0.00" inputTorque="1200.00" torqueLoss="96.00"/>
+								<Entry inputSpeed="0.00" inputTorque="1600.00" torqueLoss="112.00"/>
+								<Entry inputSpeed="0.00" inputTorque="2000.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="0.00" inputTorque="2500.00" torqueLoss="148.00"/>
+								<Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00"/>
+								<Entry inputSpeed="600.00" inputTorque="200.00" torqueLoss="56.00"/>
+								<Entry inputSpeed="600.00" inputTorque="400.00" torqueLoss="64.00"/>
+								<Entry inputSpeed="600.00" inputTorque="600.00" torqueLoss="72.00"/>
+								<Entry inputSpeed="600.00" inputTorque="900.00" torqueLoss="84.00"/>
+								<Entry inputSpeed="600.00" inputTorque="1200.00" torqueLoss="96.00"/>
+								<Entry inputSpeed="600.00" inputTorque="1600.00" torqueLoss="112.00"/>
+								<Entry inputSpeed="600.00" inputTorque="2000.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="600.00" inputTorque="2500.00" torqueLoss="148.00"/>
+								<Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00"/>
+								<Entry inputSpeed="900.00" inputTorque="200.00" torqueLoss="65.00"/>
+								<Entry inputSpeed="900.00" inputTorque="400.00" torqueLoss="73.00"/>
+								<Entry inputSpeed="900.00" inputTorque="600.00" torqueLoss="81.00"/>
+								<Entry inputSpeed="900.00" inputTorque="900.00" torqueLoss="93.00"/>
+								<Entry inputSpeed="900.00" inputTorque="1200.00" torqueLoss="105.00"/>
+								<Entry inputSpeed="900.00" inputTorque="1600.00" torqueLoss="121.00"/>
+								<Entry inputSpeed="900.00" inputTorque="2000.00" torqueLoss="137.00"/>
+								<Entry inputSpeed="900.00" inputTorque="2500.00" torqueLoss="157.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="200.00" torqueLoss="74.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="400.00" torqueLoss="82.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="600.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="900.00" torqueLoss="102.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="1200.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="1600.00" torqueLoss="130.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="2000.00" torqueLoss="146.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="2500.00" torqueLoss="166.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="200.00" torqueLoss="86.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="400.00" torqueLoss="94.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="600.00" torqueLoss="102.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="900.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="1200.00" torqueLoss="126.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="1600.00" torqueLoss="142.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="2000.00" torqueLoss="158.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="2500.00" torqueLoss="178.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="200.00" torqueLoss="98.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="400.00" torqueLoss="106.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="600.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="900.00" torqueLoss="126.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="1200.00" torqueLoss="138.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="1600.00" torqueLoss="154.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="2000.00" torqueLoss="170.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="2500.00" torqueLoss="190.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="200.00" torqueLoss="113.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="400.00" torqueLoss="121.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="600.00" torqueLoss="129.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="900.00" torqueLoss="141.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="1200.00" torqueLoss="153.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="1600.00" torqueLoss="169.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="2000.00" torqueLoss="185.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="2500.00" torqueLoss="205.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="200.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="400.00" torqueLoss="136.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="600.00" torqueLoss="144.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="900.00" torqueLoss="156.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="1200.00" torqueLoss="168.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="1600.00" torqueLoss="184.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="2000.00" torqueLoss="200.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="2500.00" torqueLoss="220.00"/>
+								<Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-200.00" torqueLoss="56.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-400.00" torqueLoss="64.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-600.00" torqueLoss="72.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-900.00" torqueLoss="84.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-1200.00" torqueLoss="96.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-1600.00" torqueLoss="112.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-2000.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-2500.00" torqueLoss="148.00"/>
+								<Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-200.00" torqueLoss="65.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-400.00" torqueLoss="73.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-600.00" torqueLoss="81.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-900.00" torqueLoss="93.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-1200.00" torqueLoss="105.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-1600.00" torqueLoss="121.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-2000.00" torqueLoss="137.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-2500.00" torqueLoss="157.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-200.00" torqueLoss="74.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-400.00" torqueLoss="82.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-600.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-900.00" torqueLoss="102.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-1200.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-1600.00" torqueLoss="130.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-2000.00" torqueLoss="146.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-2500.00" torqueLoss="166.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-200.00" torqueLoss="86.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-400.00" torqueLoss="94.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-600.00" torqueLoss="102.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-900.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-1200.00" torqueLoss="126.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-1600.00" torqueLoss="142.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-2000.00" torqueLoss="158.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-2500.00" torqueLoss="178.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-200.00" torqueLoss="98.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-400.00" torqueLoss="106.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-600.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-900.00" torqueLoss="126.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-1200.00" torqueLoss="138.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-1600.00" torqueLoss="154.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-2000.00" torqueLoss="170.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-2500.00" torqueLoss="190.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-200.00" torqueLoss="113.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-400.00" torqueLoss="121.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-600.00" torqueLoss="129.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-900.00" torqueLoss="141.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-1200.00" torqueLoss="153.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-1600.00" torqueLoss="169.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-2000.00" torqueLoss="185.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-2500.00" torqueLoss="205.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-200.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-400.00" torqueLoss="136.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-600.00" torqueLoss="144.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-900.00" torqueLoss="156.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-1200.00" torqueLoss="168.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-1600.00" torqueLoss="184.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-2000.00" torqueLoss="200.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-2500.00" torqueLoss="220.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="4">
+							<Ratio>1.000</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="48.00"/>
+								<Entry inputSpeed="0.00" inputTorque="200.00" torqueLoss="50.00"/>
+								<Entry inputSpeed="0.00" inputTorque="400.00" torqueLoss="52.00"/>
+								<Entry inputSpeed="0.00" inputTorque="600.00" torqueLoss="54.00"/>
+								<Entry inputSpeed="0.00" inputTorque="900.00" torqueLoss="57.00"/>
+								<Entry inputSpeed="0.00" inputTorque="1200.00" torqueLoss="60.00"/>
+								<Entry inputSpeed="0.00" inputTorque="1600.00" torqueLoss="64.00"/>
+								<Entry inputSpeed="0.00" inputTorque="2000.00" torqueLoss="68.00"/>
+								<Entry inputSpeed="0.00" inputTorque="2500.00" torqueLoss="73.00"/>
+								<Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00"/>
+								<Entry inputSpeed="600.00" inputTorque="200.00" torqueLoss="50.00"/>
+								<Entry inputSpeed="600.00" inputTorque="400.00" torqueLoss="52.00"/>
+								<Entry inputSpeed="600.00" inputTorque="600.00" torqueLoss="54.00"/>
+								<Entry inputSpeed="600.00" inputTorque="900.00" torqueLoss="57.00"/>
+								<Entry inputSpeed="600.00" inputTorque="1200.00" torqueLoss="60.00"/>
+								<Entry inputSpeed="600.00" inputTorque="1600.00" torqueLoss="64.00"/>
+								<Entry inputSpeed="600.00" inputTorque="2000.00" torqueLoss="68.00"/>
+								<Entry inputSpeed="600.00" inputTorque="2500.00" torqueLoss="73.00"/>
+								<Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00"/>
+								<Entry inputSpeed="900.00" inputTorque="200.00" torqueLoss="59.00"/>
+								<Entry inputSpeed="900.00" inputTorque="400.00" torqueLoss="61.00"/>
+								<Entry inputSpeed="900.00" inputTorque="600.00" torqueLoss="63.00"/>
+								<Entry inputSpeed="900.00" inputTorque="900.00" torqueLoss="66.00"/>
+								<Entry inputSpeed="900.00" inputTorque="1200.00" torqueLoss="69.00"/>
+								<Entry inputSpeed="900.00" inputTorque="1600.00" torqueLoss="73.00"/>
+								<Entry inputSpeed="900.00" inputTorque="2000.00" torqueLoss="77.00"/>
+								<Entry inputSpeed="900.00" inputTorque="2500.00" torqueLoss="82.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="200.00" torqueLoss="68.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="400.00" torqueLoss="70.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="600.00" torqueLoss="72.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="900.00" torqueLoss="75.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="1200.00" torqueLoss="78.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="1600.00" torqueLoss="82.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="2000.00" torqueLoss="86.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="2500.00" torqueLoss="91.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="200.00" torqueLoss="80.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="400.00" torqueLoss="82.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="600.00" torqueLoss="84.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="900.00" torqueLoss="87.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="1200.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="1600.00" torqueLoss="94.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="2000.00" torqueLoss="98.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="2500.00" torqueLoss="103.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="200.00" torqueLoss="92.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="400.00" torqueLoss="94.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="600.00" torqueLoss="96.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="900.00" torqueLoss="99.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="1200.00" torqueLoss="102.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="1600.00" torqueLoss="106.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="2000.00" torqueLoss="110.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="2500.00" torqueLoss="115.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="200.00" torqueLoss="107.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="400.00" torqueLoss="109.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="600.00" torqueLoss="111.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="900.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="1200.00" torqueLoss="117.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="1600.00" torqueLoss="121.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="2000.00" torqueLoss="125.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="2500.00" torqueLoss="130.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="200.00" torqueLoss="122.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="400.00" torqueLoss="124.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="600.00" torqueLoss="126.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="900.00" torqueLoss="129.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="1200.00" torqueLoss="132.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="1600.00" torqueLoss="136.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="2000.00" torqueLoss="140.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="2500.00" torqueLoss="145.00"/>
+								<Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-200.00" torqueLoss="50.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-400.00" torqueLoss="52.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-600.00" torqueLoss="54.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-900.00" torqueLoss="57.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-1200.00" torqueLoss="60.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-1600.00" torqueLoss="64.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-2000.00" torqueLoss="68.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-2500.00" torqueLoss="73.00"/>
+								<Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-200.00" torqueLoss="59.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-400.00" torqueLoss="61.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-600.00" torqueLoss="63.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-900.00" torqueLoss="66.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-1200.00" torqueLoss="69.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-1600.00" torqueLoss="73.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-2000.00" torqueLoss="77.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-2500.00" torqueLoss="82.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-200.00" torqueLoss="68.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-400.00" torqueLoss="70.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-600.00" torqueLoss="72.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-900.00" torqueLoss="75.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-1200.00" torqueLoss="78.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-1600.00" torqueLoss="82.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-2000.00" torqueLoss="86.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-2500.00" torqueLoss="91.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-200.00" torqueLoss="80.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-400.00" torqueLoss="82.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-600.00" torqueLoss="84.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-900.00" torqueLoss="87.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-1200.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-1600.00" torqueLoss="94.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-2000.00" torqueLoss="98.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-2500.00" torqueLoss="103.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-200.00" torqueLoss="92.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-400.00" torqueLoss="94.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-600.00" torqueLoss="96.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-900.00" torqueLoss="99.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-1200.00" torqueLoss="102.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-1600.00" torqueLoss="106.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-2000.00" torqueLoss="110.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-2500.00" torqueLoss="115.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-200.00" torqueLoss="107.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-400.00" torqueLoss="109.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-600.00" torqueLoss="111.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-900.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-1200.00" torqueLoss="117.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-1600.00" torqueLoss="121.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-2000.00" torqueLoss="125.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-2500.00" torqueLoss="130.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-200.00" torqueLoss="122.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-400.00" torqueLoss="124.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-600.00" torqueLoss="126.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-900.00" torqueLoss="129.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-1200.00" torqueLoss="132.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-1600.00" torqueLoss="136.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-2000.00" torqueLoss="140.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-2500.00" torqueLoss="145.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="5">
+							<Ratio>0.750</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="48.00"/>
+								<Entry inputSpeed="0.00" inputTorque="200.00" torqueLoss="56.00"/>
+								<Entry inputSpeed="0.00" inputTorque="400.00" torqueLoss="64.00"/>
+								<Entry inputSpeed="0.00" inputTorque="600.00" torqueLoss="72.00"/>
+								<Entry inputSpeed="0.00" inputTorque="900.00" torqueLoss="84.00"/>
+								<Entry inputSpeed="0.00" inputTorque="1200.00" torqueLoss="96.00"/>
+								<Entry inputSpeed="0.00" inputTorque="1600.00" torqueLoss="112.00"/>
+								<Entry inputSpeed="0.00" inputTorque="2000.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="0.00" inputTorque="2500.00" torqueLoss="148.00"/>
+								<Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00"/>
+								<Entry inputSpeed="600.00" inputTorque="200.00" torqueLoss="56.00"/>
+								<Entry inputSpeed="600.00" inputTorque="400.00" torqueLoss="64.00"/>
+								<Entry inputSpeed="600.00" inputTorque="600.00" torqueLoss="72.00"/>
+								<Entry inputSpeed="600.00" inputTorque="900.00" torqueLoss="84.00"/>
+								<Entry inputSpeed="600.00" inputTorque="1200.00" torqueLoss="96.00"/>
+								<Entry inputSpeed="600.00" inputTorque="1600.00" torqueLoss="112.00"/>
+								<Entry inputSpeed="600.00" inputTorque="2000.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="600.00" inputTorque="2500.00" torqueLoss="148.00"/>
+								<Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00"/>
+								<Entry inputSpeed="900.00" inputTorque="200.00" torqueLoss="65.00"/>
+								<Entry inputSpeed="900.00" inputTorque="400.00" torqueLoss="73.00"/>
+								<Entry inputSpeed="900.00" inputTorque="600.00" torqueLoss="81.00"/>
+								<Entry inputSpeed="900.00" inputTorque="900.00" torqueLoss="93.00"/>
+								<Entry inputSpeed="900.00" inputTorque="1200.00" torqueLoss="105.00"/>
+								<Entry inputSpeed="900.00" inputTorque="1600.00" torqueLoss="121.00"/>
+								<Entry inputSpeed="900.00" inputTorque="2000.00" torqueLoss="137.00"/>
+								<Entry inputSpeed="900.00" inputTorque="2500.00" torqueLoss="157.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="200.00" torqueLoss="74.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="400.00" torqueLoss="82.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="600.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="900.00" torqueLoss="102.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="1200.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="1600.00" torqueLoss="130.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="2000.00" torqueLoss="146.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="2500.00" torqueLoss="166.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="200.00" torqueLoss="86.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="400.00" torqueLoss="94.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="600.00" torqueLoss="102.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="900.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="1200.00" torqueLoss="126.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="1600.00" torqueLoss="142.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="2000.00" torqueLoss="158.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="2500.00" torqueLoss="178.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="200.00" torqueLoss="98.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="400.00" torqueLoss="106.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="600.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="900.00" torqueLoss="126.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="1200.00" torqueLoss="138.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="1600.00" torqueLoss="154.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="2000.00" torqueLoss="170.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="2500.00" torqueLoss="190.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="200.00" torqueLoss="113.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="400.00" torqueLoss="121.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="600.00" torqueLoss="129.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="900.00" torqueLoss="141.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="1200.00" torqueLoss="153.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="1600.00" torqueLoss="169.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="2000.00" torqueLoss="185.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="2500.00" torqueLoss="205.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="200.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="400.00" torqueLoss="136.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="600.00" torqueLoss="144.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="900.00" torqueLoss="156.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="1200.00" torqueLoss="168.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="1600.00" torqueLoss="184.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="2000.00" torqueLoss="200.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="2500.00" torqueLoss="220.00"/>
+								<Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-200.00" torqueLoss="56.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-400.00" torqueLoss="64.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-600.00" torqueLoss="72.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-900.00" torqueLoss="84.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-1200.00" torqueLoss="96.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-1600.00" torqueLoss="112.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-2000.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-2500.00" torqueLoss="148.00"/>
+								<Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-200.00" torqueLoss="65.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-400.00" torqueLoss="73.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-600.00" torqueLoss="81.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-900.00" torqueLoss="93.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-1200.00" torqueLoss="105.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-1600.00" torqueLoss="121.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-2000.00" torqueLoss="137.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-2500.00" torqueLoss="157.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-200.00" torqueLoss="74.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-400.00" torqueLoss="82.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-600.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-900.00" torqueLoss="102.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-1200.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-1600.00" torqueLoss="130.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-2000.00" torqueLoss="146.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-2500.00" torqueLoss="166.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-200.00" torqueLoss="86.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-400.00" torqueLoss="94.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-600.00" torqueLoss="102.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-900.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-1200.00" torqueLoss="126.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-1600.00" torqueLoss="142.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-2000.00" torqueLoss="158.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-2500.00" torqueLoss="178.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-200.00" torqueLoss="98.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-400.00" torqueLoss="106.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-600.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-900.00" torqueLoss="126.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-1200.00" torqueLoss="138.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-1600.00" torqueLoss="154.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-2000.00" torqueLoss="170.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-2500.00" torqueLoss="190.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-200.00" torqueLoss="113.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-400.00" torqueLoss="121.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-600.00" torqueLoss="129.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-900.00" torqueLoss="141.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-1200.00" torqueLoss="153.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-1600.00" torqueLoss="169.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-2000.00" torqueLoss="185.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-2500.00" torqueLoss="205.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-200.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-400.00" torqueLoss="136.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-600.00" torqueLoss="144.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-900.00" torqueLoss="156.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-1200.00" torqueLoss="168.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-1600.00" torqueLoss="184.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-2000.00" torqueLoss="200.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-2500.00" torqueLoss="220.00"/>
+							</TorqueLossMap>
+						</Gear>
+						<Gear number="6">
+							<Ratio>0.650</Ratio>
+							<TorqueLossMap>
+								<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="48.00"/>
+								<Entry inputSpeed="0.00" inputTorque="200.00" torqueLoss="56.00"/>
+								<Entry inputSpeed="0.00" inputTorque="400.00" torqueLoss="64.00"/>
+								<Entry inputSpeed="0.00" inputTorque="600.00" torqueLoss="72.00"/>
+								<Entry inputSpeed="0.00" inputTorque="900.00" torqueLoss="84.00"/>
+								<Entry inputSpeed="0.00" inputTorque="1200.00" torqueLoss="96.00"/>
+								<Entry inputSpeed="0.00" inputTorque="1600.00" torqueLoss="112.00"/>
+								<Entry inputSpeed="0.00" inputTorque="2000.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="0.00" inputTorque="2500.00" torqueLoss="148.00"/>
+								<Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00"/>
+								<Entry inputSpeed="600.00" inputTorque="200.00" torqueLoss="56.00"/>
+								<Entry inputSpeed="600.00" inputTorque="400.00" torqueLoss="64.00"/>
+								<Entry inputSpeed="600.00" inputTorque="600.00" torqueLoss="72.00"/>
+								<Entry inputSpeed="600.00" inputTorque="900.00" torqueLoss="84.00"/>
+								<Entry inputSpeed="600.00" inputTorque="1200.00" torqueLoss="96.00"/>
+								<Entry inputSpeed="600.00" inputTorque="1600.00" torqueLoss="112.00"/>
+								<Entry inputSpeed="600.00" inputTorque="2000.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="600.00" inputTorque="2500.00" torqueLoss="148.00"/>
+								<Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00"/>
+								<Entry inputSpeed="900.00" inputTorque="200.00" torqueLoss="65.00"/>
+								<Entry inputSpeed="900.00" inputTorque="400.00" torqueLoss="73.00"/>
+								<Entry inputSpeed="900.00" inputTorque="600.00" torqueLoss="81.00"/>
+								<Entry inputSpeed="900.00" inputTorque="900.00" torqueLoss="93.00"/>
+								<Entry inputSpeed="900.00" inputTorque="1200.00" torqueLoss="105.00"/>
+								<Entry inputSpeed="900.00" inputTorque="1600.00" torqueLoss="121.00"/>
+								<Entry inputSpeed="900.00" inputTorque="2000.00" torqueLoss="137.00"/>
+								<Entry inputSpeed="900.00" inputTorque="2500.00" torqueLoss="157.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="200.00" torqueLoss="74.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="400.00" torqueLoss="82.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="600.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="900.00" torqueLoss="102.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="1200.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="1600.00" torqueLoss="130.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="2000.00" torqueLoss="146.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="2500.00" torqueLoss="166.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="200.00" torqueLoss="86.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="400.00" torqueLoss="94.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="600.00" torqueLoss="102.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="900.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="1200.00" torqueLoss="126.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="1600.00" torqueLoss="142.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="2000.00" torqueLoss="158.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="2500.00" torqueLoss="178.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="200.00" torqueLoss="98.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="400.00" torqueLoss="106.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="600.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="900.00" torqueLoss="126.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="1200.00" torqueLoss="138.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="1600.00" torqueLoss="154.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="2000.00" torqueLoss="170.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="2500.00" torqueLoss="190.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="200.00" torqueLoss="113.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="400.00" torqueLoss="121.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="600.00" torqueLoss="129.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="900.00" torqueLoss="141.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="1200.00" torqueLoss="153.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="1600.00" torqueLoss="169.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="2000.00" torqueLoss="185.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="2500.00" torqueLoss="205.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="200.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="400.00" torqueLoss="136.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="600.00" torqueLoss="144.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="900.00" torqueLoss="156.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="1200.00" torqueLoss="168.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="1600.00" torqueLoss="184.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="2000.00" torqueLoss="200.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="2500.00" torqueLoss="220.00"/>
+								<Entry inputSpeed="600.00" inputTorque="0.00" torqueLoss="48.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-200.00" torqueLoss="56.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-400.00" torqueLoss="64.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-600.00" torqueLoss="72.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-900.00" torqueLoss="84.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-1200.00" torqueLoss="96.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-1600.00" torqueLoss="112.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-2000.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="600.00" inputTorque="-2500.00" torqueLoss="148.00"/>
+								<Entry inputSpeed="900.00" inputTorque="0.00" torqueLoss="57.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-200.00" torqueLoss="65.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-400.00" torqueLoss="73.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-600.00" torqueLoss="81.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-900.00" torqueLoss="93.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-1200.00" torqueLoss="105.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-1600.00" torqueLoss="121.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-2000.00" torqueLoss="137.00"/>
+								<Entry inputSpeed="900.00" inputTorque="-2500.00" torqueLoss="157.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="0.00" torqueLoss="66.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-200.00" torqueLoss="74.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-400.00" torqueLoss="82.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-600.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-900.00" torqueLoss="102.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-1200.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-1600.00" torqueLoss="130.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-2000.00" torqueLoss="146.00"/>
+								<Entry inputSpeed="1200.00" inputTorque="-2500.00" torqueLoss="166.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="0.00" torqueLoss="78.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-200.00" torqueLoss="86.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-400.00" torqueLoss="94.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-600.00" torqueLoss="102.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-900.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-1200.00" torqueLoss="126.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-1600.00" torqueLoss="142.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-2000.00" torqueLoss="158.00"/>
+								<Entry inputSpeed="1600.00" inputTorque="-2500.00" torqueLoss="178.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="0.00" torqueLoss="90.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-200.00" torqueLoss="98.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-400.00" torqueLoss="106.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-600.00" torqueLoss="114.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-900.00" torqueLoss="126.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-1200.00" torqueLoss="138.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-1600.00" torqueLoss="154.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-2000.00" torqueLoss="170.00"/>
+								<Entry inputSpeed="2000.00" inputTorque="-2500.00" torqueLoss="190.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="0.00" torqueLoss="105.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-200.00" torqueLoss="113.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-400.00" torqueLoss="121.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-600.00" torqueLoss="129.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-900.00" torqueLoss="141.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-1200.00" torqueLoss="153.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-1600.00" torqueLoss="169.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-2000.00" torqueLoss="185.00"/>
+								<Entry inputSpeed="2500.00" inputTorque="-2500.00" torqueLoss="205.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="0.00" torqueLoss="120.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-200.00" torqueLoss="128.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-400.00" torqueLoss="136.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-600.00" torqueLoss="144.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-900.00" torqueLoss="156.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-1200.00" torqueLoss="168.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-1600.00" torqueLoss="184.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-2000.00" torqueLoss="200.00"/>
+								<Entry inputSpeed="3000.00" inputTorque="-2500.00" torqueLoss="220.00"/>
+							</TorqueLossMap>
+						</Gear>
+					</Gears>
+				</Data>
+				<Signature>
+					<Reference URI="#GBX-APT-SGenericTqMax1200" 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>
+			<TorqueConverter xsi:type="TorqueConverterComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+				<Data id="TC-APT-SGenericTqMax1200" xsi:type="v2.0:TorqueConverterDataDeclarationType">
+					<Manufacturer>TUG Generic</Manufacturer>
+					<Model>APT-S Generic TqMax1200</Model>
+					<CertificationNumber>N/A</CertificationNumber>
+					<Date>2019-02-27T09:39:05.3410801Z</Date>
+					<AppVersion>VectoCore</AppVersion>
+					<CertificationMethod>Standard values</CertificationMethod>
+					<Characteristics>
+						<Entry speedRatio="0.0000" torqueRatio="1.80" inputTorqueRef="404.79"/>
+						<Entry speedRatio="0.1000" torqueRatio="1.71" inputTorqueRef="391.30"/>
+						<Entry speedRatio="0.2000" torqueRatio="1.61" inputTorqueRef="377.80"/>
+						<Entry speedRatio="0.3000" torqueRatio="1.52" inputTorqueRef="364.31"/>
+						<Entry speedRatio="0.4000" torqueRatio="1.42" inputTorqueRef="350.82"/>
+						<Entry speedRatio="0.5000" torqueRatio="1.33" inputTorqueRef="337.33"/>
+						<Entry speedRatio="0.6000" torqueRatio="1.23" inputTorqueRef="323.83"/>
+						<Entry speedRatio="0.6500" torqueRatio="1.19" inputTorqueRef="303.59"/>
+						<Entry speedRatio="0.7000" torqueRatio="1.14" inputTorqueRef="283.35"/>
+						<Entry speedRatio="0.7500" torqueRatio="1.09" inputTorqueRef="263.11"/>
+						<Entry speedRatio="0.8000" torqueRatio="1.04" inputTorqueRef="242.87"/>
+						<Entry speedRatio="0.8500" torqueRatio="1.00" inputTorqueRef="222.63"/>
+						<Entry speedRatio="0.9000" torqueRatio="0.95" inputTorqueRef="202.40"/>
+						<Entry speedRatio="0.9500" torqueRatio="0.95" inputTorqueRef="101.20"/>
+						<Entry speedRatio="1.0000" torqueRatio="0.95" inputTorqueRef="0.00"/>
+						<Entry speedRatio="1.1000" torqueRatio="1.00" inputTorqueRef="-40.34"/>
+						<Entry speedRatio="1.2220" torqueRatio="1.00" inputTorqueRef="-80.34"/>
+						<Entry speedRatio="1.3750" torqueRatio="1.00" inputTorqueRef="-136.11"/>
+						<Entry speedRatio="1.5710" torqueRatio="1.00" inputTorqueRef="-216.52"/>
+						<Entry speedRatio="1.8330" torqueRatio="1.00" inputTorqueRef="-335.19"/>
+						<Entry speedRatio="2.2000" torqueRatio="1.00" inputTorqueRef="-528.77"/>
+						<Entry speedRatio="2.5000" torqueRatio="1.00" inputTorqueRef="-721.00"/>
+						<Entry speedRatio="3.0000" torqueRatio="1.00" inputTorqueRef="-1122.00"/>
+						<Entry speedRatio="3.5000" torqueRatio="1.00" inputTorqueRef="-1648.00"/>
+						<Entry speedRatio="4.0000" torqueRatio="1.00" inputTorqueRef="-2326.00"/>
+						<Entry speedRatio="4.5000" torqueRatio="1.00" inputTorqueRef="-3182.00"/>
+						<Entry speedRatio="5.0000" torqueRatio="1.00" inputTorqueRef="-4242.00"/>
+					</Characteristics>
+				</Data>
+				<Signature>
+					<Reference URI="#TC-APT-SGenericTqMax1200" 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>
+			</TorqueConverter>
+			<Axlegear xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxlegearComponentDeclarationType">
+				<v2.0:Data id="AXLGEAR-6.500" xsi:type="v1.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+					<Manufacturer>TUG Generic</Manufacturer>
+					<Model>N.A.</Model>
+					<CertificationNumber>AXLGEAR-6.500</CertificationNumber>
+					<Date>2019-02-27T09:39:05.3410801Z</Date>
+					<AppVersion>VectoCore</AppVersion>
+					<LineType>Single portal axle</LineType>
+					<Ratio>6.500</Ratio>
+					<CertificationMethod>Standard values</CertificationMethod>
+					<TorqueLossMap>
+						<Entry inputSpeed="0.00" inputTorque="31.96" torqueLoss="31.96"/>
+						<Entry inputSpeed="0.00" inputTorque="70.42" torqueLoss="31.96"/>
+						<Entry inputSpeed="0.00" inputTorque="110.07" torqueLoss="33.15"/>
+						<Entry inputSpeed="0.00" inputTorque="149.72" torqueLoss="34.34"/>
+						<Entry inputSpeed="0.00" inputTorque="189.37" torqueLoss="35.53"/>
+						<Entry inputSpeed="0.00" inputTorque="268.68" torqueLoss="37.91"/>
+						<Entry inputSpeed="0.00" inputTorque="347.98" torqueLoss="40.29"/>
+						<Entry inputSpeed="0.00" inputTorque="506.58" torqueLoss="45.04"/>
+						<Entry inputSpeed="0.00" inputTorque="665.19" torqueLoss="49.80"/>
+						<Entry inputSpeed="0.00" inputTorque="823.79" torqueLoss="54.56"/>
+						<Entry inputSpeed="0.00" inputTorque="982.39" torqueLoss="59.32"/>
+						<Entry inputSpeed="0.00" inputTorque="1141.00" torqueLoss="64.08"/>
+						<Entry inputSpeed="0.00" inputTorque="1299.60" torqueLoss="68.83"/>
+						<Entry inputSpeed="0.00" inputTorque="1458.21" torqueLoss="73.59"/>
+						<Entry inputSpeed="0.00" inputTorque="1616.81" torqueLoss="78.35"/>
+						<Entry inputSpeed="0.00" inputTorque="1934.02" torqueLoss="87.87"/>
+						<Entry inputSpeed="0.00" inputTorque="2251.23" torqueLoss="97.38"/>
+						<Entry inputSpeed="0.00" inputTorque="2568.44" torqueLoss="106.90"/>
+						<Entry inputSpeed="0.00" inputTorque="2885.65" torqueLoss="116.42"/>
+						<Entry inputSpeed="0.00" inputTorque="3202.85" torqueLoss="125.93"/>
+						<Entry inputSpeed="0.00" inputTorque="3520.06" torqueLoss="135.45"/>
+						<Entry inputSpeed="0.00" inputTorque="3837.27" torqueLoss="144.96"/>
+						<Entry inputSpeed="0.00" inputTorque="4154.48" torqueLoss="154.48"/>
+						<Entry inputSpeed="0.00" inputTorque="4471.69" torqueLoss="164.00"/>
+						<Entry inputSpeed="0.00" inputTorque="4788.90" torqueLoss="173.51"/>
+						<Entry inputSpeed="0.00" inputTorque="5106.11" torqueLoss="183.03"/>
+						<Entry inputSpeed="0.00" inputTorque="5423.31" torqueLoss="192.55"/>
+						<Entry inputSpeed="0.00" inputTorque="5740.52" torqueLoss="202.06"/>
+						<Entry inputSpeed="0.00" inputTorque="6057.73" torqueLoss="211.58"/>
+						<Entry inputSpeed="0.00" inputTorque="6374.94" torqueLoss="221.09"/>
+						<Entry inputSpeed="0.00" inputTorque="6692.15" torqueLoss="230.61"/>
+						<Entry inputSpeed="0.00" inputTorque="7009.36" torqueLoss="240.13"/>
+						<Entry inputSpeed="0.00" inputTorque="7326.57" torqueLoss="249.64"/>
+						<Entry inputSpeed="0.00" inputTorque="7643.77" torqueLoss="259.16"/>
+						<Entry inputSpeed="0.00" inputTorque="7960.98" torqueLoss="268.68"/>
+						<Entry inputSpeed="325.00" inputTorque="31.96" torqueLoss="31.96"/>
+						<Entry inputSpeed="325.00" inputTorque="70.42" torqueLoss="31.96"/>
+						<Entry inputSpeed="325.00" inputTorque="110.07" torqueLoss="33.15"/>
+						<Entry inputSpeed="325.00" inputTorque="149.72" torqueLoss="34.34"/>
+						<Entry inputSpeed="325.00" inputTorque="189.37" torqueLoss="35.53"/>
+						<Entry inputSpeed="325.00" inputTorque="268.68" torqueLoss="37.91"/>
+						<Entry inputSpeed="325.00" inputTorque="347.98" torqueLoss="40.29"/>
+						<Entry inputSpeed="325.00" inputTorque="506.58" torqueLoss="45.04"/>
+						<Entry inputSpeed="325.00" inputTorque="665.19" torqueLoss="49.80"/>
+						<Entry inputSpeed="325.00" inputTorque="823.79" torqueLoss="54.56"/>
+						<Entry inputSpeed="325.00" inputTorque="982.39" torqueLoss="59.32"/>
+						<Entry inputSpeed="325.00" inputTorque="1141.00" torqueLoss="64.08"/>
+						<Entry inputSpeed="325.00" inputTorque="1299.60" torqueLoss="68.83"/>
+						<Entry inputSpeed="325.00" inputTorque="1458.21" torqueLoss="73.59"/>
+						<Entry inputSpeed="325.00" inputTorque="1616.81" torqueLoss="78.35"/>
+						<Entry inputSpeed="325.00" inputTorque="1934.02" torqueLoss="87.87"/>
+						<Entry inputSpeed="325.00" inputTorque="2251.23" torqueLoss="97.38"/>
+						<Entry inputSpeed="325.00" inputTorque="2568.44" torqueLoss="106.90"/>
+						<Entry inputSpeed="325.00" inputTorque="2885.65" torqueLoss="116.42"/>
+						<Entry inputSpeed="325.00" inputTorque="3202.85" torqueLoss="125.93"/>
+						<Entry inputSpeed="325.00" inputTorque="3520.06" torqueLoss="135.45"/>
+						<Entry inputSpeed="325.00" inputTorque="3837.27" torqueLoss="144.96"/>
+						<Entry inputSpeed="325.00" inputTorque="4154.48" torqueLoss="154.48"/>
+						<Entry inputSpeed="325.00" inputTorque="4471.69" torqueLoss="164.00"/>
+						<Entry inputSpeed="325.00" inputTorque="4788.90" torqueLoss="173.51"/>
+						<Entry inputSpeed="325.00" inputTorque="5106.11" torqueLoss="183.03"/>
+						<Entry inputSpeed="325.00" inputTorque="5423.31" torqueLoss="192.55"/>
+						<Entry inputSpeed="325.00" inputTorque="5740.52" torqueLoss="202.06"/>
+						<Entry inputSpeed="325.00" inputTorque="6057.73" torqueLoss="211.58"/>
+						<Entry inputSpeed="325.00" inputTorque="6374.94" torqueLoss="221.09"/>
+						<Entry inputSpeed="325.00" inputTorque="6692.15" torqueLoss="230.61"/>
+						<Entry inputSpeed="325.00" inputTorque="7009.36" torqueLoss="240.13"/>
+						<Entry inputSpeed="325.00" inputTorque="7326.57" torqueLoss="249.64"/>
+						<Entry inputSpeed="325.00" inputTorque="7643.77" torqueLoss="259.16"/>
+						<Entry inputSpeed="325.00" inputTorque="7960.98" torqueLoss="268.68"/>
+						<Entry inputSpeed="650.00" inputTorque="31.96" torqueLoss="31.96"/>
+						<Entry inputSpeed="650.00" inputTorque="70.42" torqueLoss="31.96"/>
+						<Entry inputSpeed="650.00" inputTorque="110.07" torqueLoss="33.15"/>
+						<Entry inputSpeed="650.00" inputTorque="149.72" torqueLoss="34.34"/>
+						<Entry inputSpeed="650.00" inputTorque="189.37" torqueLoss="35.53"/>
+						<Entry inputSpeed="650.00" inputTorque="268.68" torqueLoss="37.91"/>
+						<Entry inputSpeed="650.00" inputTorque="347.98" torqueLoss="40.29"/>
+						<Entry inputSpeed="650.00" inputTorque="506.58" torqueLoss="45.04"/>
+						<Entry inputSpeed="650.00" inputTorque="665.19" torqueLoss="49.80"/>
+						<Entry inputSpeed="650.00" inputTorque="823.79" torqueLoss="54.56"/>
+						<Entry inputSpeed="650.00" inputTorque="982.39" torqueLoss="59.32"/>
+						<Entry inputSpeed="650.00" inputTorque="1141.00" torqueLoss="64.08"/>
+						<Entry inputSpeed="650.00" inputTorque="1299.60" torqueLoss="68.83"/>
+						<Entry inputSpeed="650.00" inputTorque="1458.21" torqueLoss="73.59"/>
+						<Entry inputSpeed="650.00" inputTorque="1616.81" torqueLoss="78.35"/>
+						<Entry inputSpeed="650.00" inputTorque="1934.02" torqueLoss="87.87"/>
+						<Entry inputSpeed="650.00" inputTorque="2251.23" torqueLoss="97.38"/>
+						<Entry inputSpeed="650.00" inputTorque="2568.44" torqueLoss="106.90"/>
+						<Entry inputSpeed="650.00" inputTorque="2885.65" torqueLoss="116.42"/>
+						<Entry inputSpeed="650.00" inputTorque="3202.85" torqueLoss="125.93"/>
+						<Entry inputSpeed="650.00" inputTorque="3520.06" torqueLoss="135.45"/>
+						<Entry inputSpeed="650.00" inputTorque="3837.27" torqueLoss="144.96"/>
+						<Entry inputSpeed="650.00" inputTorque="4154.48" torqueLoss="154.48"/>
+						<Entry inputSpeed="650.00" inputTorque="4471.69" torqueLoss="164.00"/>
+						<Entry inputSpeed="650.00" inputTorque="4788.90" torqueLoss="173.51"/>
+						<Entry inputSpeed="650.00" inputTorque="5106.11" torqueLoss="183.03"/>
+						<Entry inputSpeed="650.00" inputTorque="5423.31" torqueLoss="192.55"/>
+						<Entry inputSpeed="650.00" inputTorque="5740.52" torqueLoss="202.06"/>
+						<Entry inputSpeed="650.00" inputTorque="6057.73" torqueLoss="211.58"/>
+						<Entry inputSpeed="650.00" inputTorque="6374.94" torqueLoss="221.09"/>
+						<Entry inputSpeed="650.00" inputTorque="6692.15" torqueLoss="230.61"/>
+						<Entry inputSpeed="650.00" inputTorque="7009.36" torqueLoss="240.13"/>
+						<Entry inputSpeed="650.00" inputTorque="7326.57" torqueLoss="249.64"/>
+						<Entry inputSpeed="650.00" inputTorque="7643.77" torqueLoss="259.16"/>
+						<Entry inputSpeed="650.00" inputTorque="7960.98" torqueLoss="268.68"/>
+						<Entry inputSpeed="975.00" inputTorque="31.96" torqueLoss="31.96"/>
+						<Entry inputSpeed="975.00" inputTorque="70.42" torqueLoss="31.96"/>
+						<Entry inputSpeed="975.00" inputTorque="110.07" torqueLoss="33.15"/>
+						<Entry inputSpeed="975.00" inputTorque="149.72" torqueLoss="34.34"/>
+						<Entry inputSpeed="975.00" inputTorque="189.37" torqueLoss="35.53"/>
+						<Entry inputSpeed="975.00" inputTorque="268.68" torqueLoss="37.91"/>
+						<Entry inputSpeed="975.00" inputTorque="347.98" torqueLoss="40.29"/>
+						<Entry inputSpeed="975.00" inputTorque="506.58" torqueLoss="45.04"/>
+						<Entry inputSpeed="975.00" inputTorque="665.19" torqueLoss="49.80"/>
+						<Entry inputSpeed="975.00" inputTorque="823.79" torqueLoss="54.56"/>
+						<Entry inputSpeed="975.00" inputTorque="982.39" torqueLoss="59.32"/>
+						<Entry inputSpeed="975.00" inputTorque="1141.00" torqueLoss="64.08"/>
+						<Entry inputSpeed="975.00" inputTorque="1299.60" torqueLoss="68.83"/>
+						<Entry inputSpeed="975.00" inputTorque="1458.21" torqueLoss="73.59"/>
+						<Entry inputSpeed="975.00" inputTorque="1616.81" torqueLoss="78.35"/>
+						<Entry inputSpeed="975.00" inputTorque="1934.02" torqueLoss="87.87"/>
+						<Entry inputSpeed="975.00" inputTorque="2251.23" torqueLoss="97.38"/>
+						<Entry inputSpeed="975.00" inputTorque="2568.44" torqueLoss="106.90"/>
+						<Entry inputSpeed="975.00" inputTorque="2885.65" torqueLoss="116.42"/>
+						<Entry inputSpeed="975.00" inputTorque="3202.85" torqueLoss="125.93"/>
+						<Entry inputSpeed="975.00" inputTorque="3520.06" torqueLoss="135.45"/>
+						<Entry inputSpeed="975.00" inputTorque="3837.27" torqueLoss="144.96"/>
+						<Entry inputSpeed="975.00" inputTorque="4154.48" torqueLoss="154.48"/>
+						<Entry inputSpeed="975.00" inputTorque="4471.69" torqueLoss="164.00"/>
+						<Entry inputSpeed="975.00" inputTorque="4788.90" torqueLoss="173.51"/>
+						<Entry inputSpeed="975.00" inputTorque="5106.11" torqueLoss="183.03"/>
+						<Entry inputSpeed="975.00" inputTorque="5423.31" torqueLoss="192.55"/>
+						<Entry inputSpeed="975.00" inputTorque="5740.52" torqueLoss="202.06"/>
+						<Entry inputSpeed="975.00" inputTorque="6057.73" torqueLoss="211.58"/>
+						<Entry inputSpeed="975.00" inputTorque="6374.94" torqueLoss="221.09"/>
+						<Entry inputSpeed="975.00" inputTorque="6692.15" torqueLoss="230.61"/>
+						<Entry inputSpeed="975.00" inputTorque="7009.36" torqueLoss="240.13"/>
+						<Entry inputSpeed="975.00" inputTorque="7326.57" torqueLoss="249.64"/>
+						<Entry inputSpeed="975.00" inputTorque="7643.77" torqueLoss="259.16"/>
+						<Entry inputSpeed="975.00" inputTorque="7960.98" torqueLoss="268.68"/>
+						<Entry inputSpeed="1300.00" inputTorque="31.96" torqueLoss="31.96"/>
+						<Entry inputSpeed="1300.00" inputTorque="70.42" torqueLoss="31.96"/>
+						<Entry inputSpeed="1300.00" inputTorque="110.07" torqueLoss="33.15"/>
+						<Entry inputSpeed="1300.00" inputTorque="149.72" torqueLoss="34.34"/>
+						<Entry inputSpeed="1300.00" inputTorque="189.37" torqueLoss="35.53"/>
+						<Entry inputSpeed="1300.00" inputTorque="268.68" torqueLoss="37.91"/>
+						<Entry inputSpeed="1300.00" inputTorque="347.98" torqueLoss="40.29"/>
+						<Entry inputSpeed="1300.00" inputTorque="506.58" torqueLoss="45.04"/>
+						<Entry inputSpeed="1300.00" inputTorque="665.19" torqueLoss="49.80"/>
+						<Entry inputSpeed="1300.00" inputTorque="823.79" torqueLoss="54.56"/>
+						<Entry inputSpeed="1300.00" inputTorque="982.39" torqueLoss="59.32"/>
+						<Entry inputSpeed="1300.00" inputTorque="1141.00" torqueLoss="64.08"/>
+						<Entry inputSpeed="1300.00" inputTorque="1299.60" torqueLoss="68.83"/>
+						<Entry inputSpeed="1300.00" inputTorque="1458.21" torqueLoss="73.59"/>
+						<Entry inputSpeed="1300.00" inputTorque="1616.81" torqueLoss="78.35"/>
+						<Entry inputSpeed="1300.00" inputTorque="1934.02" torqueLoss="87.87"/>
+						<Entry inputSpeed="1300.00" inputTorque="2251.23" torqueLoss="97.38"/>
+						<Entry inputSpeed="1300.00" inputTorque="2568.44" torqueLoss="106.90"/>
+						<Entry inputSpeed="1300.00" inputTorque="2885.65" torqueLoss="116.42"/>
+						<Entry inputSpeed="1300.00" inputTorque="3202.85" torqueLoss="125.93"/>
+						<Entry inputSpeed="1300.00" inputTorque="3520.06" torqueLoss="135.45"/>
+						<Entry inputSpeed="1300.00" inputTorque="3837.27" torqueLoss="144.96"/>
+						<Entry inputSpeed="1300.00" inputTorque="4154.48" torqueLoss="154.48"/>
+						<Entry inputSpeed="1300.00" inputTorque="4471.69" torqueLoss="164.00"/>
+						<Entry inputSpeed="1300.00" inputTorque="4788.90" torqueLoss="173.51"/>
+						<Entry inputSpeed="1300.00" inputTorque="5106.11" torqueLoss="183.03"/>
+						<Entry inputSpeed="1300.00" inputTorque="5423.31" torqueLoss="192.55"/>
+						<Entry inputSpeed="1300.00" inputTorque="5740.52" torqueLoss="202.06"/>
+						<Entry inputSpeed="1300.00" inputTorque="6057.73" torqueLoss="211.58"/>
+						<Entry inputSpeed="1300.00" inputTorque="6374.94" torqueLoss="221.09"/>
+						<Entry inputSpeed="1300.00" inputTorque="6692.15" torqueLoss="230.61"/>
+						<Entry inputSpeed="1300.00" inputTorque="7009.36" torqueLoss="240.13"/>
+						<Entry inputSpeed="1300.00" inputTorque="7326.57" torqueLoss="249.64"/>
+						<Entry inputSpeed="1300.00" inputTorque="7643.77" torqueLoss="259.16"/>
+						<Entry inputSpeed="1300.00" inputTorque="7960.98" torqueLoss="268.68"/>
+						<Entry inputSpeed="1625.00" inputTorque="31.96" torqueLoss="31.96"/>
+						<Entry inputSpeed="1625.00" inputTorque="70.42" torqueLoss="31.96"/>
+						<Entry inputSpeed="1625.00" inputTorque="110.07" torqueLoss="33.15"/>
+						<Entry inputSpeed="1625.00" inputTorque="149.72" torqueLoss="34.34"/>
+						<Entry inputSpeed="1625.00" inputTorque="189.37" torqueLoss="35.53"/>
+						<Entry inputSpeed="1625.00" inputTorque="268.68" torqueLoss="37.91"/>
+						<Entry inputSpeed="1625.00" inputTorque="347.98" torqueLoss="40.29"/>
+						<Entry inputSpeed="1625.00" inputTorque="506.58" torqueLoss="45.04"/>
+						<Entry inputSpeed="1625.00" inputTorque="665.19" torqueLoss="49.80"/>
+						<Entry inputSpeed="1625.00" inputTorque="823.79" torqueLoss="54.56"/>
+						<Entry inputSpeed="1625.00" inputTorque="982.39" torqueLoss="59.32"/>
+						<Entry inputSpeed="1625.00" inputTorque="1141.00" torqueLoss="64.08"/>
+						<Entry inputSpeed="1625.00" inputTorque="1299.60" torqueLoss="68.83"/>
+						<Entry inputSpeed="1625.00" inputTorque="1458.21" torqueLoss="73.59"/>
+						<Entry inputSpeed="1625.00" inputTorque="1616.81" torqueLoss="78.35"/>
+						<Entry inputSpeed="1625.00" inputTorque="1934.02" torqueLoss="87.87"/>
+						<Entry inputSpeed="1625.00" inputTorque="2251.23" torqueLoss="97.38"/>
+						<Entry inputSpeed="1625.00" inputTorque="2568.44" torqueLoss="106.90"/>
+						<Entry inputSpeed="1625.00" inputTorque="2885.65" torqueLoss="116.42"/>
+						<Entry inputSpeed="1625.00" inputTorque="3202.85" torqueLoss="125.93"/>
+						<Entry inputSpeed="1625.00" inputTorque="3520.06" torqueLoss="135.45"/>
+						<Entry inputSpeed="1625.00" inputTorque="3837.27" torqueLoss="144.96"/>
+						<Entry inputSpeed="1625.00" inputTorque="4154.48" torqueLoss="154.48"/>
+						<Entry inputSpeed="1625.00" inputTorque="4471.69" torqueLoss="164.00"/>
+						<Entry inputSpeed="1625.00" inputTorque="4788.90" torqueLoss="173.51"/>
+						<Entry inputSpeed="1625.00" inputTorque="5106.11" torqueLoss="183.03"/>
+						<Entry inputSpeed="1625.00" inputTorque="5423.31" torqueLoss="192.55"/>
+						<Entry inputSpeed="1625.00" inputTorque="5740.52" torqueLoss="202.06"/>
+						<Entry inputSpeed="1625.00" inputTorque="6057.73" torqueLoss="211.58"/>
+						<Entry inputSpeed="1625.00" inputTorque="6374.94" torqueLoss="221.09"/>
+						<Entry inputSpeed="1625.00" inputTorque="6692.15" torqueLoss="230.61"/>
+						<Entry inputSpeed="1625.00" inputTorque="7009.36" torqueLoss="240.13"/>
+						<Entry inputSpeed="1625.00" inputTorque="7326.57" torqueLoss="249.64"/>
+						<Entry inputSpeed="1625.00" inputTorque="7643.77" torqueLoss="259.16"/>
+						<Entry inputSpeed="1625.00" inputTorque="7960.98" torqueLoss="268.68"/>
+						<Entry inputSpeed="1950.00" inputTorque="31.96" torqueLoss="31.96"/>
+						<Entry inputSpeed="1950.00" inputTorque="70.42" torqueLoss="31.96"/>
+						<Entry inputSpeed="1950.00" inputTorque="110.07" torqueLoss="33.15"/>
+						<Entry inputSpeed="1950.00" inputTorque="149.72" torqueLoss="34.34"/>
+						<Entry inputSpeed="1950.00" inputTorque="189.37" torqueLoss="35.53"/>
+						<Entry inputSpeed="1950.00" inputTorque="268.68" torqueLoss="37.91"/>
+						<Entry inputSpeed="1950.00" inputTorque="347.98" torqueLoss="40.29"/>
+						<Entry inputSpeed="1950.00" inputTorque="506.58" torqueLoss="45.04"/>
+						<Entry inputSpeed="1950.00" inputTorque="665.19" torqueLoss="49.80"/>
+						<Entry inputSpeed="1950.00" inputTorque="823.79" torqueLoss="54.56"/>
+						<Entry inputSpeed="1950.00" inputTorque="982.39" torqueLoss="59.32"/>
+						<Entry inputSpeed="1950.00" inputTorque="1141.00" torqueLoss="64.08"/>
+						<Entry inputSpeed="1950.00" inputTorque="1299.60" torqueLoss="68.83"/>
+						<Entry inputSpeed="1950.00" inputTorque="1458.21" torqueLoss="73.59"/>
+						<Entry inputSpeed="1950.00" inputTorque="1616.81" torqueLoss="78.35"/>
+						<Entry inputSpeed="1950.00" inputTorque="1934.02" torqueLoss="87.87"/>
+						<Entry inputSpeed="1950.00" inputTorque="2251.23" torqueLoss="97.38"/>
+						<Entry inputSpeed="1950.00" inputTorque="2568.44" torqueLoss="106.90"/>
+						<Entry inputSpeed="1950.00" inputTorque="2885.65" torqueLoss="116.42"/>
+						<Entry inputSpeed="1950.00" inputTorque="3202.85" torqueLoss="125.93"/>
+						<Entry inputSpeed="1950.00" inputTorque="3520.06" torqueLoss="135.45"/>
+						<Entry inputSpeed="1950.00" inputTorque="3837.27" torqueLoss="144.96"/>
+						<Entry inputSpeed="1950.00" inputTorque="4154.48" torqueLoss="154.48"/>
+						<Entry inputSpeed="1950.00" inputTorque="4471.69" torqueLoss="164.00"/>
+						<Entry inputSpeed="1950.00" inputTorque="4788.90" torqueLoss="173.51"/>
+						<Entry inputSpeed="1950.00" inputTorque="5106.11" torqueLoss="183.03"/>
+						<Entry inputSpeed="1950.00" inputTorque="5423.31" torqueLoss="192.55"/>
+						<Entry inputSpeed="1950.00" inputTorque="5740.52" torqueLoss="202.06"/>
+						<Entry inputSpeed="1950.00" inputTorque="6057.73" torqueLoss="211.58"/>
+						<Entry inputSpeed="1950.00" inputTorque="6374.94" torqueLoss="221.09"/>
+						<Entry inputSpeed="1950.00" inputTorque="6692.15" torqueLoss="230.61"/>
+						<Entry inputSpeed="1950.00" inputTorque="7009.36" torqueLoss="240.13"/>
+						<Entry inputSpeed="1950.00" inputTorque="7326.57" torqueLoss="249.64"/>
+						<Entry inputSpeed="1950.00" inputTorque="7643.77" torqueLoss="259.16"/>
+						<Entry inputSpeed="1950.00" inputTorque="7960.98" torqueLoss="268.68"/>
+						<Entry inputSpeed="2275.00" inputTorque="31.96" torqueLoss="31.96"/>
+						<Entry inputSpeed="2275.00" inputTorque="70.42" torqueLoss="31.96"/>
+						<Entry inputSpeed="2275.00" inputTorque="110.07" torqueLoss="33.15"/>
+						<Entry inputSpeed="2275.00" inputTorque="149.72" torqueLoss="34.34"/>
+						<Entry inputSpeed="2275.00" inputTorque="189.37" torqueLoss="35.53"/>
+						<Entry inputSpeed="2275.00" inputTorque="268.68" torqueLoss="37.91"/>
+						<Entry inputSpeed="2275.00" inputTorque="347.98" torqueLoss="40.29"/>
+						<Entry inputSpeed="2275.00" inputTorque="506.58" torqueLoss="45.04"/>
+						<Entry inputSpeed="2275.00" inputTorque="665.19" torqueLoss="49.80"/>
+						<Entry inputSpeed="2275.00" inputTorque="823.79" torqueLoss="54.56"/>
+						<Entry inputSpeed="2275.00" inputTorque="982.39" torqueLoss="59.32"/>
+						<Entry inputSpeed="2275.00" inputTorque="1141.00" torqueLoss="64.08"/>
+						<Entry inputSpeed="2275.00" inputTorque="1299.60" torqueLoss="68.83"/>
+						<Entry inputSpeed="2275.00" inputTorque="1458.21" torqueLoss="73.59"/>
+						<Entry inputSpeed="2275.00" inputTorque="1616.81" torqueLoss="78.35"/>
+						<Entry inputSpeed="2275.00" inputTorque="1934.02" torqueLoss="87.87"/>
+						<Entry inputSpeed="2275.00" inputTorque="2251.23" torqueLoss="97.38"/>
+						<Entry inputSpeed="2275.00" inputTorque="2568.44" torqueLoss="106.90"/>
+						<Entry inputSpeed="2275.00" inputTorque="2885.65" torqueLoss="116.42"/>
+						<Entry inputSpeed="2275.00" inputTorque="3202.85" torqueLoss="125.93"/>
+						<Entry inputSpeed="2275.00" inputTorque="3520.06" torqueLoss="135.45"/>
+						<Entry inputSpeed="2275.00" inputTorque="3837.27" torqueLoss="144.96"/>
+						<Entry inputSpeed="2275.00" inputTorque="4154.48" torqueLoss="154.48"/>
+						<Entry inputSpeed="2275.00" inputTorque="4471.69" torqueLoss="164.00"/>
+						<Entry inputSpeed="2275.00" inputTorque="4788.90" torqueLoss="173.51"/>
+						<Entry inputSpeed="2275.00" inputTorque="5106.11" torqueLoss="183.03"/>
+						<Entry inputSpeed="2275.00" inputTorque="5423.31" torqueLoss="192.55"/>
+						<Entry inputSpeed="2275.00" inputTorque="5740.52" torqueLoss="202.06"/>
+						<Entry inputSpeed="2275.00" inputTorque="6057.73" torqueLoss="211.58"/>
+						<Entry inputSpeed="2275.00" inputTorque="6374.94" torqueLoss="221.09"/>
+						<Entry inputSpeed="2275.00" inputTorque="6692.15" torqueLoss="230.61"/>
+						<Entry inputSpeed="2275.00" inputTorque="7009.36" torqueLoss="240.13"/>
+						<Entry inputSpeed="2275.00" inputTorque="7326.57" torqueLoss="249.64"/>
+						<Entry inputSpeed="2275.00" inputTorque="7643.77" torqueLoss="259.16"/>
+						<Entry inputSpeed="2275.00" inputTorque="7960.98" torqueLoss="268.68"/>
+						<Entry inputSpeed="2600.00" inputTorque="31.96" torqueLoss="31.96"/>
+						<Entry inputSpeed="2600.00" inputTorque="70.42" torqueLoss="31.96"/>
+						<Entry inputSpeed="2600.00" inputTorque="110.07" torqueLoss="33.15"/>
+						<Entry inputSpeed="2600.00" inputTorque="149.72" torqueLoss="34.34"/>
+						<Entry inputSpeed="2600.00" inputTorque="189.37" torqueLoss="35.53"/>
+						<Entry inputSpeed="2600.00" inputTorque="268.68" torqueLoss="37.91"/>
+						<Entry inputSpeed="2600.00" inputTorque="347.98" torqueLoss="40.29"/>
+						<Entry inputSpeed="2600.00" inputTorque="506.58" torqueLoss="45.04"/>
+						<Entry inputSpeed="2600.00" inputTorque="665.19" torqueLoss="49.80"/>
+						<Entry inputSpeed="2600.00" inputTorque="823.79" torqueLoss="54.56"/>
+						<Entry inputSpeed="2600.00" inputTorque="982.39" torqueLoss="59.32"/>
+						<Entry inputSpeed="2600.00" inputTorque="1141.00" torqueLoss="64.08"/>
+						<Entry inputSpeed="2600.00" inputTorque="1299.60" torqueLoss="68.83"/>
+						<Entry inputSpeed="2600.00" inputTorque="1458.21" torqueLoss="73.59"/>
+						<Entry inputSpeed="2600.00" inputTorque="1616.81" torqueLoss="78.35"/>
+						<Entry inputSpeed="2600.00" inputTorque="1934.02" torqueLoss="87.87"/>
+						<Entry inputSpeed="2600.00" inputTorque="2251.23" torqueLoss="97.38"/>
+						<Entry inputSpeed="2600.00" inputTorque="2568.44" torqueLoss="106.90"/>
+						<Entry inputSpeed="2600.00" inputTorque="2885.65" torqueLoss="116.42"/>
+						<Entry inputSpeed="2600.00" inputTorque="3202.85" torqueLoss="125.93"/>
+						<Entry inputSpeed="2600.00" inputTorque="3520.06" torqueLoss="135.45"/>
+						<Entry inputSpeed="2600.00" inputTorque="3837.27" torqueLoss="144.96"/>
+						<Entry inputSpeed="2600.00" inputTorque="4154.48" torqueLoss="154.48"/>
+						<Entry inputSpeed="2600.00" inputTorque="4471.69" torqueLoss="164.00"/>
+						<Entry inputSpeed="2600.00" inputTorque="4788.90" torqueLoss="173.51"/>
+						<Entry inputSpeed="2600.00" inputTorque="5106.11" torqueLoss="183.03"/>
+						<Entry inputSpeed="2600.00" inputTorque="5423.31" torqueLoss="192.55"/>
+						<Entry inputSpeed="2600.00" inputTorque="5740.52" torqueLoss="202.06"/>
+						<Entry inputSpeed="2600.00" inputTorque="6057.73" torqueLoss="211.58"/>
+						<Entry inputSpeed="2600.00" inputTorque="6374.94" torqueLoss="221.09"/>
+						<Entry inputSpeed="2600.00" inputTorque="6692.15" torqueLoss="230.61"/>
+						<Entry inputSpeed="2600.00" inputTorque="7009.36" torqueLoss="240.13"/>
+						<Entry inputSpeed="2600.00" inputTorque="7326.57" torqueLoss="249.64"/>
+						<Entry inputSpeed="2600.00" inputTorque="7643.77" torqueLoss="259.16"/>
+						<Entry inputSpeed="2600.00" inputTorque="7960.98" torqueLoss="268.68"/>
+						<Entry inputSpeed="2925.00" inputTorque="31.96" torqueLoss="31.96"/>
+						<Entry inputSpeed="2925.00" inputTorque="70.42" torqueLoss="31.96"/>
+						<Entry inputSpeed="2925.00" inputTorque="110.07" torqueLoss="33.15"/>
+						<Entry inputSpeed="2925.00" inputTorque="149.72" torqueLoss="34.34"/>
+						<Entry inputSpeed="2925.00" inputTorque="189.37" torqueLoss="35.53"/>
+						<Entry inputSpeed="2925.00" inputTorque="268.68" torqueLoss="37.91"/>
+						<Entry inputSpeed="2925.00" inputTorque="347.98" torqueLoss="40.29"/>
+						<Entry inputSpeed="2925.00" inputTorque="506.58" torqueLoss="45.04"/>
+						<Entry inputSpeed="2925.00" inputTorque="665.19" torqueLoss="49.80"/>
+						<Entry inputSpeed="2925.00" inputTorque="823.79" torqueLoss="54.56"/>
+						<Entry inputSpeed="2925.00" inputTorque="982.39" torqueLoss="59.32"/>
+						<Entry inputSpeed="2925.00" inputTorque="1141.00" torqueLoss="64.08"/>
+						<Entry inputSpeed="2925.00" inputTorque="1299.60" torqueLoss="68.83"/>
+						<Entry inputSpeed="2925.00" inputTorque="1458.21" torqueLoss="73.59"/>
+						<Entry inputSpeed="2925.00" inputTorque="1616.81" torqueLoss="78.35"/>
+						<Entry inputSpeed="2925.00" inputTorque="1934.02" torqueLoss="87.87"/>
+						<Entry inputSpeed="2925.00" inputTorque="2251.23" torqueLoss="97.38"/>
+						<Entry inputSpeed="2925.00" inputTorque="2568.44" torqueLoss="106.90"/>
+						<Entry inputSpeed="2925.00" inputTorque="2885.65" torqueLoss="116.42"/>
+						<Entry inputSpeed="2925.00" inputTorque="3202.85" torqueLoss="125.93"/>
+						<Entry inputSpeed="2925.00" inputTorque="3520.06" torqueLoss="135.45"/>
+						<Entry inputSpeed="2925.00" inputTorque="3837.27" torqueLoss="144.96"/>
+						<Entry inputSpeed="2925.00" inputTorque="4154.48" torqueLoss="154.48"/>
+						<Entry inputSpeed="2925.00" inputTorque="4471.69" torqueLoss="164.00"/>
+						<Entry inputSpeed="2925.00" inputTorque="4788.90" torqueLoss="173.51"/>
+						<Entry inputSpeed="2925.00" inputTorque="5106.11" torqueLoss="183.03"/>
+						<Entry inputSpeed="2925.00" inputTorque="5423.31" torqueLoss="192.55"/>
+						<Entry inputSpeed="2925.00" inputTorque="5740.52" torqueLoss="202.06"/>
+						<Entry inputSpeed="2925.00" inputTorque="6057.73" torqueLoss="211.58"/>
+						<Entry inputSpeed="2925.00" inputTorque="6374.94" torqueLoss="221.09"/>
+						<Entry inputSpeed="2925.00" inputTorque="6692.15" torqueLoss="230.61"/>
+						<Entry inputSpeed="2925.00" inputTorque="7009.36" torqueLoss="240.13"/>
+						<Entry inputSpeed="2925.00" inputTorque="7326.57" torqueLoss="249.64"/>
+						<Entry inputSpeed="2925.00" inputTorque="7643.77" torqueLoss="259.16"/>
+						<Entry inputSpeed="2925.00" inputTorque="7960.98" torqueLoss="268.68"/>
+						<Entry inputSpeed="3250.00" inputTorque="31.96" torqueLoss="31.96"/>
+						<Entry inputSpeed="3250.00" inputTorque="70.42" torqueLoss="31.96"/>
+						<Entry inputSpeed="3250.00" inputTorque="110.07" torqueLoss="33.15"/>
+						<Entry inputSpeed="3250.00" inputTorque="149.72" torqueLoss="34.34"/>
+						<Entry inputSpeed="3250.00" inputTorque="189.37" torqueLoss="35.53"/>
+						<Entry inputSpeed="3250.00" inputTorque="268.68" torqueLoss="37.91"/>
+						<Entry inputSpeed="3250.00" inputTorque="347.98" torqueLoss="40.29"/>
+						<Entry inputSpeed="3250.00" inputTorque="506.58" torqueLoss="45.04"/>
+						<Entry inputSpeed="3250.00" inputTorque="665.19" torqueLoss="49.80"/>
+						<Entry inputSpeed="3250.00" inputTorque="823.79" torqueLoss="54.56"/>
+						<Entry inputSpeed="3250.00" inputTorque="982.39" torqueLoss="59.32"/>
+						<Entry inputSpeed="3250.00" inputTorque="1141.00" torqueLoss="64.08"/>
+						<Entry inputSpeed="3250.00" inputTorque="1299.60" torqueLoss="68.83"/>
+						<Entry inputSpeed="3250.00" inputTorque="1458.21" torqueLoss="73.59"/>
+						<Entry inputSpeed="3250.00" inputTorque="1616.81" torqueLoss="78.35"/>
+						<Entry inputSpeed="3250.00" inputTorque="1934.02" torqueLoss="87.87"/>
+						<Entry inputSpeed="3250.00" inputTorque="2251.23" torqueLoss="97.38"/>
+						<Entry inputSpeed="3250.00" inputTorque="2568.44" torqueLoss="106.90"/>
+						<Entry inputSpeed="3250.00" inputTorque="2885.65" torqueLoss="116.42"/>
+						<Entry inputSpeed="3250.00" inputTorque="3202.85" torqueLoss="125.93"/>
+						<Entry inputSpeed="3250.00" inputTorque="3520.06" torqueLoss="135.45"/>
+						<Entry inputSpeed="3250.00" inputTorque="3837.27" torqueLoss="144.96"/>
+						<Entry inputSpeed="3250.00" inputTorque="4154.48" torqueLoss="154.48"/>
+						<Entry inputSpeed="3250.00" inputTorque="4471.69" torqueLoss="164.00"/>
+						<Entry inputSpeed="3250.00" inputTorque="4788.90" torqueLoss="173.51"/>
+						<Entry inputSpeed="3250.00" inputTorque="5106.11" torqueLoss="183.03"/>
+						<Entry inputSpeed="3250.00" inputTorque="5423.31" torqueLoss="192.55"/>
+						<Entry inputSpeed="3250.00" inputTorque="5740.52" torqueLoss="202.06"/>
+						<Entry inputSpeed="3250.00" inputTorque="6057.73" torqueLoss="211.58"/>
+						<Entry inputSpeed="3250.00" inputTorque="6374.94" torqueLoss="221.09"/>
+						<Entry inputSpeed="3250.00" inputTorque="6692.15" torqueLoss="230.61"/>
+						<Entry inputSpeed="3250.00" inputTorque="7009.36" torqueLoss="240.13"/>
+						<Entry inputSpeed="3250.00" inputTorque="7326.57" torqueLoss="249.64"/>
+						<Entry inputSpeed="3250.00" inputTorque="7643.77" torqueLoss="259.16"/>
+						<Entry inputSpeed="3250.00" inputTorque="7960.98" torqueLoss="268.68"/>
+						<Entry inputSpeed="0.00" inputTorque="-31.96" torqueLoss="31.96"/>
+						<Entry inputSpeed="0.00" inputTorque="-70.42" torqueLoss="31.96"/>
+						<Entry inputSpeed="0.00" inputTorque="-110.07" torqueLoss="33.15"/>
+						<Entry inputSpeed="0.00" inputTorque="-149.72" torqueLoss="34.34"/>
+						<Entry inputSpeed="0.00" inputTorque="-189.37" torqueLoss="35.53"/>
+						<Entry inputSpeed="0.00" inputTorque="-268.68" torqueLoss="37.91"/>
+						<Entry inputSpeed="0.00" inputTorque="-347.98" torqueLoss="40.29"/>
+						<Entry inputSpeed="0.00" inputTorque="-506.58" torqueLoss="45.04"/>
+						<Entry inputSpeed="0.00" inputTorque="-665.19" torqueLoss="49.80"/>
+						<Entry inputSpeed="0.00" inputTorque="-823.79" torqueLoss="54.56"/>
+						<Entry inputSpeed="0.00" inputTorque="-982.39" torqueLoss="59.32"/>
+						<Entry inputSpeed="0.00" inputTorque="-1141.00" torqueLoss="64.08"/>
+						<Entry inputSpeed="0.00" inputTorque="-1299.60" torqueLoss="68.83"/>
+						<Entry inputSpeed="0.00" inputTorque="-1458.21" torqueLoss="73.59"/>
+						<Entry inputSpeed="0.00" inputTorque="-1616.81" torqueLoss="78.35"/>
+						<Entry inputSpeed="0.00" inputTorque="-1934.02" torqueLoss="87.87"/>
+						<Entry inputSpeed="0.00" inputTorque="-2251.23" torqueLoss="97.38"/>
+						<Entry inputSpeed="0.00" inputTorque="-2568.44" torqueLoss="106.90"/>
+						<Entry inputSpeed="0.00" inputTorque="-2885.65" torqueLoss="116.42"/>
+						<Entry inputSpeed="0.00" inputTorque="-3202.85" torqueLoss="125.93"/>
+						<Entry inputSpeed="0.00" inputTorque="-3520.06" torqueLoss="135.45"/>
+						<Entry inputSpeed="0.00" inputTorque="-3837.27" torqueLoss="144.96"/>
+						<Entry inputSpeed="0.00" inputTorque="-4154.48" torqueLoss="154.48"/>
+						<Entry inputSpeed="0.00" inputTorque="-4471.69" torqueLoss="164.00"/>
+						<Entry inputSpeed="0.00" inputTorque="-4788.90" torqueLoss="173.51"/>
+						<Entry inputSpeed="0.00" inputTorque="-5106.11" torqueLoss="183.03"/>
+						<Entry inputSpeed="0.00" inputTorque="-5423.31" torqueLoss="192.55"/>
+						<Entry inputSpeed="0.00" inputTorque="-5740.52" torqueLoss="202.06"/>
+						<Entry inputSpeed="0.00" inputTorque="-6057.73" torqueLoss="211.58"/>
+						<Entry inputSpeed="0.00" inputTorque="-6374.94" torqueLoss="221.09"/>
+						<Entry inputSpeed="0.00" inputTorque="-6692.15" torqueLoss="230.61"/>
+						<Entry inputSpeed="0.00" inputTorque="-7009.36" torqueLoss="240.13"/>
+						<Entry inputSpeed="0.00" inputTorque="-7326.57" torqueLoss="249.64"/>
+						<Entry inputSpeed="0.00" inputTorque="-7643.77" torqueLoss="259.16"/>
+						<Entry inputSpeed="0.00" inputTorque="-7960.98" torqueLoss="268.68"/>
+						<Entry inputSpeed="325.00" inputTorque="-31.96" torqueLoss="31.96"/>
+						<Entry inputSpeed="325.00" inputTorque="-70.42" torqueLoss="31.96"/>
+						<Entry inputSpeed="325.00" inputTorque="-110.07" torqueLoss="33.15"/>
+						<Entry inputSpeed="325.00" inputTorque="-149.72" torqueLoss="34.34"/>
+						<Entry inputSpeed="325.00" inputTorque="-189.37" torqueLoss="35.53"/>
+						<Entry inputSpeed="325.00" inputTorque="-268.68" torqueLoss="37.91"/>
+						<Entry inputSpeed="325.00" inputTorque="-347.98" torqueLoss="40.29"/>
+						<Entry inputSpeed="325.00" inputTorque="-506.58" torqueLoss="45.04"/>
+						<Entry inputSpeed="325.00" inputTorque="-665.19" torqueLoss="49.80"/>
+						<Entry inputSpeed="325.00" inputTorque="-823.79" torqueLoss="54.56"/>
+						<Entry inputSpeed="325.00" inputTorque="-982.39" torqueLoss="59.32"/>
+						<Entry inputSpeed="325.00" inputTorque="-1141.00" torqueLoss="64.08"/>
+						<Entry inputSpeed="325.00" inputTorque="-1299.60" torqueLoss="68.83"/>
+						<Entry inputSpeed="325.00" inputTorque="-1458.21" torqueLoss="73.59"/>
+						<Entry inputSpeed="325.00" inputTorque="-1616.81" torqueLoss="78.35"/>
+						<Entry inputSpeed="325.00" inputTorque="-1934.02" torqueLoss="87.87"/>
+						<Entry inputSpeed="325.00" inputTorque="-2251.23" torqueLoss="97.38"/>
+						<Entry inputSpeed="325.00" inputTorque="-2568.44" torqueLoss="106.90"/>
+						<Entry inputSpeed="325.00" inputTorque="-2885.65" torqueLoss="116.42"/>
+						<Entry inputSpeed="325.00" inputTorque="-3202.85" torqueLoss="125.93"/>
+						<Entry inputSpeed="325.00" inputTorque="-3520.06" torqueLoss="135.45"/>
+						<Entry inputSpeed="325.00" inputTorque="-3837.27" torqueLoss="144.96"/>
+						<Entry inputSpeed="325.00" inputTorque="-4154.48" torqueLoss="154.48"/>
+						<Entry inputSpeed="325.00" inputTorque="-4471.69" torqueLoss="164.00"/>
+						<Entry inputSpeed="325.00" inputTorque="-4788.90" torqueLoss="173.51"/>
+						<Entry inputSpeed="325.00" inputTorque="-5106.11" torqueLoss="183.03"/>
+						<Entry inputSpeed="325.00" inputTorque="-5423.31" torqueLoss="192.55"/>
+						<Entry inputSpeed="325.00" inputTorque="-5740.52" torqueLoss="202.06"/>
+						<Entry inputSpeed="325.00" inputTorque="-6057.73" torqueLoss="211.58"/>
+						<Entry inputSpeed="325.00" inputTorque="-6374.94" torqueLoss="221.09"/>
+						<Entry inputSpeed="325.00" inputTorque="-6692.15" torqueLoss="230.61"/>
+						<Entry inputSpeed="325.00" inputTorque="-7009.36" torqueLoss="240.13"/>
+						<Entry inputSpeed="325.00" inputTorque="-7326.57" torqueLoss="249.64"/>
+						<Entry inputSpeed="325.00" inputTorque="-7643.77" torqueLoss="259.16"/>
+						<Entry inputSpeed="325.00" inputTorque="-7960.98" torqueLoss="268.68"/>
+						<Entry inputSpeed="650.00" inputTorque="-31.96" torqueLoss="31.96"/>
+						<Entry inputSpeed="650.00" inputTorque="-70.42" torqueLoss="31.96"/>
+						<Entry inputSpeed="650.00" inputTorque="-110.07" torqueLoss="33.15"/>
+						<Entry inputSpeed="650.00" inputTorque="-149.72" torqueLoss="34.34"/>
+						<Entry inputSpeed="650.00" inputTorque="-189.37" torqueLoss="35.53"/>
+						<Entry inputSpeed="650.00" inputTorque="-268.68" torqueLoss="37.91"/>
+						<Entry inputSpeed="650.00" inputTorque="-347.98" torqueLoss="40.29"/>
+						<Entry inputSpeed="650.00" inputTorque="-506.58" torqueLoss="45.04"/>
+						<Entry inputSpeed="650.00" inputTorque="-665.19" torqueLoss="49.80"/>
+						<Entry inputSpeed="650.00" inputTorque="-823.79" torqueLoss="54.56"/>
+						<Entry inputSpeed="650.00" inputTorque="-982.39" torqueLoss="59.32"/>
+						<Entry inputSpeed="650.00" inputTorque="-1141.00" torqueLoss="64.08"/>
+						<Entry inputSpeed="650.00" inputTorque="-1299.60" torqueLoss="68.83"/>
+						<Entry inputSpeed="650.00" inputTorque="-1458.21" torqueLoss="73.59"/>
+						<Entry inputSpeed="650.00" inputTorque="-1616.81" torqueLoss="78.35"/>
+						<Entry inputSpeed="650.00" inputTorque="-1934.02" torqueLoss="87.87"/>
+						<Entry inputSpeed="650.00" inputTorque="-2251.23" torqueLoss="97.38"/>
+						<Entry inputSpeed="650.00" inputTorque="-2568.44" torqueLoss="106.90"/>
+						<Entry inputSpeed="650.00" inputTorque="-2885.65" torqueLoss="116.42"/>
+						<Entry inputSpeed="650.00" inputTorque="-3202.85" torqueLoss="125.93"/>
+						<Entry inputSpeed="650.00" inputTorque="-3520.06" torqueLoss="135.45"/>
+						<Entry inputSpeed="650.00" inputTorque="-3837.27" torqueLoss="144.96"/>
+						<Entry inputSpeed="650.00" inputTorque="-4154.48" torqueLoss="154.48"/>
+						<Entry inputSpeed="650.00" inputTorque="-4471.69" torqueLoss="164.00"/>
+						<Entry inputSpeed="650.00" inputTorque="-4788.90" torqueLoss="173.51"/>
+						<Entry inputSpeed="650.00" inputTorque="-5106.11" torqueLoss="183.03"/>
+						<Entry inputSpeed="650.00" inputTorque="-5423.31" torqueLoss="192.55"/>
+						<Entry inputSpeed="650.00" inputTorque="-5740.52" torqueLoss="202.06"/>
+						<Entry inputSpeed="650.00" inputTorque="-6057.73" torqueLoss="211.58"/>
+						<Entry inputSpeed="650.00" inputTorque="-6374.94" torqueLoss="221.09"/>
+						<Entry inputSpeed="650.00" inputTorque="-6692.15" torqueLoss="230.61"/>
+						<Entry inputSpeed="650.00" inputTorque="-7009.36" torqueLoss="240.13"/>
+						<Entry inputSpeed="650.00" inputTorque="-7326.57" torqueLoss="249.64"/>
+						<Entry inputSpeed="650.00" inputTorque="-7643.77" torqueLoss="259.16"/>
+						<Entry inputSpeed="650.00" inputTorque="-7960.98" torqueLoss="268.68"/>
+						<Entry inputSpeed="975.00" inputTorque="-31.96" torqueLoss="31.96"/>
+						<Entry inputSpeed="975.00" inputTorque="-70.42" torqueLoss="31.96"/>
+						<Entry inputSpeed="975.00" inputTorque="-110.07" torqueLoss="33.15"/>
+						<Entry inputSpeed="975.00" inputTorque="-149.72" torqueLoss="34.34"/>
+						<Entry inputSpeed="975.00" inputTorque="-189.37" torqueLoss="35.53"/>
+						<Entry inputSpeed="975.00" inputTorque="-268.68" torqueLoss="37.91"/>
+						<Entry inputSpeed="975.00" inputTorque="-347.98" torqueLoss="40.29"/>
+						<Entry inputSpeed="975.00" inputTorque="-506.58" torqueLoss="45.04"/>
+						<Entry inputSpeed="975.00" inputTorque="-665.19" torqueLoss="49.80"/>
+						<Entry inputSpeed="975.00" inputTorque="-823.79" torqueLoss="54.56"/>
+						<Entry inputSpeed="975.00" inputTorque="-982.39" torqueLoss="59.32"/>
+						<Entry inputSpeed="975.00" inputTorque="-1141.00" torqueLoss="64.08"/>
+						<Entry inputSpeed="975.00" inputTorque="-1299.60" torqueLoss="68.83"/>
+						<Entry inputSpeed="975.00" inputTorque="-1458.21" torqueLoss="73.59"/>
+						<Entry inputSpeed="975.00" inputTorque="-1616.81" torqueLoss="78.35"/>
+						<Entry inputSpeed="975.00" inputTorque="-1934.02" torqueLoss="87.87"/>
+						<Entry inputSpeed="975.00" inputTorque="-2251.23" torqueLoss="97.38"/>
+						<Entry inputSpeed="975.00" inputTorque="-2568.44" torqueLoss="106.90"/>
+						<Entry inputSpeed="975.00" inputTorque="-2885.65" torqueLoss="116.42"/>
+						<Entry inputSpeed="975.00" inputTorque="-3202.85" torqueLoss="125.93"/>
+						<Entry inputSpeed="975.00" inputTorque="-3520.06" torqueLoss="135.45"/>
+						<Entry inputSpeed="975.00" inputTorque="-3837.27" torqueLoss="144.96"/>
+						<Entry inputSpeed="975.00" inputTorque="-4154.48" torqueLoss="154.48"/>
+						<Entry inputSpeed="975.00" inputTorque="-4471.69" torqueLoss="164.00"/>
+						<Entry inputSpeed="975.00" inputTorque="-4788.90" torqueLoss="173.51"/>
+						<Entry inputSpeed="975.00" inputTorque="-5106.11" torqueLoss="183.03"/>
+						<Entry inputSpeed="975.00" inputTorque="-5423.31" torqueLoss="192.55"/>
+						<Entry inputSpeed="975.00" inputTorque="-5740.52" torqueLoss="202.06"/>
+						<Entry inputSpeed="975.00" inputTorque="-6057.73" torqueLoss="211.58"/>
+						<Entry inputSpeed="975.00" inputTorque="-6374.94" torqueLoss="221.09"/>
+						<Entry inputSpeed="975.00" inputTorque="-6692.15" torqueLoss="230.61"/>
+						<Entry inputSpeed="975.00" inputTorque="-7009.36" torqueLoss="240.13"/>
+						<Entry inputSpeed="975.00" inputTorque="-7326.57" torqueLoss="249.64"/>
+						<Entry inputSpeed="975.00" inputTorque="-7643.77" torqueLoss="259.16"/>
+						<Entry inputSpeed="975.00" inputTorque="-7960.98" torqueLoss="268.68"/>
+						<Entry inputSpeed="1300.00" inputTorque="-31.96" torqueLoss="31.96"/>
+						<Entry inputSpeed="1300.00" inputTorque="-70.42" torqueLoss="31.96"/>
+						<Entry inputSpeed="1300.00" inputTorque="-110.07" torqueLoss="33.15"/>
+						<Entry inputSpeed="1300.00" inputTorque="-149.72" torqueLoss="34.34"/>
+						<Entry inputSpeed="1300.00" inputTorque="-189.37" torqueLoss="35.53"/>
+						<Entry inputSpeed="1300.00" inputTorque="-268.68" torqueLoss="37.91"/>
+						<Entry inputSpeed="1300.00" inputTorque="-347.98" torqueLoss="40.29"/>
+						<Entry inputSpeed="1300.00" inputTorque="-506.58" torqueLoss="45.04"/>
+						<Entry inputSpeed="1300.00" inputTorque="-665.19" torqueLoss="49.80"/>
+						<Entry inputSpeed="1300.00" inputTorque="-823.79" torqueLoss="54.56"/>
+						<Entry inputSpeed="1300.00" inputTorque="-982.39" torqueLoss="59.32"/>
+						<Entry inputSpeed="1300.00" inputTorque="-1141.00" torqueLoss="64.08"/>
+						<Entry inputSpeed="1300.00" inputTorque="-1299.60" torqueLoss="68.83"/>
+						<Entry inputSpeed="1300.00" inputTorque="-1458.21" torqueLoss="73.59"/>
+						<Entry inputSpeed="1300.00" inputTorque="-1616.81" torqueLoss="78.35"/>
+						<Entry inputSpeed="1300.00" inputTorque="-1934.02" torqueLoss="87.87"/>
+						<Entry inputSpeed="1300.00" inputTorque="-2251.23" torqueLoss="97.38"/>
+						<Entry inputSpeed="1300.00" inputTorque="-2568.44" torqueLoss="106.90"/>
+						<Entry inputSpeed="1300.00" inputTorque="-2885.65" torqueLoss="116.42"/>
+						<Entry inputSpeed="1300.00" inputTorque="-3202.85" torqueLoss="125.93"/>
+						<Entry inputSpeed="1300.00" inputTorque="-3520.06" torqueLoss="135.45"/>
+						<Entry inputSpeed="1300.00" inputTorque="-3837.27" torqueLoss="144.96"/>
+						<Entry inputSpeed="1300.00" inputTorque="-4154.48" torqueLoss="154.48"/>
+						<Entry inputSpeed="1300.00" inputTorque="-4471.69" torqueLoss="164.00"/>
+						<Entry inputSpeed="1300.00" inputTorque="-4788.90" torqueLoss="173.51"/>
+						<Entry inputSpeed="1300.00" inputTorque="-5106.11" torqueLoss="183.03"/>
+						<Entry inputSpeed="1300.00" inputTorque="-5423.31" torqueLoss="192.55"/>
+						<Entry inputSpeed="1300.00" inputTorque="-5740.52" torqueLoss="202.06"/>
+						<Entry inputSpeed="1300.00" inputTorque="-6057.73" torqueLoss="211.58"/>
+						<Entry inputSpeed="1300.00" inputTorque="-6374.94" torqueLoss="221.09"/>
+						<Entry inputSpeed="1300.00" inputTorque="-6692.15" torqueLoss="230.61"/>
+						<Entry inputSpeed="1300.00" inputTorque="-7009.36" torqueLoss="240.13"/>
+						<Entry inputSpeed="1300.00" inputTorque="-7326.57" torqueLoss="249.64"/>
+						<Entry inputSpeed="1300.00" inputTorque="-7643.77" torqueLoss="259.16"/>
+						<Entry inputSpeed="1300.00" inputTorque="-7960.98" torqueLoss="268.68"/>
+						<Entry inputSpeed="1625.00" inputTorque="-31.96" torqueLoss="31.96"/>
+						<Entry inputSpeed="1625.00" inputTorque="-70.42" torqueLoss="31.96"/>
+						<Entry inputSpeed="1625.00" inputTorque="-110.07" torqueLoss="33.15"/>
+						<Entry inputSpeed="1625.00" inputTorque="-149.72" torqueLoss="34.34"/>
+						<Entry inputSpeed="1625.00" inputTorque="-189.37" torqueLoss="35.53"/>
+						<Entry inputSpeed="1625.00" inputTorque="-268.68" torqueLoss="37.91"/>
+						<Entry inputSpeed="1625.00" inputTorque="-347.98" torqueLoss="40.29"/>
+						<Entry inputSpeed="1625.00" inputTorque="-506.58" torqueLoss="45.04"/>
+						<Entry inputSpeed="1625.00" inputTorque="-665.19" torqueLoss="49.80"/>
+						<Entry inputSpeed="1625.00" inputTorque="-823.79" torqueLoss="54.56"/>
+						<Entry inputSpeed="1625.00" inputTorque="-982.39" torqueLoss="59.32"/>
+						<Entry inputSpeed="1625.00" inputTorque="-1141.00" torqueLoss="64.08"/>
+						<Entry inputSpeed="1625.00" inputTorque="-1299.60" torqueLoss="68.83"/>
+						<Entry inputSpeed="1625.00" inputTorque="-1458.21" torqueLoss="73.59"/>
+						<Entry inputSpeed="1625.00" inputTorque="-1616.81" torqueLoss="78.35"/>
+						<Entry inputSpeed="1625.00" inputTorque="-1934.02" torqueLoss="87.87"/>
+						<Entry inputSpeed="1625.00" inputTorque="-2251.23" torqueLoss="97.38"/>
+						<Entry inputSpeed="1625.00" inputTorque="-2568.44" torqueLoss="106.90"/>
+						<Entry inputSpeed="1625.00" inputTorque="-2885.65" torqueLoss="116.42"/>
+						<Entry inputSpeed="1625.00" inputTorque="-3202.85" torqueLoss="125.93"/>
+						<Entry inputSpeed="1625.00" inputTorque="-3520.06" torqueLoss="135.45"/>
+						<Entry inputSpeed="1625.00" inputTorque="-3837.27" torqueLoss="144.96"/>
+						<Entry inputSpeed="1625.00" inputTorque="-4154.48" torqueLoss="154.48"/>
+						<Entry inputSpeed="1625.00" inputTorque="-4471.69" torqueLoss="164.00"/>
+						<Entry inputSpeed="1625.00" inputTorque="-4788.90" torqueLoss="173.51"/>
+						<Entry inputSpeed="1625.00" inputTorque="-5106.11" torqueLoss="183.03"/>
+						<Entry inputSpeed="1625.00" inputTorque="-5423.31" torqueLoss="192.55"/>
+						<Entry inputSpeed="1625.00" inputTorque="-5740.52" torqueLoss="202.06"/>
+						<Entry inputSpeed="1625.00" inputTorque="-6057.73" torqueLoss="211.58"/>
+						<Entry inputSpeed="1625.00" inputTorque="-6374.94" torqueLoss="221.09"/>
+						<Entry inputSpeed="1625.00" inputTorque="-6692.15" torqueLoss="230.61"/>
+						<Entry inputSpeed="1625.00" inputTorque="-7009.36" torqueLoss="240.13"/>
+						<Entry inputSpeed="1625.00" inputTorque="-7326.57" torqueLoss="249.64"/>
+						<Entry inputSpeed="1625.00" inputTorque="-7643.77" torqueLoss="259.16"/>
+						<Entry inputSpeed="1625.00" inputTorque="-7960.98" torqueLoss="268.68"/>
+						<Entry inputSpeed="1950.00" inputTorque="-31.96" torqueLoss="31.96"/>
+						<Entry inputSpeed="1950.00" inputTorque="-70.42" torqueLoss="31.96"/>
+						<Entry inputSpeed="1950.00" inputTorque="-110.07" torqueLoss="33.15"/>
+						<Entry inputSpeed="1950.00" inputTorque="-149.72" torqueLoss="34.34"/>
+						<Entry inputSpeed="1950.00" inputTorque="-189.37" torqueLoss="35.53"/>
+						<Entry inputSpeed="1950.00" inputTorque="-268.68" torqueLoss="37.91"/>
+						<Entry inputSpeed="1950.00" inputTorque="-347.98" torqueLoss="40.29"/>
+						<Entry inputSpeed="1950.00" inputTorque="-506.58" torqueLoss="45.04"/>
+						<Entry inputSpeed="1950.00" inputTorque="-665.19" torqueLoss="49.80"/>
+						<Entry inputSpeed="1950.00" inputTorque="-823.79" torqueLoss="54.56"/>
+						<Entry inputSpeed="1950.00" inputTorque="-982.39" torqueLoss="59.32"/>
+						<Entry inputSpeed="1950.00" inputTorque="-1141.00" torqueLoss="64.08"/>
+						<Entry inputSpeed="1950.00" inputTorque="-1299.60" torqueLoss="68.83"/>
+						<Entry inputSpeed="1950.00" inputTorque="-1458.21" torqueLoss="73.59"/>
+						<Entry inputSpeed="1950.00" inputTorque="-1616.81" torqueLoss="78.35"/>
+						<Entry inputSpeed="1950.00" inputTorque="-1934.02" torqueLoss="87.87"/>
+						<Entry inputSpeed="1950.00" inputTorque="-2251.23" torqueLoss="97.38"/>
+						<Entry inputSpeed="1950.00" inputTorque="-2568.44" torqueLoss="106.90"/>
+						<Entry inputSpeed="1950.00" inputTorque="-2885.65" torqueLoss="116.42"/>
+						<Entry inputSpeed="1950.00" inputTorque="-3202.85" torqueLoss="125.93"/>
+						<Entry inputSpeed="1950.00" inputTorque="-3520.06" torqueLoss="135.45"/>
+						<Entry inputSpeed="1950.00" inputTorque="-3837.27" torqueLoss="144.96"/>
+						<Entry inputSpeed="1950.00" inputTorque="-4154.48" torqueLoss="154.48"/>
+						<Entry inputSpeed="1950.00" inputTorque="-4471.69" torqueLoss="164.00"/>
+						<Entry inputSpeed="1950.00" inputTorque="-4788.90" torqueLoss="173.51"/>
+						<Entry inputSpeed="1950.00" inputTorque="-5106.11" torqueLoss="183.03"/>
+						<Entry inputSpeed="1950.00" inputTorque="-5423.31" torqueLoss="192.55"/>
+						<Entry inputSpeed="1950.00" inputTorque="-5740.52" torqueLoss="202.06"/>
+						<Entry inputSpeed="1950.00" inputTorque="-6057.73" torqueLoss="211.58"/>
+						<Entry inputSpeed="1950.00" inputTorque="-6374.94" torqueLoss="221.09"/>
+						<Entry inputSpeed="1950.00" inputTorque="-6692.15" torqueLoss="230.61"/>
+						<Entry inputSpeed="1950.00" inputTorque="-7009.36" torqueLoss="240.13"/>
+						<Entry inputSpeed="1950.00" inputTorque="-7326.57" torqueLoss="249.64"/>
+						<Entry inputSpeed="1950.00" inputTorque="-7643.77" torqueLoss="259.16"/>
+						<Entry inputSpeed="1950.00" inputTorque="-7960.98" torqueLoss="268.68"/>
+						<Entry inputSpeed="2275.00" inputTorque="-31.96" torqueLoss="31.96"/>
+						<Entry inputSpeed="2275.00" inputTorque="-70.42" torqueLoss="31.96"/>
+						<Entry inputSpeed="2275.00" inputTorque="-110.07" torqueLoss="33.15"/>
+						<Entry inputSpeed="2275.00" inputTorque="-149.72" torqueLoss="34.34"/>
+						<Entry inputSpeed="2275.00" inputTorque="-189.37" torqueLoss="35.53"/>
+						<Entry inputSpeed="2275.00" inputTorque="-268.68" torqueLoss="37.91"/>
+						<Entry inputSpeed="2275.00" inputTorque="-347.98" torqueLoss="40.29"/>
+						<Entry inputSpeed="2275.00" inputTorque="-506.58" torqueLoss="45.04"/>
+						<Entry inputSpeed="2275.00" inputTorque="-665.19" torqueLoss="49.80"/>
+						<Entry inputSpeed="2275.00" inputTorque="-823.79" torqueLoss="54.56"/>
+						<Entry inputSpeed="2275.00" inputTorque="-982.39" torqueLoss="59.32"/>
+						<Entry inputSpeed="2275.00" inputTorque="-1141.00" torqueLoss="64.08"/>
+						<Entry inputSpeed="2275.00" inputTorque="-1299.60" torqueLoss="68.83"/>
+						<Entry inputSpeed="2275.00" inputTorque="-1458.21" torqueLoss="73.59"/>
+						<Entry inputSpeed="2275.00" inputTorque="-1616.81" torqueLoss="78.35"/>
+						<Entry inputSpeed="2275.00" inputTorque="-1934.02" torqueLoss="87.87"/>
+						<Entry inputSpeed="2275.00" inputTorque="-2251.23" torqueLoss="97.38"/>
+						<Entry inputSpeed="2275.00" inputTorque="-2568.44" torqueLoss="106.90"/>
+						<Entry inputSpeed="2275.00" inputTorque="-2885.65" torqueLoss="116.42"/>
+						<Entry inputSpeed="2275.00" inputTorque="-3202.85" torqueLoss="125.93"/>
+						<Entry inputSpeed="2275.00" inputTorque="-3520.06" torqueLoss="135.45"/>
+						<Entry inputSpeed="2275.00" inputTorque="-3837.27" torqueLoss="144.96"/>
+						<Entry inputSpeed="2275.00" inputTorque="-4154.48" torqueLoss="154.48"/>
+						<Entry inputSpeed="2275.00" inputTorque="-4471.69" torqueLoss="164.00"/>
+						<Entry inputSpeed="2275.00" inputTorque="-4788.90" torqueLoss="173.51"/>
+						<Entry inputSpeed="2275.00" inputTorque="-5106.11" torqueLoss="183.03"/>
+						<Entry inputSpeed="2275.00" inputTorque="-5423.31" torqueLoss="192.55"/>
+						<Entry inputSpeed="2275.00" inputTorque="-5740.52" torqueLoss="202.06"/>
+						<Entry inputSpeed="2275.00" inputTorque="-6057.73" torqueLoss="211.58"/>
+						<Entry inputSpeed="2275.00" inputTorque="-6374.94" torqueLoss="221.09"/>
+						<Entry inputSpeed="2275.00" inputTorque="-6692.15" torqueLoss="230.61"/>
+						<Entry inputSpeed="2275.00" inputTorque="-7009.36" torqueLoss="240.13"/>
+						<Entry inputSpeed="2275.00" inputTorque="-7326.57" torqueLoss="249.64"/>
+						<Entry inputSpeed="2275.00" inputTorque="-7643.77" torqueLoss="259.16"/>
+						<Entry inputSpeed="2275.00" inputTorque="-7960.98" torqueLoss="268.68"/>
+						<Entry inputSpeed="2600.00" inputTorque="-31.96" torqueLoss="31.96"/>
+						<Entry inputSpeed="2600.00" inputTorque="-70.42" torqueLoss="31.96"/>
+						<Entry inputSpeed="2600.00" inputTorque="-110.07" torqueLoss="33.15"/>
+						<Entry inputSpeed="2600.00" inputTorque="-149.72" torqueLoss="34.34"/>
+						<Entry inputSpeed="2600.00" inputTorque="-189.37" torqueLoss="35.53"/>
+						<Entry inputSpeed="2600.00" inputTorque="-268.68" torqueLoss="37.91"/>
+						<Entry inputSpeed="2600.00" inputTorque="-347.98" torqueLoss="40.29"/>
+						<Entry inputSpeed="2600.00" inputTorque="-506.58" torqueLoss="45.04"/>
+						<Entry inputSpeed="2600.00" inputTorque="-665.19" torqueLoss="49.80"/>
+						<Entry inputSpeed="2600.00" inputTorque="-823.79" torqueLoss="54.56"/>
+						<Entry inputSpeed="2600.00" inputTorque="-982.39" torqueLoss="59.32"/>
+						<Entry inputSpeed="2600.00" inputTorque="-1141.00" torqueLoss="64.08"/>
+						<Entry inputSpeed="2600.00" inputTorque="-1299.60" torqueLoss="68.83"/>
+						<Entry inputSpeed="2600.00" inputTorque="-1458.21" torqueLoss="73.59"/>
+						<Entry inputSpeed="2600.00" inputTorque="-1616.81" torqueLoss="78.35"/>
+						<Entry inputSpeed="2600.00" inputTorque="-1934.02" torqueLoss="87.87"/>
+						<Entry inputSpeed="2600.00" inputTorque="-2251.23" torqueLoss="97.38"/>
+						<Entry inputSpeed="2600.00" inputTorque="-2568.44" torqueLoss="106.90"/>
+						<Entry inputSpeed="2600.00" inputTorque="-2885.65" torqueLoss="116.42"/>
+						<Entry inputSpeed="2600.00" inputTorque="-3202.85" torqueLoss="125.93"/>
+						<Entry inputSpeed="2600.00" inputTorque="-3520.06" torqueLoss="135.45"/>
+						<Entry inputSpeed="2600.00" inputTorque="-3837.27" torqueLoss="144.96"/>
+						<Entry inputSpeed="2600.00" inputTorque="-4154.48" torqueLoss="154.48"/>
+						<Entry inputSpeed="2600.00" inputTorque="-4471.69" torqueLoss="164.00"/>
+						<Entry inputSpeed="2600.00" inputTorque="-4788.90" torqueLoss="173.51"/>
+						<Entry inputSpeed="2600.00" inputTorque="-5106.11" torqueLoss="183.03"/>
+						<Entry inputSpeed="2600.00" inputTorque="-5423.31" torqueLoss="192.55"/>
+						<Entry inputSpeed="2600.00" inputTorque="-5740.52" torqueLoss="202.06"/>
+						<Entry inputSpeed="2600.00" inputTorque="-6057.73" torqueLoss="211.58"/>
+						<Entry inputSpeed="2600.00" inputTorque="-6374.94" torqueLoss="221.09"/>
+						<Entry inputSpeed="2600.00" inputTorque="-6692.15" torqueLoss="230.61"/>
+						<Entry inputSpeed="2600.00" inputTorque="-7009.36" torqueLoss="240.13"/>
+						<Entry inputSpeed="2600.00" inputTorque="-7326.57" torqueLoss="249.64"/>
+						<Entry inputSpeed="2600.00" inputTorque="-7643.77" torqueLoss="259.16"/>
+						<Entry inputSpeed="2600.00" inputTorque="-7960.98" torqueLoss="268.68"/>
+						<Entry inputSpeed="2925.00" inputTorque="-31.96" torqueLoss="31.96"/>
+						<Entry inputSpeed="2925.00" inputTorque="-70.42" torqueLoss="31.96"/>
+						<Entry inputSpeed="2925.00" inputTorque="-110.07" torqueLoss="33.15"/>
+						<Entry inputSpeed="2925.00" inputTorque="-149.72" torqueLoss="34.34"/>
+						<Entry inputSpeed="2925.00" inputTorque="-189.37" torqueLoss="35.53"/>
+						<Entry inputSpeed="2925.00" inputTorque="-268.68" torqueLoss="37.91"/>
+						<Entry inputSpeed="2925.00" inputTorque="-347.98" torqueLoss="40.29"/>
+						<Entry inputSpeed="2925.00" inputTorque="-506.58" torqueLoss="45.04"/>
+						<Entry inputSpeed="2925.00" inputTorque="-665.19" torqueLoss="49.80"/>
+						<Entry inputSpeed="2925.00" inputTorque="-823.79" torqueLoss="54.56"/>
+						<Entry inputSpeed="2925.00" inputTorque="-982.39" torqueLoss="59.32"/>
+						<Entry inputSpeed="2925.00" inputTorque="-1141.00" torqueLoss="64.08"/>
+						<Entry inputSpeed="2925.00" inputTorque="-1299.60" torqueLoss="68.83"/>
+						<Entry inputSpeed="2925.00" inputTorque="-1458.21" torqueLoss="73.59"/>
+						<Entry inputSpeed="2925.00" inputTorque="-1616.81" torqueLoss="78.35"/>
+						<Entry inputSpeed="2925.00" inputTorque="-1934.02" torqueLoss="87.87"/>
+						<Entry inputSpeed="2925.00" inputTorque="-2251.23" torqueLoss="97.38"/>
+						<Entry inputSpeed="2925.00" inputTorque="-2568.44" torqueLoss="106.90"/>
+						<Entry inputSpeed="2925.00" inputTorque="-2885.65" torqueLoss="116.42"/>
+						<Entry inputSpeed="2925.00" inputTorque="-3202.85" torqueLoss="125.93"/>
+						<Entry inputSpeed="2925.00" inputTorque="-3520.06" torqueLoss="135.45"/>
+						<Entry inputSpeed="2925.00" inputTorque="-3837.27" torqueLoss="144.96"/>
+						<Entry inputSpeed="2925.00" inputTorque="-4154.48" torqueLoss="154.48"/>
+						<Entry inputSpeed="2925.00" inputTorque="-4471.69" torqueLoss="164.00"/>
+						<Entry inputSpeed="2925.00" inputTorque="-4788.90" torqueLoss="173.51"/>
+						<Entry inputSpeed="2925.00" inputTorque="-5106.11" torqueLoss="183.03"/>
+						<Entry inputSpeed="2925.00" inputTorque="-5423.31" torqueLoss="192.55"/>
+						<Entry inputSpeed="2925.00" inputTorque="-5740.52" torqueLoss="202.06"/>
+						<Entry inputSpeed="2925.00" inputTorque="-6057.73" torqueLoss="211.58"/>
+						<Entry inputSpeed="2925.00" inputTorque="-6374.94" torqueLoss="221.09"/>
+						<Entry inputSpeed="2925.00" inputTorque="-6692.15" torqueLoss="230.61"/>
+						<Entry inputSpeed="2925.00" inputTorque="-7009.36" torqueLoss="240.13"/>
+						<Entry inputSpeed="2925.00" inputTorque="-7326.57" torqueLoss="249.64"/>
+						<Entry inputSpeed="2925.00" inputTorque="-7643.77" torqueLoss="259.16"/>
+						<Entry inputSpeed="2925.00" inputTorque="-7960.98" torqueLoss="268.68"/>
+						<Entry inputSpeed="3250.00" inputTorque="-31.96" torqueLoss="31.96"/>
+						<Entry inputSpeed="3250.00" inputTorque="-70.42" torqueLoss="31.96"/>
+						<Entry inputSpeed="3250.00" inputTorque="-110.07" torqueLoss="33.15"/>
+						<Entry inputSpeed="3250.00" inputTorque="-149.72" torqueLoss="34.34"/>
+						<Entry inputSpeed="3250.00" inputTorque="-189.37" torqueLoss="35.53"/>
+						<Entry inputSpeed="3250.00" inputTorque="-268.68" torqueLoss="37.91"/>
+						<Entry inputSpeed="3250.00" inputTorque="-347.98" torqueLoss="40.29"/>
+						<Entry inputSpeed="3250.00" inputTorque="-506.58" torqueLoss="45.04"/>
+						<Entry inputSpeed="3250.00" inputTorque="-665.19" torqueLoss="49.80"/>
+						<Entry inputSpeed="3250.00" inputTorque="-823.79" torqueLoss="54.56"/>
+						<Entry inputSpeed="3250.00" inputTorque="-982.39" torqueLoss="59.32"/>
+						<Entry inputSpeed="3250.00" inputTorque="-1141.00" torqueLoss="64.08"/>
+						<Entry inputSpeed="3250.00" inputTorque="-1299.60" torqueLoss="68.83"/>
+						<Entry inputSpeed="3250.00" inputTorque="-1458.21" torqueLoss="73.59"/>
+						<Entry inputSpeed="3250.00" inputTorque="-1616.81" torqueLoss="78.35"/>
+						<Entry inputSpeed="3250.00" inputTorque="-1934.02" torqueLoss="87.87"/>
+						<Entry inputSpeed="3250.00" inputTorque="-2251.23" torqueLoss="97.38"/>
+						<Entry inputSpeed="3250.00" inputTorque="-2568.44" torqueLoss="106.90"/>
+						<Entry inputSpeed="3250.00" inputTorque="-2885.65" torqueLoss="116.42"/>
+						<Entry inputSpeed="3250.00" inputTorque="-3202.85" torqueLoss="125.93"/>
+						<Entry inputSpeed="3250.00" inputTorque="-3520.06" torqueLoss="135.45"/>
+						<Entry inputSpeed="3250.00" inputTorque="-3837.27" torqueLoss="144.96"/>
+						<Entry inputSpeed="3250.00" inputTorque="-4154.48" torqueLoss="154.48"/>
+						<Entry inputSpeed="3250.00" inputTorque="-4471.69" torqueLoss="164.00"/>
+						<Entry inputSpeed="3250.00" inputTorque="-4788.90" torqueLoss="173.51"/>
+						<Entry inputSpeed="3250.00" inputTorque="-5106.11" torqueLoss="183.03"/>
+						<Entry inputSpeed="3250.00" inputTorque="-5423.31" torqueLoss="192.55"/>
+						<Entry inputSpeed="3250.00" inputTorque="-5740.52" torqueLoss="202.06"/>
+						<Entry inputSpeed="3250.00" inputTorque="-6057.73" torqueLoss="211.58"/>
+						<Entry inputSpeed="3250.00" inputTorque="-6374.94" torqueLoss="221.09"/>
+						<Entry inputSpeed="3250.00" inputTorque="-6692.15" torqueLoss="230.61"/>
+						<Entry inputSpeed="3250.00" inputTorque="-7009.36" torqueLoss="240.13"/>
+						<Entry inputSpeed="3250.00" inputTorque="-7326.57" torqueLoss="249.64"/>
+						<Entry inputSpeed="3250.00" inputTorque="-7643.77" torqueLoss="259.16"/>
+						<Entry inputSpeed="3250.00" inputTorque="-7960.98" torqueLoss="268.68"/>
+					</TorqueLossMap>
+				</v2.0:Data>
+				<Signature>
+					<Reference URI="#AXLGEAR-6.500" 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 xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
+				<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="v2.0:TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+									<Manufacturer>TUG Generic</Manufacturer>
+									<Model>315/70 R22.5</Model>
+									<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
+									<Date>2019-02-27T09:39:05.3510849Z</Date>
+									<AppVersion>VectoCore</AppVersion>
+									<Dimension>315/70 R22.5</Dimension>
+									<RRCDeclared>0.0055</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>
+								<v2.0:Data id="TYRE-315_70R22.5" xsi:type="v1.0:TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+									<Manufacturer>TUG Generic</Manufacturer>
+									<Model>315/70 R22.5</Model>
+									<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
+									<Date>2019-02-27T09:39:05.3510849Z</Date>
+									<AppVersion>VectoCore</AppVersion>
+									<Dimension>315/70 R22.5</Dimension>
+									<RRCDeclared>0.0055</RRCDeclared>
+									<FzISO>33350</FzISO>
+								</v2.0: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="3" xsi:type="AxleDataDeclarationType">
+							<AxleType>VehicleNonDriven</AxleType>
+							<TwinTyres>false</TwinTyres>
+							<Steered>false</Steered>
+							<Tyre>
+								<v2.0:Data id="TYRE-315_70R22.5" xsi:type="v1.0:TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
+									<Manufacturer>TUG Generic</Manufacturer>
+									<Model>315/70 R22.5</Model>
+									<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
+									<Date>2019-02-27T09:39:05.3510849Z</Date>
+									<AppVersion>VectoCore</AppVersion>
+									<Dimension>315/70 R22.5</Dimension>
+									<RRCDeclared>0.0055</RRCDeclared>
+									<FzISO>33350</FzISO>
+								</v2.0: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 xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AuxiliariesComponentDeclarationType">
+				<Data xsi:type="AuxiliariesDataDeclarationType">
+					<Fan>
+						<Technology>Belt driven or driven via transm. - Electronically controlled visco clutch</Technology>
+					</Fan>
+					<SteeringPump>
+						<Technology>Fixed displacement</Technology>
+					</SteeringPump>
+					<ElectricSystem>
+						<Technology>Standard technology</Technology>
+					</ElectricSystem>
+					<PneumaticSystem>
+						<Technology>Medium Supply 2-stage + ESS + AMS</Technology>
+					</PneumaticSystem>
+					<HVAC>
+						<Technology>Default</Technology>
+					</HVAC>
+				</Data>
+			</Auxiliaries>
+			<AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AirDragComponentDeclarationType">
+				<Data id="Airdrag-N.A." xsi:type="AirDragDataDeclarationType">
+					<Manufacturer>TUG Generic</Manufacturer>
+					<Model>N.A.</Model>
+					<CertificationNumber>N.A.</CertificationNumber>
+					<Date>2019-02-27T09:39:05.3510849Z</Date>
+					<AppVersion>VectoCore</AppVersion>
+					<CdxA_0>5.80</CdxA_0>
+					<TransferredCdxA>5.80</TransferredCdxA>
+					<DeclaredCdxA>5.80</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>
+		</Components>
+	</v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
index 74cb618247..12bfb25940 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
 	<PrimaryVehicle>
 		<Data xsi:type="PrimaryVehicleDataType" id="PIF-584956b9e3ab43acaf97">
 			<Vehicle xsi:type="VehiclePIFType">
@@ -42,9 +46,9 @@
 							<RatedPower>325032</RatedPower>
 							<MaxEngineTorque>2134</MaxEngineTorque>
 							<WHRType>
-								<MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
-								<MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
-								<ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+								<MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputICE>
+								<MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputDrivetrain>
+								<ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</ElectricalOutput>
 							</WHRType>
 							<Mode>
 								<IdlingSpeed>600</IdlingSpeed>
@@ -585,7 +589,7 @@
 					<di:DigestValue/>
 				</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MST-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MST-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Some Manufacturer</Manufacturer>
 				<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
 				<VIN>VEH-1234567890</VIN>
@@ -609,7 +613,7 @@
 				<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
 				<VehicleDeclarationType>final</VehicleDeclarationType>
 				<Components xsi:type="Components_Conventional_CompletedBusType">
-					<v2.10.2:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+					<v2.4:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 						<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
 							<Manufacturer>Generic Manufacturer</Manufacturer>
 							<Model>Generic Model</Model>
@@ -630,7 +634,7 @@
 								<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
 							</di:Reference>
 						</Signature>
-					</v2.10.2:AirDrag>
+					</v2.4:AirDrag>
 					<Auxiliaries>
 						<Data xsi:type="AUX_Conventional_CompletedBusType">
 							<ElectricSystem>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
index d446ba1059..dbdda181ff 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml	
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+ 
+xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
 	<PrimaryVehicle>
 		<Data xsi:type="PrimaryVehicleDataType" id="PIF-4121ae4751874cefa376">
 			<Vehicle xsi:type="VehiclePIFType">
@@ -41,9 +47,9 @@
 							<RatedPower>220000</RatedPower>
 							<MaxEngineTorque>1100</MaxEngineTorque>
 							<WHRType>
-								<MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
-								<MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
-								<ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+								<v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
+								<v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
+								<v2.3:ElectricalOutput>false</v2.3:ElectricalOutput>
 							</WHRType>
 							<Mode>
 								<IdlingSpeed>700</IdlingSpeed>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml
index c621303fab..65e0097fe1 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"   xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
 	<PrimaryVehicle>
 		<Data xsi:type="PrimaryVehicleDataType" id="PIF-04fd187f166a4d89aa84">
 			<Vehicle xsi:type="VehiclePIFType">
@@ -41,9 +41,9 @@
 							<RatedPower>220000</RatedPower>
 							<MaxEngineTorque>1100</MaxEngineTorque>
 							<WHRType>
-								<MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
-								<MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
-								<ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+								<MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputICE>
+								<MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputDrivetrain>
+								<ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</ElectricalOutput>
 							</WHRType>
 							<Mode>
 								<IdlingSpeed>700</IdlingSpeed>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml
index 659e886259..e7407b8a11 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tns:VectoInputDeclaration schemaVersion="2.0" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
@@ -30,10 +30,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>none</PredictiveCruiseControl>
 		</ADAS>
-		<v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+		<v2.4:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Entry gear="6" maxTorque="1800"/>
 			<Entry gear="1" maxTorque="2500"/>
-		</v2.10.2:TorqueLimits>
+		</v2.4:TorqueLimits>
 		<Components xsi:type="Components_Conventional_PrimaryBusType">
 			<Engine>
 				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml
index 6190094f80..d8f8622df5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tns:VectoInputDeclaration schemaVersion="2.0" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
@@ -30,10 +30,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>none</PredictiveCruiseControl>
 		</ADAS>
-		<v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+		<v2.4:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Entry gear="6" maxTorque="1800"/>
 			<Entry gear="1" maxTorque="2500"/>
-		</v2.10.2:TorqueLimits>
+		</v2.4:TorqueLimits>
 		<Components xsi:type="Components_Conventional_PrimaryBusType">
 			<Engine>
 				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
index f11e469ddd..bff61ff9ed 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"   xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
 	<PrimaryVehicle>
 		<Data xsi:type="PrimaryVehicleDataType" id="PIF-584956b9e3ab43acaf97">
 			<Vehicle xsi:type="VehiclePIFType">
@@ -42,9 +42,9 @@
 							<RatedPower>325032</RatedPower>
 							<MaxEngineTorque>2134</MaxEngineTorque>
 							<WHRType>
-								<MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
-								<MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
-								<ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+								<MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputICE>
+								<MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputDrivetrain>
+								<ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</ElectricalOutput>
 							</WHRType>
 							<Mode>
 								<IdlingSpeed>600</IdlingSpeed>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.xml
index 0f49a2ea2d..fc6870eeb4 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.xml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tns:VectoInputDeclaration schemaVersion="2.0" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
@@ -30,11 +30,11 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>none</PredictiveCruiseControl>
 		</ADAS>
-		<v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+		<v2.4:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Entry gear="6" maxTorque="1800"/>
 			<Entry gear="1" maxTorque="2500"/>
 			<Entry gear="12" maxTorque="1900"/>
-		</v2.10.2:TorqueLimits>
+		</v2.4:TorqueLimits>
 		<Components xsi:type="Components_Conventional_PrimaryBusType">
 			<Engine>
 				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml
index 9e78863358..bded11f08e 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tns:VectoInputDeclaration schemaVersion="2.8" 
-xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
@@ -17,7 +17,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>8300</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem>
 		<NumberPassengerSeatsLowerDeck>30</NumberPassengerSeatsLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml
index 92eac01835..6a4d8eb5bd 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tns:VectoInputDeclaration schemaVersion="2.8" 
-xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890_mixed" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
@@ -17,7 +17,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>8300</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem>
 		<NumberPassengerSeatsLowerDeck>30</NumberPassengerSeatsLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml
index 6422345a37..7d22e3053d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tns:VectoInputDeclaration schemaVersion="2.8" 
-xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
@@ -17,7 +17,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>8300</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>		
+		<AirdragModifiedMultistep>false</AirdragModifiedMultistep>		
 		<ClassBus>I+II</ClassBus>		
 		<NumberPassengerSeatsLowerDeck>30</NumberPassengerSeatsLowerDeck>
 		<NumberPassengersStandingLowerDeck>0</NumberPassengersStandingLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
index 5c1239ed14..5a8bd1363a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"   xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
 	<PrimaryVehicle>
 		<Data xsi:type="PrimaryVehicleDataType" id="PIF-65de7efe65ee4b4cac4c">
 			<Vehicle xsi:type="VehiclePIFType">
@@ -42,9 +42,9 @@
 							<RatedPower>380000</RatedPower>
 							<MaxEngineTorque>2400</MaxEngineTorque>
 							<WHRType>
-								<MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
-								<MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
-								<ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+								<MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputICE>
+								<MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputDrivetrain>
+								<ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</ElectricalOutput>
 							</WHRType>
 							<Mode>
 								<IdlingSpeed>560</IdlingSpeed>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml
index 601b819793..a56564aada 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tns:VectoInputDeclaration schemaVersion="2.0" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
  xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
- xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+ xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
  xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
  xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
  xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
@@ -30,11 +30,11 @@ xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
 			<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>none</PredictiveCruiseControl>
 		</ADAS>
-		<v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+		<v2.4:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Entry gear="6" maxTorque="1800"/>
 			<Entry gear="1" maxTorque="2500"/>
 			<Entry gear="12" maxTorque="1900"/>
-		</v2.10.2:TorqueLimits>
+		</v2.4:TorqueLimits>
 		<Components xsi:type="Components_Conventional_PrimaryBusType">
 			<Engine>
 				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/primary_heavyBus group P39_40_nonSmart_ESS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/primary_heavyBus group P39_40_nonSmart_ESS.xml
index d9381a22d5..3d43dac8ac 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/primary_heavyBus group P39_40_nonSmart_ESS.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/primary_heavyBus group P39_40_nonSmart_ESS.xml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tns:VectoInputDeclaration schemaVersion="2.0" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml
index ee0bce9b6e..ada9e791aa 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tns:VectoInputDeclaration schemaVersion="2.8" 
-xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
@@ -17,7 +17,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>8300</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>15400</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NumberPassengerSeatsLowerDeck>50</NumberPassengerSeatsLowerDeck>
 		<NumberPassengersStandingLowerDeck>0</NumberPassengersStandingLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus.xml
index bf75e78a98..4a79f5dd6c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tns:VectoInputDeclaration schemaVersion="2.0" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
@@ -30,11 +30,11 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>none</PredictiveCruiseControl>
 		</ADAS>
-		<v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+		<v2.4:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Entry gear="6" maxTorque="1800"/>
 			<Entry gear="1" maxTorque="2500"/>
 			<Entry gear="12" maxTorque="1900"/>
-		</v2.10.2:TorqueLimits>
+		</v2.4:TorqueLimits>
 		<Components xsi:type="Components_Conventional_PrimaryBusType">
 			<Engine>
 				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml
index da399b24ec..14918b95d6 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tns:VectoInputDeclaration schemaVersion="2.0" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
@@ -30,11 +30,11 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCor
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>none</PredictiveCruiseControl>
 		</ADAS>
-		<v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+		<v2.4:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Entry gear="6" maxTorque="1800"/>
 			<Entry gear="1" maxTorque="2500"/>
 			<Entry gear="12" maxTorque="1900"/>
-		</v2.10.2:TorqueLimits>
+		</v2.4:TorqueLimits>
 		<Components xsi:type="Components_Conventional_PrimaryBusType">
 			<Engine>
 				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml
index b1a4c67429..dfd0274077 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tns:VectoInputDeclaration schemaVersion="2.0" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
@@ -30,11 +30,11 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>none</PredictiveCruiseControl>
 		</ADAS>
-		<v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+		<v2.4:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Entry gear="6" maxTorque="1800"/>
 			<Entry gear="1" maxTorque="2500"/>
 			<Entry gear="12" maxTorque="1900"/>
-		</v2.10.2:TorqueLimits>
+		</v2.4:TorqueLimits>
 		<Components xsi:type="Components_Conventional_PrimaryBusType">
 			<Engine>
 				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml
index e65b0681b6..5fc3a0bf24 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tns:VectoInputDeclaration schemaVersion="2.0" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
@@ -30,11 +30,11 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>none</PredictiveCruiseControl>
 		</ADAS>
-		<v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+		<v2.4:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Entry gear="6" maxTorque="1800"/>
 			<Entry gear="1" maxTorque="2500"/>
 			<Entry gear="12" maxTorque="1900"/>
-		</v2.10.2:TorqueLimits>
+		</v2.4:TorqueLimits>
 		<Components xsi:type="Components_Conventional_PrimaryBusType">
 			<Engine>
 				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml
index de7d3112aa..f2c545c2de 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tns:VectoInputDeclaration schemaVersion="2.0" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
@@ -30,11 +30,11 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>none</PredictiveCruiseControl>
 		</ADAS>
-		<v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+		<v2.4:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Entry gear="6" maxTorque="1800"/>
 			<Entry gear="1" maxTorque="2500"/>
 			<Entry gear="12" maxTorque="1900"/>
-		</v2.10.2:TorqueLimits>
+		</v2.4:TorqueLimits>
 		<Components xsi:type="Components_Conventional_PrimaryBusType">
 			<Engine>
 				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml
index b66c704be4..04e7190fe5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tns:VectoInputDeclaration schemaVersion="2.0" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
@@ -30,11 +30,11 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>none</PredictiveCruiseControl>
 		</ADAS>
-		<v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+		<v2.4:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Entry gear="6" maxTorque="1800"/>
 			<Entry gear="1" maxTorque="2500"/>
 			<Entry gear="12" maxTorque="1900"/>
-		</v2.10.2:TorqueLimits>
+		</v2.4:TorqueLimits>
 		<Components xsi:type="Components_Conventional_PrimaryBusType">
 			<Engine>
 				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry-Van.xml b/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry-Van.xml
index 346eb17b2b..78c480615b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry-Van.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry-Van.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-class5_Class-5_5t0_van" xsi:type="Vehicle_Conventional_MediumLorryDeclarationType">
 		<Manufacturer>Generic Vendor</Manufacturer>
 		<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry.xml b/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry.xml
index 7d5b9a3bc1..a5c83dc8a0 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/MediumLorries/vecto_vehicle-medium_lorry.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <tns:VectoInputDeclaration schemaVersion="2.0" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/DualFuelVehicle/vehicle_sampleSingleModeDualFuel.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/DualFuelVehicle/vehicle_sampleSingleModeDualFuel.xml
index 985d39370e..4ab9769d46 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/DualFuelVehicle/vehicle_sampleSingleModeDualFuel.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/DualFuelVehicle/vehicle_sampleSingleModeDualFuel.xml
@@ -5,7 +5,7 @@
 	xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
 	xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
 	xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
-	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
+	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
 	xmlns:di="http://www.w3.org/2000/09/xmldsig#"
 	xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
 	>
@@ -35,7 +35,7 @@
 		</TorqueLimits>
 		<Components xsi:type="VehicleComponentsType">
 			<Engine>
-				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">
+				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3: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>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/CompletedBus_34f.RSLT_MANUFACTURER.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/CompletedBus_34f.RSLT_MANUFACTURER.xml
index 625e7fa3b3..d169e6717c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/CompletedBus_34f.RSLT_MANUFACTURER.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/CompletedBus_34f.RSLT_MANUFACTURER.xml
@@ -5,7 +5,7 @@ xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8"
 xmlns:mrf0.8="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8"
  xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
  xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput" 
- xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+ xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
  xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput v:\VectoCore\VectoCore\Resources\XSD/VectoOutputManufacturer.xsd">
   <mrf:Data xsi:type="VectoOutputDataType" id="RESULT-b2d5a208fb6d49b09083">
     <Vehicle xsi:type="VehicleCompletedBusType">
@@ -77,7 +77,7 @@ xmlns:mrf0.8="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8"
             <DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</DigestValue>
             <CdxA>5.20</CdxA>
           </AirDrag>
-          <mrf0.8:Auxiliaries xsi:type="AUX_Conventional_CompletedBusType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" >
+          <mrf0.8:Auxiliaries xsi:type="AUX_Conventional_CompletedBusType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" >
             <ElectricSystem>
               <LEDLights>
                 <Interiorlights>true</Interiorlights>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.xml
index e2c94c01df..092a0cc846 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.xml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tns:VectoInputDeclaration schemaVersion="2.0" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
@@ -30,11 +30,11 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>none</PredictiveCruiseControl>
 		</ADAS>
-		<v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+		<v2.4:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Entry gear="6" maxTorque="1800"/>
 			<Entry gear="1" maxTorque="2500"/>
 			<Entry gear="12" maxTorque="1900"/>
-		</v2.10.2:TorqueLimits>
+		</v2.4:TorqueLimits>
 		<Components xsi:type="Components_Conventional_PrimaryBusType">
 			<Engine>
 				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/vecto_vehicle-completed_heavyBus_34f.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/vecto_vehicle-completed_heavyBus_34f.xml
index d7c627ed42..32537dc27a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/vecto_vehicle-completed_heavyBus_34f.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/vecto_vehicle-completed_heavyBus_34f.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
 		<Manufacturer>Some Manufacturer</Manufacturer>
 		<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
@@ -9,7 +9,7 @@
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>19400</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem>
 		<NumberPassengerSeatsLowerDeck>16</NumberPassengerSeatsLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/vecto_vehicle-medium_lorry_4x2.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/vecto_vehicle-medium_lorry_4x2.xml
index cf51e21f16..acbe550b87 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/vecto_vehicle-medium_lorry_4x2.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/MediumLorry/vecto_vehicle-medium_lorry_4x2.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <tns:VectoInputDeclaration schemaVersion="2.0" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
+xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
 xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml
index 1672c79ec3..680b0a9729 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml
@@ -5,8 +5,8 @@ xmlns:di="http://www.w3.org/2000/09/xmldsig#"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
   <vif0.1:PrimaryVehicle>
@@ -50,9 +50,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
               <vif0.1:RatedPower>220000</vif0.1:RatedPower>
               <vif0.1:MaxEngineTorque>1100</vif0.1:MaxEngineTorque>
               <vif0.1:WHRType>
-                <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
-                <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
-                <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+                <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputICE>
+                <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</MechanicalOutputDrivetrain>
+                <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">false</ElectricalOutput>
               </vif0.1:WHRType>
               <vif0.1:Mode>
                 <vif0.1:IdlingSpeed>700</vif0.1:IdlingSpeed>
@@ -574,7 +574,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
           <di:DigestValue>YnCPep7uMh3ghMrx6ZsEMLanOijFCZpku+ZDNd6rkLw=</di:DigestValue>
         </di:Reference>
       </vif0.1:HashPreviousStep>
-      <vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="VEH-a00526e499f144139792" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+      <vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="VEH-a00526e499f144139792" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
         <Manufacturer>Some Manufacturer</Manufacturer>
         <ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
         <VIN>VEH-1234567890</VIN>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/Conventional_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/Conventional_completedBus_1.xml
index 1be600645f..65ec05332d 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/Conventional_completedBus_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/Conventional_completedBus_1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
 		<Manufacturer>Some Manufacturer</Manufacturer>
 		<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
@@ -9,7 +9,7 @@
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>500</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem><!-- optional -->
 		<NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/HEV_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/HEV_completedBus_1.xml
index 505683bbe5..3889e09f68 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/HEV_completedBus_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/HEV_completedBus_1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_HEV_CompletedBusDeclarationType">
 		<Manufacturer>Some Manufacturer</Manufacturer>
 		<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
@@ -9,7 +9,7 @@
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>500</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem><!-- optional -->
 		<NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/IEPC_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/IEPC_completedBus_1.xml
index 547e2944e4..029300ec9d 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/IEPC_completedBus_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/IEPC_completedBus_1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_IEPC_CompletedBusDeclarationType">
 		<Manufacturer>Some Manufacturer</Manufacturer>
 		<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
@@ -9,7 +9,7 @@
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>500</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
 		<NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/PEV_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/PEV_completedBus_1.xml
index cb50b2e0a3..7397480628 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/PEV_completedBus_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/PEV_completedBus_1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_PEV_CompletedBusDeclarationType">
 		<Manufacturer>Some Manufacturer</Manufacturer>
 		<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
@@ -9,7 +9,7 @@
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>500</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
 		<NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ADC.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ADC.xml
index 93c56ca531..8db155c742 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ADC.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ADC.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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:ADC xsi:type="v2.10.1:ADCComponentDeclarationType" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
-        <Data xsi:type="v2.10.1:ADCDataDeclarationType" id="ADC-123" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+<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:ADC xsi:type="v2.3:ADCComponentDeclarationType" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
+        <Data xsi:type="v2.3:ADCDataDeclarationType" id="ADC-123" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
             <Manufacturer>Generic Vendor</Manufacturer>
             <Model>ADC 20</Model>
             <CertificationNumber>ADC-20-CERT</CertificationNumber>
@@ -22,7 +25,7 @@
                 <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
             </TorqueLossMap>
         </Data>
-        <v2.10.1:Signature>
+        <v2.3:Signature>
             <di:Reference URI="#ADC-123">
                 <di:Transforms>
                     <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -31,6 +34,6 @@
                 <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
                 <di:DigestValue>NiyH2Xp0rQswwXIOf52Jm0wvK4Yc2/PL/T+zQCWQGFo=</di:DigestValue>
             </di:Reference>
-        </v2.10.1:Signature>
+        </v2.3:Signature>
     </tns:ADC>
 </tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/BatterySystem_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/BatterySystem_1.xml
index 97211aa828..ae83302aa1 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/BatterySystem_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/BatterySystem_1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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 xsi:type="v2.10.1:BatteryComponentDeclarationType">
-        <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+<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 xsi:type="v2.3:BatteryComponentDeclarationType">
+        <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
             <Manufacturer>a</Manufacturer>
             <Model>a</Model>
             <CertificationNumber>token</CertificationNumber>
@@ -26,7 +26,7 @@
                 <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00" />
             </CurrentLimits>
         </Data>
-        <v2.10.1:Signature>
+        <v2.3:Signature>
             <di:Reference URI="#BAT-asdf">
                 <di:Transforms>
                     <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -35,6 +35,6 @@
                 <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
                 <di:DigestValue>tam1LGpdznHGFGo+rp0WVr0/6+F2yU2Kv4G4tYvAe+Y=</di:DigestValue>
             </di:Reference>
-        </v2.10.1:Signature>
+        </v2.3:Signature>
     </tns:BatterySystem>
 </tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/CapacitorSystem_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/CapacitorSystem_1.xml
index b321bdf540..0e11a0ecfc 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/CapacitorSystem_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/CapacitorSystem_1.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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 xsi:type="v2.10.1:CapacitorSystemComponentDeclarationType">
-        <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="CapacitorSystemDataType" id="CAP-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+<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 xsi:type="CapacitorSystemComponentDeclarationType">
+        <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="CapacitorSystemDataType" id="CAP-asdf">
             <Manufacturer>a</Manufacturer>
             <Model>a</Model>
             <CertificationNumber>token</CertificationNumber>
@@ -16,7 +19,7 @@
             <MaxDischargingCurrent>99.45</MaxDischargingCurrent>
             <TestingTemperature>30</TestingTemperature>
         </Data>
-        <v2.10.1:Signature>
+        <v2.3:Signature>
             <di:Reference URI="#CAP-asdf">
                 <di:Transforms>
                     <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -25,6 +28,6 @@
                 <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
                 <di:DigestValue>dBadIN60l8Iqcanj/nrx1EbD+KixtDxLAusUcutITk8=</di:DigestValue>
             </di:Reference>
-        </v2.10.1:Signature>
+        </v2.3:Signature>
     </tns:CapacitorSystem>
 </tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem-IHPC_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem-IHPC_1.xml
index d39b9e794c..cec731f227 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem-IHPC_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem-IHPC_1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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 xsi:type="v2.10.1:ElectricMachineSystemComponentDeclarationType">
-		<Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="ElectricMachineSystemIHPCMeasuredDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+<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 xsi:type="v2.3:ElectricMachineSystemComponentDeclarationType">
+		<Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="ElectricMachineSystemIHPCMeasuredDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
 			<Manufacturer>a</Manufacturer>
 			<Model>a</Model>
 			<CertificationNumber>token</CertificationNumber>
@@ -69,7 +69,7 @@
 				<Entry coolantTempInlet="30" coolingPower="5000"/>
 			</Conditioning>
 		</Data>
-		<v2.10.1:Signature>
+		<v2.3:Signature>
 			<di:Reference URI="#EM-asdf">
 				<di:Transforms>
 					<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -78,6 +78,6 @@
 				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
 				<di:DigestValue>655T60jN3MstLvX3j5bmvY4kLft2uJbQz2kEk/LIfo8=</di:DigestValue>
 			</di:Reference>
-		</v2.10.1:Signature>
+		</v2.3:Signature>
 	</tns:ElectricMachineSystem>
 </tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_1.xml
index f4a38b837f..514671c86a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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 xsi:type="v2.10.1:ElectricMachineSystemComponentDeclarationType">
-		<Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+<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 xsi:type="v2.3:ElectricMachineSystemComponentDeclarationType">
+		<Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
 			<Manufacturer>a</Manufacturer>
 			<Model>a</Model>
 			<CertificationNumber>token</CertificationNumber>
@@ -57,7 +57,7 @@
 				<Entry coolantTempInlet="30" coolingPower="5000"/>
 			</Conditioning>
 		</Data>
-		<v2.10.1:Signature>
+		<v2.3:Signature>
 			<di:Reference URI="#EM-asdf">
 				<di:Transforms>
 					<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -66,6 +66,6 @@
 				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
 				<di:DigestValue>s2YFYllDgw5jrF+W6Pc9cF4aQfsswnICqlWYgqg9NPI=</di:DigestValue>
 			</di:Reference>
-		</v2.10.1:Signature>
+		</v2.3:Signature>
 	</tns:ElectricMachineSystem>
 </tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_StdValues.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_StdValues.xml
index 99c16a8ec0..966b40972c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_StdValues.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_StdValues.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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 xsi:type="v2.10.1:ElectricMachineSystemComponentDeclarationType">
-		<Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="ElectricMachineSystemStandardValuesDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+<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 xsi:type="v2.3:ElectricMachineSystemComponentDeclarationType">
+		<Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="ElectricMachineSystemStandardValuesDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
 			<Manufacturer>a</Manufacturer>
 			<Model>a</Model>
 			<CertificationNumber>token</CertificationNumber>
@@ -35,7 +35,7 @@
 				<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
 			</DragCurve>
 		</Data>
-		<v2.10.1:Signature>
+		<v2.3:Signature>
 			<di:Reference URI="#EM-asdf">
 				<di:Transforms>
 					<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -44,6 +44,6 @@
 				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
 				<di:DigestValue>ZDzYMLXTbvq6O8mR3OE8ii2v4SHgJ6nieqw6XXINaF0=</di:DigestValue>
 			</di:Reference>
-		</v2.10.1:Signature>
+		</v2.3:Signature>
 	</tns:ElectricMachineSystem>
 </tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/Gearbox_APT-N.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/Gearbox_APT-N.xml
index 04dce1e72e..3ed2d16607 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/Gearbox_APT-N.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/Gearbox_APT-N.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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">
+<?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 xsi:type="v2.0:GearboxComponentDeclarationType">
-        <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="v2.10.1:GearboxDataDeclarationType" id="GBX-asdf">
+        <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="v2.3:GearboxDataDeclarationType" id="GBX-asdf">
             <Manufacturer>Generic Vendor</Manufacturer>
             <Model>GB_12-gear</Model>
             <CertificationNumber>GBX-GB_12-gear</CertificationNumber>
@@ -9,7 +9,7 @@
             <AppVersion>VectoCore</AppVersion>
             <TransmissionType>APT-N</TransmissionType>
             <MainCertificationMethod>Standard values</MainCertificationMethod>
-            <v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+            <v2.3:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
                 <Gear number="1">
                     <Ratio>14.930</Ratio>
                     <TorqueLossMap>
@@ -55,7 +55,7 @@
                         <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
                     </TorqueLossMap>
                 </Gear>
-            </v2.10.1:Gears>
+            </v2.3:Gears>
         </v2.0:Data>
         <v2.0:Signature>
             <di:Reference URI="#GBX-asdf">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/Gearbox_IHPC.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/Gearbox_IHPC.xml
index 3f696ad69a..05cb9e558e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/Gearbox_IHPC.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/Gearbox_IHPC.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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">
+<?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 xsi:type="v2.0:GearboxComponentDeclarationType">
-        <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="v2.10.1:GearboxDataDeclarationType" id="GBX-asdf">
+        <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="v2.3:GearboxDataDeclarationType" id="GBX-asdf">
             <Manufacturer>Generic Vendor</Manufacturer>
             <Model>GB_12-gear</Model>
             <CertificationNumber>GBX-GB_12-gear</CertificationNumber>
@@ -9,7 +9,7 @@
             <AppVersion>VectoCore</AppVersion>
             <TransmissionType>IHPC Type 1</TransmissionType>
             <MainCertificationMethod>Standard values</MainCertificationMethod>
-            <v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+            <v2.3:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
                 <Gear number="1">
                     <Ratio>14.930</Ratio>
                     <TorqueLossMap>
@@ -190,7 +190,7 @@
                         <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="1000.00" />
                     </TorqueLossMap>
                 </Gear>
-            </v2.10.1:Gears>
+            </v2.3:Gears>
         </v2.0:Data>
         <v2.0:Signature>
             <di:Reference URI="#GBX-asdf">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_1.xml
index a4ecdb97d1..b003302110 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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 xsi:type="v2.10.1:IEPCComponentDeclarationType">
-		<Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+<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 xsi:type="v2.3:IEPCComponentDeclarationType">
+		<Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
 			<Manufacturer>a</Manufacturer>
 			<Model>a</Model>
 			<CertificationNumber>token</CertificationNumber>
@@ -13,7 +13,7 @@
 			<RotationalInertia>0.10</RotationalInertia>
 			<DifferentialIncluded>false</DifferentialIncluded>
 			<DesignTypeWheelMotor>true</DesignTypeWheelMotor>
-			<Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+			<Gears xsi:type="v2.3:IEPCGearsDeclarationType">
 				<Gear number="1">
 					<Ratio>3.000</Ratio>
 				</Gear>
@@ -82,7 +82,7 @@
 				<Entry coolantTempInlet="30" coolingPower="5000"/>
 			</Conditioning>
 		</Data>
-		<v2.10.1:Signature>
+		<v2.3:Signature>
 			<di:Reference URI="#IEPC-asdf">
 				<di:Transforms>
 					<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -91,6 +91,6 @@
 				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
 				<di:DigestValue>YC6JEnUe+0DpaRLPBYJfmJqsXHlIkdKUEyKh6Pv4Qi8=</di:DigestValue>
 			</di:Reference>
-		</v2.10.1:Signature>
+		</v2.3:Signature>
 	</tns:IEPC>
 </tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_StdValues.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_StdValues.xml
index 6270dbf868..d9622c205f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_StdValues.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_StdValues.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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 xsi:type="v2.10.1:IEPCComponentDeclarationType">
-		<Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="IEPCStandardValuesDataDeclarationType" id="IEPC-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+<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 xsi:type="v2.3:IEPCComponentDeclarationType">
+		<Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCStandardValuesDataDeclarationType" id="IEPC-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
 			<Manufacturer>a</Manufacturer>
 			<Model>a</Model>
 			<CertificationNumber>token</CertificationNumber>
@@ -13,7 +13,7 @@
 			<RotationalInertia>0.10</RotationalInertia>
 			<DifferentialIncluded>false</DifferentialIncluded>
 			<DesignTypeWheelMotor>true</DesignTypeWheelMotor>
-			<Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+			<Gears xsi:type="v2.3:IEPCGearsDeclarationType">
 				<Gear number="1">
 					<Ratio>3.000</Ratio>
 				</Gear>
@@ -44,7 +44,7 @@
 				<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
 			</DragCurve>
 		</Data>
-		<v2.10.1:Signature>
+		<v2.3:Signature>
 			<di:Reference URI="#IEPC-asdf">
 				<di:Transforms>
 					<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -53,6 +53,6 @@
 				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
 				<di:DigestValue>WjS1g6YMg1hT7Rp+OpK6deh7pUKTwokv1e21eE3TAk8=</di:DigestValue>
 			</di:Reference>
-		</v2.10.1:Signature>
+		</v2.3:Signature>
 	</tns:IEPC>
 </tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_completedBus_input_full.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_completedBus_input_full.xml
index de9f07222a..8eb42199cd 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_completedBus_input_full.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_completedBus_input_full.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_completedBus_input_only_mandatory_entries.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_completedBus_input_only_mandatory_entries.xml
index 67ac8a07a7..3731a2593b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_completedBus_input_only_mandatory_entries.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_completedBus_input_only_mandatory_entries.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType" >
		<Manufacturer>Some Manufacturer 3</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType" >
		<Manufacturer>Some Manufacturer 3</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_heavyLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_heavyLorry.xml
index fa42d88e4b..39e90cfb8f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_heavyLorry.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_heavyLorry.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tns:VectoInputDeclaration schemaVersion="2.0" 
-xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_mediumLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_mediumLorry.xml
index cd7af94789..bb45b98a60 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_mediumLorry.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_mediumLorry.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tns:VectoInputDeclaration schemaVersion="2.0" 
-xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_primaryBus.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_primaryBus.xml
index 5cc36baaaa..f0b2a3c634 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_primaryBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ExemptedVehicles/exempted_primaryBus.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tns:VectoInputDeclaration schemaVersion="2.0" 
-xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
+xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/Conventional_heavyLorry_AMT.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/Conventional_heavyLorry_AMT.xml
index 02df7c8b45..c8f560b034 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/Conventional_heavyLorry_AMT.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/Conventional_heavyLorry_AMT.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml
index 05037e60e8..144e02970a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_HeavyLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -27,8 +27,8 @@
 		<ArchitectureID>S2</ArchitectureID>
 		<OvcHev>false</OvcHev>
 		<ADAS xsi:type="ADAS_HEV_Type">
-			<v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
-			<v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2:PredictiveCruiseControl>
+			<EngineStopStart>true</EngineStopStart>
+			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
 		</ADAS>
 		<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
 			<!-- optional -->
@@ -41,15 +41,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -61,15 +61,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -117,7 +117,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -172,20 +172,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+						<v2.4:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -209,7 +209,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -223,7 +223,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+						<v2.4:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -247,7 +247,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -261,7 +261,7 @@
 				<PowertrainPosition>2</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -316,13 +316,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -547,7 +547,7 @@
 				</v2.0:Data>
 			</AxleWheels>
 			<Auxiliaries>
-				<v2.10.2:Data xsi:type="AUX_HEV-S_LorryDataType">
+				<Data xsi:type="AUX_HEV-S_LorryDataType">
 					<Fan>
 						<Technology>Hydraulic driven - Constant displacement pump</Technology>
 					</Fan>
@@ -563,7 +563,7 @@
 					<HVAC>
 						<Technology>Default</Technology>
 					</HVAC>
-				</v2.10.2:Data>
+				</Data>
 			</Auxiliaries>
 			<AirDrag>
 				<!-- optional -->
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_IEPC-S.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_IEPC-S.xml
index a9dc83fbaa..74a62a2668 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_IEPC-S.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_IEPC-S.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-IEPC-S_HeavyLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -27,8 +27,8 @@
 		<ArchitectureID>S-IEPC</ArchitectureID>
 		<OvcHev>false</OvcHev>
 		<ADAS xsi:type="ADAS_HEV_Type">
-			<v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
-			<v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2:PredictiveCruiseControl>
+			<EngineStopStart>true</EngineStopStart>
+			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
 		</ADAS>
 		<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
 			<!-- optional -->
@@ -41,15 +41,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -97,7 +97,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -152,20 +152,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+						<v2.4:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -189,7 +189,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -203,7 +203,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+						<v2.4:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -227,7 +227,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -238,7 +238,7 @@
 				</Battery>
 			</ElectricEnergyStorage>
 			<IEPC>
-				<v2.10.1:Data xsi:type="IEPCMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+				<v2.3:Data xsi:type="IEPCMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 					<Manufacturer>a</Manufacturer>
 					<Model>a</Model>
 					<CertificationNumber>token</CertificationNumber>
@@ -250,7 +250,7 @@
 					<RotationalInertia>0.10</RotationalInertia>
 					<DifferentialIncluded>false</DifferentialIncluded>
 					<DesignTypeWheelMotor>false</DesignTypeWheelMotor>
-					<Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+					<Gears xsi:type="v2.3:IEPCGearsDeclarationType">
 						<Gear number="1">
 							<Ratio>3.000</Ratio>
 						</Gear>
@@ -318,13 +318,13 @@
 					<Conditioning>
 						<Entry coolantTempInlet="30" coolingPower="5000"/>
 					</Conditioning>
-				</v2.10.1:Data>
-				<v2.10.1:Signature>
+				</v2.3:Data>
+				<v2.3:Signature>
 					<di:Reference>
 						<di:DigestMethod Algorithm=""/>
 						<di:DigestValue/>
 					</di:Reference>
-				</v2.10.1:Signature>
+				</v2.3:Signature>
 			</IEPC>
 			<Retarder>
 				<!-- optional -->
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_S3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_S3.xml
index 0c537380de..12524b9c8a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_S3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_S3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_HeavyLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -41,15 +41,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -61,15 +61,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -117,7 +117,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -172,20 +172,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+						<v2.4:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -209,7 +209,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -223,7 +223,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+						<v2.4:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -247,7 +247,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -261,7 +261,7 @@
 				<PowertrainPosition>3</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -316,13 +316,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_S4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_S4.xml
index 5e86f18399..0e0407f3d1 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_S4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV-S_heavyLorry_S4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_HeavyLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -27,49 +27,49 @@
 		<ArchitectureID>S4</ArchitectureID>
 		<OvcHev>false</OvcHev>
 		<ADAS xsi:type="ADAS_HEV_Type">
-			<v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
-			<v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2:PredictiveCruiseControl>
+			<EngineStopStart>true</EngineStopStart>
+			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
 		</ADAS>
 		<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
 			<!-- optional -->
 			<v2.0:Entry gear="9" maxTorque="2000"/>
 		</TorqueLimits>
-		<ElectricMotorTorqueLimits xsi:type="v2.10.2:ElectricMachineTorqueLimitsType">
+		<ElectricMotorTorqueLimits xsi:type="v2.4:ElectricMachineTorqueLimitsType">
 			<!-- optional -->
 			<ElectricMachine>
 				<Position>4</Position>
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
 		</ElectricMotorTorqueLimits>
-		<ElectricMotorTorqueLimits xsi:type="v2.10.2:ElectricMachineTorqueLimitsType">
+		<ElectricMotorTorqueLimits xsi:type="v2.4:ElectricMachineTorqueLimitsType">
 			<!-- optional -->
 			<ElectricMachine>
 				<Position>GEN</Position>
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -117,7 +117,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -172,20 +172,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+						<v2.4:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -209,7 +209,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -223,7 +223,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+						<v2.4:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -247,7 +247,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -261,7 +261,7 @@
 				<PowertrainPosition>4</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -316,13 +316,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px.xml
index 8d78e1e1a4..d3066b30fb 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
	<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
		<Manufacturer>TU Graz</Manufacturer>
		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
		<Model>HEV Heavy Lorry Px</Model>
		<VIN>1234</VIN>
		<Date>2017-01-01T00:00:00Z</Date>
		<LegislativeCategory>N3</LegislativeCategory>
		<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
		<AxleConfiguration>4x2</AxleConfiguration>
		<CorrectedActualMass>6000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
		<IdlingSpeed>650</IdlingSpeed>
		<RetarderType>None</RetarderType>
		<AngledriveType>None</AngledriveType>
		<PTO xsi:type="PTOType">
			<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
			<PTOOtherElements>none</PTOOtherElements>
		</PTO>
		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
		<VocationalVehicle>false</VocationalVehicle>
		<NgTankSystem>Liquefied</NgTankSystem>
		<!-- optional -->
		<SleeperCab>false</SleeperCab>
		<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
		<ArchitectureID>P2</ArchitectureID>
		<OvcHev>false</OvcHev>
		<ADAS xsi:type="ADAS_HEV_Type">
			<v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
			<v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2:PredictiveCruiseControl>
		</ADAS>
		<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
			<!-- optional -->
			<v2.0:Entry gear="9" maxTorque="2000"/>
		</TorqueLimits>
		<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
			<!-- optional -->
			<ElectricMachine>
				<Position>2</Position>
				<VoltageLevel>
					<Voltage>100</Voltage>
					<MaxTorqueCurve>
						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
					</MaxTorqueCurve>
				</VoltageLevel>
				<VoltageLevel>
					<Voltage>500</Voltage>
					<MaxTorqueCurve>
						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
					</MaxTorqueCurve>
				</VoltageLevel>
			</ElectricMachine>
		</ElectricMotorTorqueLimits>
		<BoostingLimitations xsi:type="BoostingLimitationsType">
			<!-- optional -->
			<Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
			<Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
		</BoostingLimitations>
		<Components xsi:type="Components_HEV-Px_LorryType">
			<Engine>
				<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
					<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>
					<IdlingSpeed>560</IdlingSpeed>
					<RatedSpeed>2200</RatedSpeed>
					<RatedPower>380000</RatedPower>
					<MaxEngineTorque>2300</MaxEngineTorque>
					<WHTCUrban>1.0097</WHTCUrban>
					<WHTCRural>1.0035</WHTCRural>
					<WHTCMotorway>1.0200</WHTCMotorway>
					<BFColdHot>1.0000</BFColdHot>
					<CFRegPer>1.0000</CFRegPer>
					<CFNCV>1.0000</CFNCV>
					<FuelType>NG</FuelType>
					<FuelConsumptionMap>
						<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
						<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
						<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
						<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
					</FuelConsumptionMap>
					<FullLoadAndDragCurve>
						<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
						<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
						<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
					</FullLoadAndDragCurve>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference>
						<di:DigestMethod Algorithm=""/>
						<di:DigestValue/>
					</di:Reference>
				</v2.0:Signature>
			</Engine>
			<ElectricMachine>
				<PowertrainPosition>2</PowertrainPosition>
				<Count>1</Count>
				<ElectricMachineSystem>
					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
						<Manufacturer>a</Manufacturer>
						<Model>a</Model>
						<CertificationNumber>token</CertificationNumber>
						<Date>2017-01-01T00:00:00Z</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>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="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>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="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="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>
						<DragCurve>
							<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
							<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
						</DragCurve>
						<Conditioning>
							<Entry coolantTempInlet="30" coolingPower="5000"/>
						</Conditioning>
					</v2.10.1:Data>
					<v2.10.1:Signature>
						<di:Reference>
							<di:DigestMethod Algorithm=""/>
							<di:DigestValue/>
						</di:Reference>
					</v2.10.1:Signature>
				</ElectricMachineSystem>
				<P2.5GearRatios>
					<!-- only for P2.5 HEV -->
					<Ratio gear="1">1.000</Ratio>
					<Ratio gear="2">2.000</Ratio>
				</P2.5GearRatios>
			</ElectricMachine>
			<ElectricEnergyStorage>
				<Battery>
					<StringID>0</StringID>
					<REESS>
						<v2.10.2:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
							<Manufacturer>a</Manufacturer>
							<Model>a</Model>
							<CertificationNumber>tokena</CertificationNumber>
							<Date>2017-01-01T00:00:00Z</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="0" OCV="620.00"/>
								<Entry SoC="100" OCV="640.00"/>
							</OCV>
							<InternalResistance>
								<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"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.10.2:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm="asf"/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
					<SOCmin>20</SOCmin>
					<SOCmax>80</SOCmax>
				</Battery>
				<Battery>
					<StringID>1</StringID>
					<REESS>
						<v2.10.2:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
							<Manufacturer>b</Manufacturer>
							<Model>b</Model>
							<CertificationNumber>tokenb</CertificationNumber>
							<Date>2017-02-02T00:00:00Z</Date>
							<AppVersion>bbbbb</AppVersion>
							<CertificationMethod>Measured</CertificationMethod>
							<BatteryType>HPBS</BatteryType>
							<RatedCapacity>73.00</RatedCapacity>
							<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
							<JunctionboxIncluded>true</JunctionboxIncluded>
							<TestingTemperature>20</TestingTemperature>
							<OCV>
								<Entry SoC="0" OCV="621.00"/>
								<Entry SoC="100" OCV="641.00"/>
							</OCV>
							<InternalResistance>
								<Entry SoC="0" R_2="11.00" R_10="12.00" R_20="13.00"/>
								<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="51.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.10.2:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm="bsf"/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
				</Battery>
			</ElectricEnergyStorage>
			<Gearbox>
				<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck Gearbox</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<TransmissionType>AMT</TransmissionType>
					<MainCertificationMethod>Standard values</MainCertificationMethod>
					<Gears xsi:type="GearsDeclarationType">
						<Gear number="1">
							<Ratio>14.930</Ratio>
							<MaxTorque>1900</MaxTorque>
							<MaxSpeed>2000</MaxSpeed>
							<TorqueLossMap>
								<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
								<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
								<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
								<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
								<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
								<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
							</TorqueLossMap>
						</Gear>
						<Gear number="2">
							<Ratio>11.640</Ratio>
							<MaxTorque>1900</MaxTorque>
							<MaxSpeed>2000</MaxSpeed>
							<TorqueLossMap>
								<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
								<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
								<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
								<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
								<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
								<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
							</TorqueLossMap>
						</Gear>
					</Gears>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#gbx-vi2Oak2N">
						<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>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Gearbox>
			<TorqueConverter>
				<!-- optional -->
				<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
					<Manufacturer>Some Manufacturer</Manufacturer>
					<Model>Some Model</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-02-15T11:00:00Z</Date>
					<AppVersion>TC CalcApp 123</AppVersion>
					<CertificationMethod>Standard values</CertificationMethod>
					<Characteristics>
						<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
						<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
						<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
					</Characteristics>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference>
						<di:DigestMethod Algorithm=""/>
						<di:DigestValue/>
					</di:Reference>
				</v2.0:Signature>
			</TorqueConverter>
			<Angledrive>
				<!-- optional -->
				<v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck Gearbox</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<Ratio>2.345</Ratio>
					<CertificationMethod>Standard values</CertificationMethod>
					<TorqueLossMap>
						<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
						<Entry inputSpeed="1000.00" inputTorque="-1000.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="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
						<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
					</TorqueLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#agl-vi2Oak2N">
						<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>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Angledrive>
			<Retarder>
				<!-- optional -->
				<v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
					<Model>Generic Retarder</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<CertificationMethod>Standard values</CertificationMethod>
					<RetarderLossMap>
						<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
						<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
					</RetarderLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#RET-Shai9imi">
						<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>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Retarder>
			<Axlegear>
				<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck AxleGear</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<LineType>Single portal axle</LineType>
					<Ratio>2.590</Ratio>
					<CertificationMethod>Standard values</CertificationMethod>
					<TorqueLossMap>
						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
						<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
					</TorqueLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#AXL-EC3ohnoh">
						<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>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Axlegear>
			<AxleWheels>
				<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Axles>
						<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleNonDriven</AxleType>
							<TwinTyres>false</TwinTyres>
							<Steered>true</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0055</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
						<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleDriven</AxleType>
							<TwinTyres>true</TwinTyres>
							<Steered>false</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0063</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
					</Axles>
				</v2.0:Data>
			</AxleWheels>
			<Auxiliaries>
				<Data xsi:type="AUX_HEV-P_LorryDataType">
					<Fan>
						<Technology>Hydraulic driven - Constant displacement pump</Technology>
					</Fan>
					<SteeringPump>
						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
					</SteeringPump>
					<ElectricSystem>
						<Technology>Standard technology - LED headlights, all</Technology>
					</ElectricSystem>
					<PneumaticSystem>
						<Technology>Medium Supply 2-stage</Technology>
					</PneumaticSystem>
					<HVAC>
						<Technology>Default</Technology>
					</HVAC>
				</Data>
			</Auxiliaries>
			<AirDrag>
				<!-- optional -->
				<Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Manufacturer</Manufacturer>
					<Model>Generic Model</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-03-24T15:00:00Z</Date>
					<AppVersion>Vecto AirDrag x.y</AppVersion>
					<CdxA_0>6.31</CdxA_0>
					<TransferredCdxA>6.32</TransferredCdxA>
					<DeclaredCdxA>6.34</DeclaredCdxA>
				</Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
	<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
		<Manufacturer>TU Graz</Manufacturer>
		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
		<Model>HEV Heavy Lorry Px</Model>
		<VIN>1234</VIN>
		<Date>2017-01-01T00:00:00Z</Date>
		<LegislativeCategory>N3</LegislativeCategory>
		<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
		<AxleConfiguration>4x2</AxleConfiguration>
		<CorrectedActualMass>6000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
		<IdlingSpeed>650</IdlingSpeed>
		<RetarderType>None</RetarderType>
		<AngledriveType>None</AngledriveType>
		<PTO xsi:type="PTOType">
			<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
			<PTOOtherElements>none</PTOOtherElements>
		</PTO>
		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
		<VocationalVehicle>false</VocationalVehicle>
		<NgTankSystem>Liquefied</NgTankSystem>
		<!-- optional -->
		<SleeperCab>false</SleeperCab>
		<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
		<ArchitectureID>P2</ArchitectureID>
		<OvcHev>false</OvcHev>
		<ADAS xsi:type="ADAS_HEV_Type">
			<EngineStopStart>true</EngineStopStart>
			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
		</ADAS>
		<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
			<!-- optional -->
			<v2.0:Entry gear="9" maxTorque="2000"/>
		</TorqueLimits>
		<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
			<!-- optional -->
			<ElectricMachine>
				<Position>2</Position>
				<VoltageLevel>
					<Voltage>100</Voltage>
					<MaxTorqueCurve>
						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
					</MaxTorqueCurve>
				</VoltageLevel>
				<VoltageLevel>
					<Voltage>500</Voltage>
					<MaxTorqueCurve>
						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
					</MaxTorqueCurve>
				</VoltageLevel>
			</ElectricMachine>
		</ElectricMotorTorqueLimits>
		<BoostingLimitations xsi:type="BoostingLimitationsType">
			<!-- optional -->
			<Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
			<Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
		</BoostingLimitations>
		<Components xsi:type="Components_HEV-Px_LorryType">
			<Engine>
				<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
					<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>
					<IdlingSpeed>560</IdlingSpeed>
					<RatedSpeed>2200</RatedSpeed>
					<RatedPower>380000</RatedPower>
					<MaxEngineTorque>2300</MaxEngineTorque>
					<WHTCUrban>1.0097</WHTCUrban>
					<WHTCRural>1.0035</WHTCRural>
					<WHTCMotorway>1.0200</WHTCMotorway>
					<BFColdHot>1.0000</BFColdHot>
					<CFRegPer>1.0000</CFRegPer>
					<CFNCV>1.0000</CFNCV>
					<FuelType>NG</FuelType>
					<FuelConsumptionMap>
						<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
						<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
						<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
						<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
					</FuelConsumptionMap>
					<FullLoadAndDragCurve>
						<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
						<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
						<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
					</FullLoadAndDragCurve>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference>
						<di:DigestMethod Algorithm=""/>
						<di:DigestValue/>
					</di:Reference>
				</v2.0:Signature>
			</Engine>
			<ElectricMachine>
				<PowertrainPosition>2</PowertrainPosition>
				<Count>1</Count>
				<ElectricMachineSystem>
					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
						<Manufacturer>a</Manufacturer>
						<Model>a</Model>
						<CertificationNumber>token</CertificationNumber>
						<Date>2017-01-01T00:00:00Z</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>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="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>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="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="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>
						<DragCurve>
							<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
							<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
						</DragCurve>
						<Conditioning>
							<Entry coolantTempInlet="30" coolingPower="5000"/>
						</Conditioning>
					</v2.3:Data>
					<v2.3:Signature>
						<di:Reference>
							<di:DigestMethod Algorithm=""/>
							<di:DigestValue/>
						</di:Reference>
					</v2.3:Signature>
				</ElectricMachineSystem>
				<P2.5GearRatios>
					<!-- only for P2.5 HEV -->
					<Ratio gear="1">1.000</Ratio>
					<Ratio gear="2">2.000</Ratio>
				</P2.5GearRatios>
			</ElectricMachine>
			<ElectricEnergyStorage>
				<Battery>
					<StringID>0</StringID>
					<REESS>
						<v2.4:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
							<Manufacturer>a</Manufacturer>
							<Model>a</Model>
							<CertificationNumber>tokena</CertificationNumber>
							<Date>2017-01-01T00:00:00Z</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="0" OCV="620.00"/>
								<Entry SoC="100" OCV="640.00"/>
							</OCV>
							<InternalResistance>
								<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"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.4:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm="asf"/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
					<SOCmin>20</SOCmin>
					<SOCmax>80</SOCmax>
				</Battery>
				<Battery>
					<StringID>1</StringID>
					<REESS>
						<v2.4:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
							<Manufacturer>b</Manufacturer>
							<Model>b</Model>
							<CertificationNumber>tokenb</CertificationNumber>
							<Date>2017-02-02T00:00:00Z</Date>
							<AppVersion>bbbbb</AppVersion>
							<CertificationMethod>Measured</CertificationMethod>
							<BatteryType>HPBS</BatteryType>
							<RatedCapacity>73.00</RatedCapacity>
							<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
							<JunctionboxIncluded>true</JunctionboxIncluded>
							<TestingTemperature>20</TestingTemperature>
							<OCV>
								<Entry SoC="0" OCV="621.00"/>
								<Entry SoC="100" OCV="641.00"/>
							</OCV>
							<InternalResistance>
								<Entry SoC="0" R_2="11.00" R_10="12.00" R_20="13.00"/>
								<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="51.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.4:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm="bsf"/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
				</Battery>
			</ElectricEnergyStorage>
			<Gearbox>
				<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck Gearbox</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<TransmissionType>AMT</TransmissionType>
					<MainCertificationMethod>Standard values</MainCertificationMethod>
					<Gears xsi:type="GearsDeclarationType">
						<Gear number="1">
							<Ratio>14.930</Ratio>
							<MaxTorque>1900</MaxTorque>
							<MaxSpeed>2000</MaxSpeed>
							<TorqueLossMap>
								<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
								<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
								<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
								<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
								<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
								<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
							</TorqueLossMap>
						</Gear>
						<Gear number="2">
							<Ratio>11.640</Ratio>
							<MaxTorque>1900</MaxTorque>
							<MaxSpeed>2000</MaxSpeed>
							<TorqueLossMap>
								<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
								<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
								<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
								<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
								<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
								<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
							</TorqueLossMap>
						</Gear>
					</Gears>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#gbx-vi2Oak2N">
						<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>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Gearbox>
			<TorqueConverter>
				<!-- optional -->
				<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
					<Manufacturer>Some Manufacturer</Manufacturer>
					<Model>Some Model</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-02-15T11:00:00Z</Date>
					<AppVersion>TC CalcApp 123</AppVersion>
					<CertificationMethod>Standard values</CertificationMethod>
					<Characteristics>
						<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
						<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
						<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
					</Characteristics>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference>
						<di:DigestMethod Algorithm=""/>
						<di:DigestValue/>
					</di:Reference>
				</v2.0:Signature>
			</TorqueConverter>
			<Angledrive>
				<!-- optional -->
				<v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck Gearbox</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<Ratio>2.345</Ratio>
					<CertificationMethod>Standard values</CertificationMethod>
					<TorqueLossMap>
						<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
						<Entry inputSpeed="1000.00" inputTorque="-1000.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="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
						<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
					</TorqueLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#agl-vi2Oak2N">
						<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>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Angledrive>
			<Retarder>
				<!-- optional -->
				<v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
					<Model>Generic Retarder</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<CertificationMethod>Standard values</CertificationMethod>
					<RetarderLossMap>
						<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
						<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
					</RetarderLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#RET-Shai9imi">
						<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>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Retarder>
			<Axlegear>
				<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck AxleGear</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<LineType>Single portal axle</LineType>
					<Ratio>2.590</Ratio>
					<CertificationMethod>Standard values</CertificationMethod>
					<TorqueLossMap>
						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
						<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
					</TorqueLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#AXL-EC3ohnoh">
						<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>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Axlegear>
			<AxleWheels>
				<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Axles>
						<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleNonDriven</AxleType>
							<TwinTyres>false</TwinTyres>
							<Steered>true</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0055</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
						<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleDriven</AxleType>
							<TwinTyres>true</TwinTyres>
							<Steered>false</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0063</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
					</Axles>
				</v2.0:Data>
			</AxleWheels>
			<Auxiliaries>
				<Data xsi:type="AUX_HEV-P_LorryDataType">
					<Fan>
						<Technology>Hydraulic driven - Constant displacement pump</Technology>
					</Fan>
					<SteeringPump>
						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
					</SteeringPump>
					<ElectricSystem>
						<Technology>Standard technology - LED headlights, all</Technology>
					</ElectricSystem>
					<PneumaticSystem>
						<Technology>Medium Supply 2-stage</Technology>
					</PneumaticSystem>
					<HVAC>
						<Technology>Default</Technology>
					</HVAC>
				</Data>
			</Auxiliaries>
			<AirDrag>
				<!-- optional -->
				<Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Manufacturer</Manufacturer>
					<Model>Generic Model</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-03-24T15:00:00Z</Date>
					<AppVersion>Vecto AirDrag x.y</AppVersion>
					<CdxA_0>6.31</CdxA_0>
					<TransferredCdxA>6.32</TransferredCdxA>
					<DeclaredCdxA>6.34</DeclaredCdxA>
				</Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px_IHPC.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px_IHPC.xml
index e6af67ae28..b47db70963 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px_IHPC.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/HEV_heavyLorry_AMT_Px_IHPC.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
	<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
		<Manufacturer>TU Graz</Manufacturer>
		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
		<Model>HEV Heavy Lorry Px</Model>
		<VIN>1234</VIN>
		<Date>2017-01-01T00:00:00Z</Date>
		<LegislativeCategory>N3</LegislativeCategory>
		<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
		<AxleConfiguration>4x2</AxleConfiguration>
		<CorrectedActualMass>6000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
		<IdlingSpeed>650</IdlingSpeed>
		<RetarderType>None</RetarderType>
		<AngledriveType>None</AngledriveType>
		<PTO xsi:type="PTOType">
			<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
			<PTOOtherElements>none</PTOOtherElements>
		</PTO>
		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
		<VocationalVehicle>false</VocationalVehicle>
		<NgTankSystem>Liquefied</NgTankSystem>
		<!-- optional -->
		<SleeperCab>false</SleeperCab>
		<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
		<ArchitectureID>P2</ArchitectureID>
		<OvcHev>false</OvcHev>
		<ADAS xsi:type="ADAS_HEV_Type">
			<v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
			<v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2:PredictiveCruiseControl>
		</ADAS>
		<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
			<!-- optional -->
			<v2.0:Entry gear="9" maxTorque="2000"/>
		</TorqueLimits>
		<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
			<!-- optional -->
			<ElectricMachine>
				<Position>2</Position>
				<VoltageLevel>
					<Voltage>100</Voltage>
					<MaxTorqueCurve>
						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
					</MaxTorqueCurve>
				</VoltageLevel>
				<VoltageLevel>
					<Voltage>500</Voltage>
					<MaxTorqueCurve>
						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
					</MaxTorqueCurve>
				</VoltageLevel>
			</ElectricMachine>
		</ElectricMotorTorqueLimits>
		<BoostingLimitations xsi:type="BoostingLimitationsType">
			<!-- optional -->
			<Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
			<Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
		</BoostingLimitations>
		<Components xsi:type="Components_HEV-Px_LorryType">
			<Engine>
				<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
					<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>
					<IdlingSpeed>560</IdlingSpeed>
					<RatedSpeed>2200</RatedSpeed>
					<RatedPower>380000</RatedPower>
					<MaxEngineTorque>2300</MaxEngineTorque>
					<WHTCUrban>1.0097</WHTCUrban>
					<WHTCRural>1.0035</WHTCRural>
					<WHTCMotorway>1.0200</WHTCMotorway>
					<BFColdHot>1.0000</BFColdHot>
					<CFRegPer>1.0000</CFRegPer>
					<CFNCV>1.0000</CFNCV>
					<FuelType>NG</FuelType>
					<FuelConsumptionMap>
						<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
						<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
						<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
						<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
					</FuelConsumptionMap>
					<FullLoadAndDragCurve>
						<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
						<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
						<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
					</FullLoadAndDragCurve>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference>
						<di:DigestMethod Algorithm=""/>
						<di:DigestValue/>
					</di:Reference>
				</v2.0:Signature>
			</Engine>
			<ElectricMachine>
				<PowertrainPosition>2</PowertrainPosition>
				<Count>1</Count>
				<ElectricMachineSystem>
					<v2.10.1:Data xsi:type="ElectricMachineSystemIHPCMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
						<Manufacturer>a</Manufacturer>
						<Model>a</Model>
						<CertificationNumber>token</CertificationNumber>
						<Date>2017-01-01T00:00:00Z</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>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 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>
							<PowerMap gear="2">
								<Entry outShaftSpeed="0.00" torque="500.00" electricPower="1000.00"/>
								<Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1000.00"/>
								<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="26000.00"/>
								<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-26000.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="0.00" maxTorque="450.00" minTorque="-450.00"/>
								<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
							</MaxTorqueCurve>
							<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>
							<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="5000.00" torque="5000.00" electricPower="26000.00"/>
								<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-26000.00"/>
							</PowerMap>
						</VoltageLevel>
						<DragCurve>
							<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
							<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
						</DragCurve>
						<Conditioning>
							<!-- optional -->
							<Entry coolantTempInlet="30" coolingPower="5000"/>
						</Conditioning>
					</v2.10.1:Data>
					<v2.10.1:Signature>
						<di:Reference>
							<di:DigestMethod Algorithm=""/>
							<di:DigestValue/>
						</di:Reference>
					</v2.10.1:Signature>
				</ElectricMachineSystem>
				<P2.5GearRatios>
					<!-- only for P2.5 HEV -->
					<Ratio gear="1">1.000</Ratio>
					<Ratio gear="2">2.000</Ratio>
				</P2.5GearRatios>
			</ElectricMachine>
			<ElectricEnergyStorage>
				<Battery>
					<StringID>0</StringID>
					<REESS>
						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
							<Manufacturer>a</Manufacturer>
							<Model>a</Model>
							<CertificationNumber>tokena</CertificationNumber>
							<Date>2017-01-01T00:00:00Z</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="0" OCV="620.00"/>
								<Entry SoC="100" OCV="640.00"/>
							</OCV>
							<InternalResistance>
								<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"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.10.2:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm="asf"/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
					<SOCmin>20</SOCmin>
					<SOCmax>80</SOCmax>
				</Battery>
				<Battery>
					<StringID>1</StringID>
					<REESS>
						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
							<Manufacturer>b</Manufacturer>
							<Model>b</Model>
							<CertificationNumber>tokenb</CertificationNumber>
							<Date>2017-02-02T00:00:00Z</Date>
							<AppVersion>bbbbb</AppVersion>
							<CertificationMethod>Measured</CertificationMethod>
							<BatteryType>HPBS</BatteryType>
							<RatedCapacity>73.00</RatedCapacity>
							<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
							<JunctionboxIncluded>true</JunctionboxIncluded>
							<TestingTemperature>20</TestingTemperature>
							<OCV>
								<Entry SoC="0" OCV="621.00"/>
								<Entry SoC="100" OCV="641.00"/>
							</OCV>
							<InternalResistance>
								<Entry SoC="0" R_2="11.00" R_10="12.00" R_20="13.00"/>
								<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="51.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.10.2:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm="bsf"/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
				</Battery>
			</ElectricEnergyStorage>
			<Gearbox>
				<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck Gearbox</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<TransmissionType>AMT</TransmissionType>
					<MainCertificationMethod>Standard values</MainCertificationMethod>
					<Gears xsi:type="GearsDeclarationType">
						<Gear number="1">
							<Ratio>14.930</Ratio>
							<MaxTorque>1900</MaxTorque>
							<MaxSpeed>2000</MaxSpeed>
							<TorqueLossMap>
								<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
								<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
								<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
								<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
								<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
								<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
							</TorqueLossMap>
						</Gear>
						<Gear number="2">
							<Ratio>11.640</Ratio>
							<MaxTorque>1900</MaxTorque>
							<MaxSpeed>2000</MaxSpeed>
							<TorqueLossMap>
								<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
								<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
								<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
								<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
								<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
								<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
							</TorqueLossMap>
						</Gear>
					</Gears>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#gbx-vi2Oak2N">
						<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>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Gearbox>
			<TorqueConverter>
				<!-- optional -->
				<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
					<Manufacturer>Some Manufacturer</Manufacturer>
					<Model>Some Model</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-02-15T11:00:00Z</Date>
					<AppVersion>TC CalcApp 123</AppVersion>
					<CertificationMethod>Standard values</CertificationMethod>
					<Characteristics>
						<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
						<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
						<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
					</Characteristics>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference>
						<di:DigestMethod Algorithm=""/>
						<di:DigestValue/>
					</di:Reference>
				</v2.0:Signature>
			</TorqueConverter>
			<Angledrive>
				<!-- optional -->
				<v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck Gearbox</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<Ratio>2.345</Ratio>
					<CertificationMethod>Standard values</CertificationMethod>
					<TorqueLossMap>
						<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
						<Entry inputSpeed="1000.00" inputTorque="-1000.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="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
						<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
					</TorqueLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#agl-vi2Oak2N">
						<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>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Angledrive>
			<Retarder>
				<!-- optional -->
				<v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
					<Model>Generic Retarder</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<CertificationMethod>Standard values</CertificationMethod>
					<RetarderLossMap>
						<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
						<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
					</RetarderLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#RET-Shai9imi">
						<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>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Retarder>
			<Axlegear>
				<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck AxleGear</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<LineType>Single portal axle</LineType>
					<Ratio>2.590</Ratio>
					<CertificationMethod>Standard values</CertificationMethod>
					<TorqueLossMap>
						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
						<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
					</TorqueLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#AXL-EC3ohnoh">
						<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>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Axlegear>
			<AxleWheels>
				<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Axles>
						<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleNonDriven</AxleType>
							<TwinTyres>false</TwinTyres>
							<Steered>true</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0055</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
						<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleDriven</AxleType>
							<TwinTyres>true</TwinTyres>
							<Steered>false</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0063</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
					</Axles>
				</v2.0:Data>
			</AxleWheels>
			<Auxiliaries>
				<Data xsi:type="AUX_HEV-P_LorryDataType">
					<Fan>
						<Technology>Hydraulic driven - Constant displacement pump</Technology>
					</Fan>
					<SteeringPump>
						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
					</SteeringPump>
					<ElectricSystem>
						<Technology>Standard technology - LED headlights, all</Technology>
					</ElectricSystem>
					<PneumaticSystem>
						<Technology>Medium Supply 2-stage</Technology>
					</PneumaticSystem>
					<HVAC>
						<Technology>Default</Technology>
					</HVAC>
				</Data>
			</Auxiliaries>
			<AirDrag>
				<!-- optional -->
				<Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Manufacturer</Manufacturer>
					<Model>Generic Model</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-03-24T15:00:00Z</Date>
					<AppVersion>Vecto AirDrag x.y</AppVersion>
					<CdxA_0>6.31</CdxA_0>
					<TransferredCdxA>6.32</TransferredCdxA>
					<DeclaredCdxA>6.34</DeclaredCdxA>
				</Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
	<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
		<Manufacturer>TU Graz</Manufacturer>
		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
		<Model>HEV Heavy Lorry Px</Model>
		<VIN>1234</VIN>
		<Date>2017-01-01T00:00:00Z</Date>
		<LegislativeCategory>N3</LegislativeCategory>
		<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
		<AxleConfiguration>4x2</AxleConfiguration>
		<CorrectedActualMass>6000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
		<IdlingSpeed>650</IdlingSpeed>
		<RetarderType>None</RetarderType>
		<AngledriveType>None</AngledriveType>
		<PTO xsi:type="PTOType">
			<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
			<PTOOtherElements>none</PTOOtherElements>
		</PTO>
		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
		<VocationalVehicle>false</VocationalVehicle>
		<NgTankSystem>Liquefied</NgTankSystem>
		<!-- optional -->
		<SleeperCab>false</SleeperCab>
		<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
		<ArchitectureID>P2</ArchitectureID>
		<OvcHev>false</OvcHev>
		<ADAS xsi:type="ADAS_HEV_Type">
			<EngineStopStart>true</EngineStopStart>
			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
		</ADAS>
		<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
			<!-- optional -->
			<v2.0:Entry gear="9" maxTorque="2000"/>
		</TorqueLimits>
		<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
			<!-- optional -->
			<ElectricMachine>
				<Position>2</Position>
				<VoltageLevel>
					<Voltage>100</Voltage>
					<MaxTorqueCurve>
						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
					</MaxTorqueCurve>
				</VoltageLevel>
				<VoltageLevel>
					<Voltage>500</Voltage>
					<MaxTorqueCurve>
						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
					</MaxTorqueCurve>
				</VoltageLevel>
			</ElectricMachine>
		</ElectricMotorTorqueLimits>
		<BoostingLimitations xsi:type="BoostingLimitationsType">
			<!-- optional -->
			<Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
			<Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
		</BoostingLimitations>
		<Components xsi:type="Components_HEV-Px_LorryType">
			<Engine>
				<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
					<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>
					<IdlingSpeed>560</IdlingSpeed>
					<RatedSpeed>2200</RatedSpeed>
					<RatedPower>380000</RatedPower>
					<MaxEngineTorque>2300</MaxEngineTorque>
					<WHTCUrban>1.0097</WHTCUrban>
					<WHTCRural>1.0035</WHTCRural>
					<WHTCMotorway>1.0200</WHTCMotorway>
					<BFColdHot>1.0000</BFColdHot>
					<CFRegPer>1.0000</CFRegPer>
					<CFNCV>1.0000</CFNCV>
					<FuelType>NG</FuelType>
					<FuelConsumptionMap>
						<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
						<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
						<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
						<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
					</FuelConsumptionMap>
					<FullLoadAndDragCurve>
						<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
						<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
						<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
					</FullLoadAndDragCurve>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference>
						<di:DigestMethod Algorithm=""/>
						<di:DigestValue/>
					</di:Reference>
				</v2.0:Signature>
			</Engine>
			<ElectricMachine>
				<PowertrainPosition>2</PowertrainPosition>
				<Count>1</Count>
				<ElectricMachineSystem>
					<v2.3:Data xsi:type="ElectricMachineSystemIHPCMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
						<Manufacturer>a</Manufacturer>
						<Model>a</Model>
						<CertificationNumber>token</CertificationNumber>
						<Date>2017-01-01T00:00:00Z</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>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 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>
							<PowerMap gear="2">
								<Entry outShaftSpeed="0.00" torque="500.00" electricPower="1000.00"/>
								<Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1000.00"/>
								<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="26000.00"/>
								<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-26000.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="0.00" maxTorque="450.00" minTorque="-450.00"/>
								<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
							</MaxTorqueCurve>
							<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>
							<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="5000.00" torque="5000.00" electricPower="26000.00"/>
								<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-26000.00"/>
							</PowerMap>
						</VoltageLevel>
						<DragCurve>
							<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
							<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
						</DragCurve>
						<Conditioning>
							<!-- optional -->
							<Entry coolantTempInlet="30" coolingPower="5000"/>
						</Conditioning>
					</v2.3:Data>
					<v2.3:Signature>
						<di:Reference>
							<di:DigestMethod Algorithm=""/>
							<di:DigestValue/>
						</di:Reference>
					</v2.3:Signature>
				</ElectricMachineSystem>
				<P2.5GearRatios>
					<!-- only for P2.5 HEV -->
					<Ratio gear="1">1.000</Ratio>
					<Ratio gear="2">2.000</Ratio>
				</P2.5GearRatios>
			</ElectricMachine>
			<ElectricEnergyStorage>
				<Battery>
					<StringID>0</StringID>
					<REESS>
						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
							<Manufacturer>a</Manufacturer>
							<Model>a</Model>
							<CertificationNumber>tokena</CertificationNumber>
							<Date>2017-01-01T00:00:00Z</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="0" OCV="620.00"/>
								<Entry SoC="100" OCV="640.00"/>
							</OCV>
							<InternalResistance>
								<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"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.4:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm="asf"/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
					<SOCmin>20</SOCmin>
					<SOCmax>80</SOCmax>
				</Battery>
				<Battery>
					<StringID>1</StringID>
					<REESS>
						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
							<Manufacturer>b</Manufacturer>
							<Model>b</Model>
							<CertificationNumber>tokenb</CertificationNumber>
							<Date>2017-02-02T00:00:00Z</Date>
							<AppVersion>bbbbb</AppVersion>
							<CertificationMethod>Measured</CertificationMethod>
							<BatteryType>HPBS</BatteryType>
							<RatedCapacity>73.00</RatedCapacity>
							<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
							<JunctionboxIncluded>true</JunctionboxIncluded>
							<TestingTemperature>20</TestingTemperature>
							<OCV>
								<Entry SoC="0" OCV="621.00"/>
								<Entry SoC="100" OCV="641.00"/>
							</OCV>
							<InternalResistance>
								<Entry SoC="0" R_2="11.00" R_10="12.00" R_20="13.00"/>
								<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="51.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.4:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm="bsf"/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
				</Battery>
			</ElectricEnergyStorage>
			<Gearbox>
				<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck Gearbox</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<TransmissionType>AMT</TransmissionType>
					<MainCertificationMethod>Standard values</MainCertificationMethod>
					<Gears xsi:type="GearsDeclarationType">
						<Gear number="1">
							<Ratio>14.930</Ratio>
							<MaxTorque>1900</MaxTorque>
							<MaxSpeed>2000</MaxSpeed>
							<TorqueLossMap>
								<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
								<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
								<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
								<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
								<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
								<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
							</TorqueLossMap>
						</Gear>
						<Gear number="2">
							<Ratio>11.640</Ratio>
							<MaxTorque>1900</MaxTorque>
							<MaxSpeed>2000</MaxSpeed>
							<TorqueLossMap>
								<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
								<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
								<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
								<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
								<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
								<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
							</TorqueLossMap>
						</Gear>
					</Gears>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#gbx-vi2Oak2N">
						<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>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Gearbox>
			<TorqueConverter>
				<!-- optional -->
				<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
					<Manufacturer>Some Manufacturer</Manufacturer>
					<Model>Some Model</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-02-15T11:00:00Z</Date>
					<AppVersion>TC CalcApp 123</AppVersion>
					<CertificationMethod>Standard values</CertificationMethod>
					<Characteristics>
						<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
						<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
						<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
					</Characteristics>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference>
						<di:DigestMethod Algorithm=""/>
						<di:DigestValue/>
					</di:Reference>
				</v2.0:Signature>
			</TorqueConverter>
			<Angledrive>
				<!-- optional -->
				<v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck Gearbox</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<Ratio>2.345</Ratio>
					<CertificationMethod>Standard values</CertificationMethod>
					<TorqueLossMap>
						<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
						<Entry inputSpeed="1000.00" inputTorque="-1000.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="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
						<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
					</TorqueLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#agl-vi2Oak2N">
						<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>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Angledrive>
			<Retarder>
				<!-- optional -->
				<v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
					<Model>Generic Retarder</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<CertificationMethod>Standard values</CertificationMethod>
					<RetarderLossMap>
						<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
						<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
					</RetarderLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#RET-Shai9imi">
						<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>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Retarder>
			<Axlegear>
				<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck AxleGear</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<LineType>Single portal axle</LineType>
					<Ratio>2.590</Ratio>
					<CertificationMethod>Standard values</CertificationMethod>
					<TorqueLossMap>
						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
						<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
					</TorqueLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#AXL-EC3ohnoh">
						<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>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Axlegear>
			<AxleWheels>
				<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Axles>
						<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleNonDriven</AxleType>
							<TwinTyres>false</TwinTyres>
							<Steered>true</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0055</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
						<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleDriven</AxleType>
							<TwinTyres>true</TwinTyres>
							<Steered>false</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0063</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
					</Axles>
				</v2.0:Data>
			</AxleWheels>
			<Auxiliaries>
				<Data xsi:type="AUX_HEV-P_LorryDataType">
					<Fan>
						<Technology>Hydraulic driven - Constant displacement pump</Technology>
					</Fan>
					<SteeringPump>
						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
					</SteeringPump>
					<ElectricSystem>
						<Technology>Standard technology - LED headlights, all</Technology>
					</ElectricSystem>
					<PneumaticSystem>
						<Technology>Medium Supply 2-stage</Technology>
					</PneumaticSystem>
					<HVAC>
						<Technology>Default</Technology>
					</HVAC>
				</Data>
			</Auxiliaries>
			<AirDrag>
				<!-- optional -->
				<Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Manufacturer</Manufacturer>
					<Model>Generic Model</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-03-24T15:00:00Z</Date>
					<AppVersion>Vecto AirDrag x.y</AppVersion>
					<CdxA_0>6.31</CdxA_0>
					<TransferredCdxA>6.32</TransferredCdxA>
					<DeclaredCdxA>6.34</DeclaredCdxA>
				</Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/IEPC_heavyLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/IEPC_heavyLorry.xml
index 8a87a20d9e..79736f2a34 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/IEPC_heavyLorry.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/IEPC_heavyLorry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_IEPC_HeavyLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -28,7 +28,7 @@
 		</ADAS>
 		<Components xsi:type="Components_IEPC_LorryType">
 			<IEPC>
-				<v2.10.1:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+				<v2.3:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
 					<Manufacturer>a</Manufacturer>
 					<Model>a</Model>
 					<CertificationNumber>token</CertificationNumber>
@@ -40,7 +40,7 @@
 					<RotationalInertia>0.10</RotationalInertia>
 					<DifferentialIncluded>false</DifferentialIncluded>
 					<DesignTypeWheelMotor>true</DesignTypeWheelMotor>
-					<Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+					<Gears xsi:type="v2.3:IEPCGearsDeclarationType">
 						<Gear number="1">
 							<Ratio>3.000</Ratio>
 						</Gear>
@@ -108,19 +108,19 @@
 					<Conditioning>
 						<Entry coolantTempInlet="30" coolingPower="5000"/>
 					</Conditioning>
-				</v2.10.1:Data>
-				<v2.10.1:Signature>
+				</v2.3:Data>
+				<v2.3:Signature>
 					<di:Reference>
 						<di:DigestMethod Algorithm=""/>
 						<di:DigestValue/>
 					</di:Reference>
-				</v2.10.1:Signature>
+				</v2.3:Signature>
 			</IEPC>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -144,7 +144,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -158,7 +158,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -182,7 +182,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml
index 572ca5c300..5b7fe48a67 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_PEV_HeavyLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -31,22 +31,22 @@
 			<!-- optional -->
 			<v2.0:Entry gear="9" maxTorque="2000"/>
 		</TorqueLimits>
-		<ElectricMotorTorqueLimits xsi:type="v2.10.2:ElectricMachineTorqueLimitsType">
+		<ElectricMotorTorqueLimits xsi:type="v2.4:ElectricMachineTorqueLimitsType">
 			<!-- optional -->
 			<ElectricMachine>
 				<Position>2</Position>
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -56,7 +56,7 @@
 				<PowertrainPosition>2</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -111,13 +111,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -129,7 +129,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -153,7 +153,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -167,7 +167,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -191,7 +191,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml
index b8c3ec575b..8add55beea 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_PEV_HeavyLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -23,29 +23,29 @@
 		<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
 		<ArchitectureID>E2</ArchitectureID>
 		<OvcHev>false</OvcHev>
-		<ADAS xsi:type="v2.10.2:ADAS_PEV_Type">
+		<ADAS xsi:type="v2.4:ADAS_PEV_Type">
 			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
 		</ADAS>
 		<TorqueLimits xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:TorqueLimitsType">
 			<!-- optional -->
 			<v2.0:Entry gear="9" maxTorque="2000"/>
 		</TorqueLimits>
-		<ElectricMotorTorqueLimits xsi:type="v2.10.2:ElectricMachineTorqueLimitsType">
+		<ElectricMotorTorqueLimits xsi:type="v2.4:ElectricMachineTorqueLimitsType">
 			<!-- optional -->
 			<ElectricMachine>
 				<Position>2</Position>
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -55,7 +55,7 @@
 				<PowertrainPosition>2</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -110,13 +110,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -128,7 +128,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -152,7 +152,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -166,7 +166,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -190,7 +190,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -201,7 +201,7 @@
 				</Battery>
 			</ElectricEnergyStorage>
 			<Gearbox>
-				<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.10.1:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+				<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.3:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 					<Manufacturer>Generic Vendor</Manufacturer>
 					<Model>GB_12-gear</Model>
 					<CertificationNumber>GBX-GB_12-gear</CertificationNumber>
@@ -209,7 +209,7 @@
 					<AppVersion>VectoCore</AppVersion>
 					<TransmissionType>APT-N</TransmissionType>
 					<MainCertificationMethod>Standard values</MainCertificationMethod>
-					<v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+					<v2.3:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 						<Gear number="1">
 							<Ratio>14.930</Ratio>
 							<TorqueLossMap>
@@ -255,7 +255,7 @@
 								<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
 							</TorqueLossMap>
 						</Gear>
-					</v2.10.1:Gears>
+					</v2.3:Gears>
 				</v2.0:Data>
 				<v2.0:Signature>
 					<di:Reference URI="#gbx-vi2Oak2N">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml
index 7df5924571..9f00270dbb 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
	<v2.0:Vehicle xsi:type="Vehicle_PEV_HeavyLorryDeclarationType" id="a">
		<Manufacturer>TU Graz</Manufacturer>
		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
		<Model>HEV Heavy Lorry Px</Model>
		<VIN>1234</VIN>
		<Date>2017-01-01T00:00:00Z</Date>
		<LegislativeCategory>N3</LegislativeCategory>
		<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
		<AxleConfiguration>4x2</AxleConfiguration>
		<CorrectedActualMass>6000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
		<RetarderType>None</RetarderType>
		<AngledriveType>None</AngledriveType>
		<PTO xsi:type="PTOType"> <!-- syntactically allowed, not supported by VECTO - no gearbox! -->
			<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
			<PTOOtherElements>none</PTOOtherElements>
		</PTO>
		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
		<VocationalVehicle>false</VocationalVehicle>
		<SleeperCab>false</SleeperCab>
		<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
		<ArchitectureID>E3</ArchitectureID>
		<OvcHev>false</OvcHev>
		<ADAS xsi:type="ADAS_PEV_Type">
			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
		</ADAS>
		<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
			<!-- optional -->
			<v2.0:Entry gear="9" maxTorque="2000"/>
		</TorqueLimits>
		<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
			<!-- optional -->
			<ElectricMachine>
				<Position>2</Position>
				<VoltageLevel>
					<Voltage>100</Voltage>
					<MaxTorqueCurve>
						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
					</MaxTorqueCurve>
				</VoltageLevel>
				<VoltageLevel>
					<Voltage>500</Voltage>
					<MaxTorqueCurve>
						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
					</MaxTorqueCurve>
				</VoltageLevel>
			</ElectricMachine>
		</ElectricMotorTorqueLimits>
		<Components xsi:type="Components_PEV-E3_LorryType">
			<ElectricMachine>
				<PowertrainPosition>3</PowertrainPosition>
				<Count>1</Count>
				<ElectricMachineSystem>
					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
						<Manufacturer>a</Manufacturer>
						<Model>a</Model>
						<CertificationNumber>token</CertificationNumber>
						<Date>2017-01-01T00:00:00Z</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>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="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>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="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="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>
						<DragCurve>
							<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
							<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
						</DragCurve>
						<Conditioning>
							<Entry coolantTempInlet="30" coolingPower="5000"/>
						</Conditioning>
					</v2.10.1:Data>
					<v2.10.1:Signature>
						<di:Reference>
							<di:DigestMethod Algorithm=""/>
							<di:DigestValue/>
						</di:Reference>
					</v2.10.1:Signature>
				</ElectricMachineSystem>
				<P2.5GearRatios>
					<!-- only for P2.5 HEV -->
					<Ratio gear="1">1.000</Ratio>
					<Ratio gear="2">2.000</Ratio>
				</P2.5GearRatios>
			</ElectricMachine>
			<ElectricEnergyStorage>
				<Battery>
					<StringID>0</StringID>
					<REESS>
						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
							<Manufacturer>a</Manufacturer>
							<Model>a</Model>
							<CertificationNumber>token</CertificationNumber>
							<Date>2017-01-01T00:00:00Z</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="0" OCV="620.00"/>
								<Entry SoC="100" OCV="640.00"/>
							</OCV>
							<InternalResistance>
								<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"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.10.2:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm=""/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
					<SOCmin>20</SOCmin>
					<SOCmax>80</SOCmax>
				</Battery>
				<Battery>
					<StringID>1</StringID>
					<REESS>
						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
							<Manufacturer>a</Manufacturer>
							<Model>a</Model>
							<CertificationNumber>token</CertificationNumber>
							<Date>2017-01-01T00:00:00Z</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="0" OCV="620.00"/>
								<Entry SoC="100" OCV="640.00"/>
							</OCV>
							<InternalResistance>
								<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"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.10.2:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm=""/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
				</Battery>
			</ElectricEnergyStorage>
			<Retarder>
				<!-- optional -->
				<v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
					<Model>Generic Retarder</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<CertificationMethod>Standard values</CertificationMethod>
					<RetarderLossMap>
						<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
						<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
					</RetarderLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#RET-Shai9imi">
						<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>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Retarder>
			<Axlegear>
				<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck AxleGear</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<LineType>Single portal axle</LineType>
					<Ratio>2.590</Ratio>
					<CertificationMethod>Standard values</CertificationMethod>
					<TorqueLossMap>
						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
						<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
					</TorqueLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#AXL-EC3ohnoh">
						<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>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Axlegear>
			<AxleWheels>
				<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Axles>
						<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleNonDriven</AxleType>
							<TwinTyres>false</TwinTyres>
							<Steered>true</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0055</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
						<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleDriven</AxleType>
							<TwinTyres>true</TwinTyres>
							<Steered>false</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0063</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
					</Axles>
				</v2.0:Data>
			</AxleWheels>
			<Auxiliaries>
				<Data xsi:type="AUX_PEV_LorryDataType">
					<SteeringPump>
						<Technology axleNumber="1">Electric driven pump</Technology>
					</SteeringPump>
					<ElectricSystem>
						<Technology>Standard technology - LED headlights, all</Technology>
					</ElectricSystem>
					<PneumaticSystem>
						<Technology>Medium Supply 2-stage + elec. driven</Technology>
					</PneumaticSystem>
					<HVAC>
						<Technology>Default</Technology>
					</HVAC>
				</Data>
			</Auxiliaries>
			<AirDrag>
				<!-- optional -->
				<Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Manufacturer</Manufacturer>
					<Model>Generic Model</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-03-24T15:00:00Z</Date>
					<AppVersion>Vecto AirDrag x.y</AppVersion>
					<CdxA_0>6.31</CdxA_0>
					<TransferredCdxA>6.32</TransferredCdxA>
					<DeclaredCdxA>6.34</DeclaredCdxA>
				</Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
	<v2.0:Vehicle xsi:type="Vehicle_PEV_HeavyLorryDeclarationType" id="a">
		<Manufacturer>TU Graz</Manufacturer>
		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
		<Model>HEV Heavy Lorry Px</Model>
		<VIN>1234</VIN>
		<Date>2017-01-01T00:00:00Z</Date>
		<LegislativeCategory>N3</LegislativeCategory>
		<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
		<AxleConfiguration>4x2</AxleConfiguration>
		<CorrectedActualMass>6000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
		<RetarderType>None</RetarderType>
		<AngledriveType>None</AngledriveType>
		<PTO xsi:type="PTOType"> <!-- syntactically allowed, not supported by VECTO - no gearbox! -->
			<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
			<PTOOtherElements>none</PTOOtherElements>
		</PTO>
		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
		<VocationalVehicle>false</VocationalVehicle>
		<SleeperCab>false</SleeperCab>
		<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
		<ArchitectureID>E3</ArchitectureID>
		<OvcHev>false</OvcHev>
		<ADAS xsi:type="ADAS_PEV_Type">
			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
		</ADAS>
		<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
			<!-- optional -->
			<v2.0:Entry gear="9" maxTorque="2000"/>
		</TorqueLimits>
		<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
			<!-- optional -->
			<ElectricMachine>
				<Position>2</Position>
				<VoltageLevel>
					<Voltage>100</Voltage>
					<MaxTorqueCurve>
						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
					</MaxTorqueCurve>
				</VoltageLevel>
				<VoltageLevel>
					<Voltage>500</Voltage>
					<MaxTorqueCurve>
						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
					</MaxTorqueCurve>
				</VoltageLevel>
			</ElectricMachine>
		</ElectricMotorTorqueLimits>
		<Components xsi:type="Components_PEV-E3_LorryType">
			<ElectricMachine>
				<PowertrainPosition>3</PowertrainPosition>
				<Count>1</Count>
				<ElectricMachineSystem>
					<v2.3:Data xsi:type="v2.3:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
						<Manufacturer>a</Manufacturer>
						<Model>a</Model>
						<CertificationNumber>token</CertificationNumber>
						<Date>2017-01-01T00:00:00Z</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>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="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>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="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="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>
						<DragCurve>
							<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
							<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
						</DragCurve>
						<Conditioning>
							<Entry coolantTempInlet="30" coolingPower="5000"/>
						</Conditioning>
					</v2.3:Data>
					<v2.3:Signature>
						<di:Reference>
							<di:DigestMethod Algorithm=""/>
							<di:DigestValue/>
						</di:Reference>
					</v2.3:Signature>
				</ElectricMachineSystem>
				<P2.5GearRatios>
					<!-- only for P2.5 HEV -->
					<Ratio gear="1">1.000</Ratio>
					<Ratio gear="2">2.000</Ratio>
				</P2.5GearRatios>
			</ElectricMachine>
			<ElectricEnergyStorage>
				<Battery>
					<StringID>0</StringID>
					<REESS>
						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
							<Manufacturer>a</Manufacturer>
							<Model>a</Model>
							<CertificationNumber>token</CertificationNumber>
							<Date>2017-01-01T00:00:00Z</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="0" OCV="620.00"/>
								<Entry SoC="100" OCV="640.00"/>
							</OCV>
							<InternalResistance>
								<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"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.4:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm=""/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
					<SOCmin>20</SOCmin>
					<SOCmax>80</SOCmax>
				</Battery>
				<Battery>
					<StringID>1</StringID>
					<REESS>
						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
							<Manufacturer>a</Manufacturer>
							<Model>a</Model>
							<CertificationNumber>token</CertificationNumber>
							<Date>2017-01-01T00:00:00Z</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="0" OCV="620.00"/>
								<Entry SoC="100" OCV="640.00"/>
							</OCV>
							<InternalResistance>
								<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"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.4:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm=""/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
				</Battery>
			</ElectricEnergyStorage>
			<Retarder>
				<!-- optional -->
				<v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
					<Model>Generic Retarder</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<CertificationMethod>Standard values</CertificationMethod>
					<RetarderLossMap>
						<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
						<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
					</RetarderLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#RET-Shai9imi">
						<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>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Retarder>
			<Axlegear>
				<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck AxleGear</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<LineType>Single portal axle</LineType>
					<Ratio>2.590</Ratio>
					<CertificationMethod>Standard values</CertificationMethod>
					<TorqueLossMap>
						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
						<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
					</TorqueLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#AXL-EC3ohnoh">
						<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>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Axlegear>
			<AxleWheels>
				<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Axles>
						<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleNonDriven</AxleType>
							<TwinTyres>false</TwinTyres>
							<Steered>true</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0055</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
						<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleDriven</AxleType>
							<TwinTyres>true</TwinTyres>
							<Steered>false</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0063</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
					</Axles>
				</v2.0:Data>
			</AxleWheels>
			<Auxiliaries>
				<Data xsi:type="AUX_PEV_LorryDataType">
					<SteeringPump>
						<Technology axleNumber="1">Electric driven pump</Technology>
					</SteeringPump>
					<ElectricSystem>
						<Technology>Standard technology - LED headlights, all</Technology>
					</ElectricSystem>
					<PneumaticSystem>
						<Technology>Medium Supply 2-stage + elec. driven</Technology>
					</PneumaticSystem>
					<HVAC>
						<Technology>Default</Technology>
					</HVAC>
				</Data>
			</Auxiliaries>
			<AirDrag>
				<!-- optional -->
				<Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Manufacturer</Manufacturer>
					<Model>Generic Model</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-03-24T15:00:00Z</Date>
					<AppVersion>Vecto AirDrag x.y</AppVersion>
					<CdxA_0>6.31</CdxA_0>
					<TransferredCdxA>6.32</TransferredCdxA>
					<DeclaredCdxA>6.34</DeclaredCdxA>
				</Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml
index 6de56456f2..9e87ad3dff 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
	<v2.0:Vehicle xsi:type="Vehicle_PEV_HeavyLorryDeclarationType" id="a">
		<Manufacturer>TU Graz</Manufacturer>
		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
		<Model>HEV Heavy Lorry Px</Model>
		<VIN>1234</VIN>
		<Date>2017-01-01T00:00:00Z</Date>
		<LegislativeCategory>N3</LegislativeCategory>
		<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
		<AxleConfiguration>4x2</AxleConfiguration>
		<CorrectedActualMass>6000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
		<RetarderType>None</RetarderType>
		<AngledriveType>None</AngledriveType>
		<PTO xsi:type="PTOType">  <!-- syntactically allowed, not supported by VECTO - no gearbox! -->
			<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
			<PTOOtherElements>none</PTOOtherElements>
		</PTO>
		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
		<VocationalVehicle>false</VocationalVehicle>
		<SleeperCab>false</SleeperCab>
		<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
		<ArchitectureID>E4</ArchitectureID>
		<OvcHev>false</OvcHev>
		<ADAS xsi:type="ADAS_PEV_Type">
			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
		</ADAS>
		<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
			<!-- optional -->
			<v2.0:Entry gear="9" maxTorque="2000"/>
		</TorqueLimits>
		<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
			<!-- optional -->
			<ElectricMachine>
				<Position>2</Position>
				<VoltageLevel>
					<Voltage>100</Voltage>
					<MaxTorqueCurve>
						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
					</MaxTorqueCurve>
				</VoltageLevel>
				<VoltageLevel>
					<Voltage>500</Voltage>
					<MaxTorqueCurve>
						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
					</MaxTorqueCurve>
				</VoltageLevel>
			</ElectricMachine>
		</ElectricMotorTorqueLimits>
		<Components xsi:type="Components_PEV-E4_LorryType">
			<ElectricMachine>
				<PowertrainPosition>4</PowertrainPosition>
				<Count>1</Count>
				<ElectricMachineSystem>
					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
						<Manufacturer>a</Manufacturer>
						<Model>a</Model>
						<CertificationNumber>token</CertificationNumber>
						<Date>2017-01-01T00:00:00Z</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>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="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>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="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="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>
						<DragCurve>
							<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
							<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
						</DragCurve>
						<Conditioning>
							<Entry coolantTempInlet="30" coolingPower="5000"/>
						</Conditioning>
					</v2.10.1:Data>
					<v2.10.1:Signature>
						<di:Reference>
							<di:DigestMethod Algorithm=""/>
							<di:DigestValue/>
						</di:Reference>
					</v2.10.1:Signature>
				</ElectricMachineSystem>
				<P2.5GearRatios>
					<!-- only for P2.5 HEV -->
					<Ratio gear="1">1.000</Ratio>
					<Ratio gear="2">2.000</Ratio>
				</P2.5GearRatios>
			</ElectricMachine>
			<ElectricEnergyStorage>
				<Battery>
					<StringID>0</StringID>
					<REESS>
						<v2.10.2:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
							<Manufacturer>a</Manufacturer>
							<Model>a</Model>
							<CertificationNumber>token</CertificationNumber>
							<Date>2017-01-01T00:00:00Z</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="0" OCV="620.00"/>
								<Entry SoC="100" OCV="640.00"/>
							</OCV>
							<InternalResistance>
								<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"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.10.2:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm=""/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
					<SOCmin>20</SOCmin>
					<SOCmax>80</SOCmax>
				</Battery>
				<Battery>
					<StringID>1</StringID>
					<REESS>
						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
							<Manufacturer>a</Manufacturer>
							<Model>a</Model>
							<CertificationNumber>token</CertificationNumber>
							<Date>2017-01-01T00:00:00Z</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="0" OCV="620.00"/>
								<Entry SoC="100" OCV="640.00"/>
							</OCV>
							<InternalResistance>
								<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"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.10.2:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm=""/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
				</Battery>
			</ElectricEnergyStorage>
			<Retarder>
				<!-- optional -->
				<v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
					<Model>Generic Retarder</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<CertificationMethod>Standard values</CertificationMethod>
					<RetarderLossMap>
						<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
						<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
					</RetarderLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#RET-Shai9imi">
						<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>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Retarder>
			<AxleWheels>
				<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Axles>
						<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleNonDriven</AxleType>
							<TwinTyres>false</TwinTyres>
							<Steered>true</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0055</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
						<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleDriven</AxleType>
							<TwinTyres>true</TwinTyres>
							<Steered>false</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0063</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
					</Axles>
				</v2.0:Data>
			</AxleWheels>
			<Auxiliaries>
				<Data xsi:type="AUX_PEV_LorryDataType">
					<SteeringPump>
						<Technology axleNumber="1">Electric driven pump</Technology>
					</SteeringPump>
					<ElectricSystem>
						<Technology>Standard technology - LED headlights, all</Technology>
					</ElectricSystem>
					<PneumaticSystem>
						<Technology>Medium Supply 2-stage + elec. driven</Technology>
					</PneumaticSystem>
					<HVAC>
						<Technology>Default</Technology>
					</HVAC>
				</Data>
			</Auxiliaries>
			<AirDrag>
				<!-- optional -->
				<Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Manufacturer</Manufacturer>
					<Model>Generic Model</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-03-24T15:00:00Z</Date>
					<AppVersion>Vecto AirDrag x.y</AppVersion>
					<CdxA_0>6.31</CdxA_0>
					<TransferredCdxA>6.32</TransferredCdxA>
					<DeclaredCdxA>6.34</DeclaredCdxA>
				</Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
	<v2.0:Vehicle xsi:type="Vehicle_PEV_HeavyLorryDeclarationType" id="a">
		<Manufacturer>TU Graz</Manufacturer>
		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
		<Model>HEV Heavy Lorry Px</Model>
		<VIN>1234</VIN>
		<Date>2017-01-01T00:00:00Z</Date>
		<LegislativeCategory>N3</LegislativeCategory>
		<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
		<AxleConfiguration>4x2</AxleConfiguration>
		<CorrectedActualMass>6000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
		<RetarderType>None</RetarderType>
		<AngledriveType>None</AngledriveType>
		<PTO xsi:type="PTOType">  <!-- syntactically allowed, not supported by VECTO - no gearbox! -->
			<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
			<PTOOtherElements>none</PTOOtherElements>
		</PTO>
		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
		<VocationalVehicle>false</VocationalVehicle>
		<SleeperCab>false</SleeperCab>
		<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
		<ArchitectureID>E4</ArchitectureID>
		<OvcHev>false</OvcHev>
		<ADAS xsi:type="ADAS_PEV_Type">
			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
		</ADAS>
		<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
			<!-- optional -->
			<v2.0:Entry gear="9" maxTorque="2000"/>
		</TorqueLimits>
		<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
			<!-- optional -->
			<ElectricMachine>
				<Position>2</Position>
				<VoltageLevel>
					<Voltage>100</Voltage>
					<MaxTorqueCurve>
						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
					</MaxTorqueCurve>
				</VoltageLevel>
				<VoltageLevel>
					<Voltage>500</Voltage>
					<MaxTorqueCurve>
						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
					</MaxTorqueCurve>
				</VoltageLevel>
			</ElectricMachine>
		</ElectricMotorTorqueLimits>
		<Components xsi:type="Components_PEV-E4_LorryType">
			<ElectricMachine>
				<PowertrainPosition>4</PowertrainPosition>
				<Count>1</Count>
				<ElectricMachineSystem>
					<v2.3:Data xsi:type="v2.3:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
						<Manufacturer>a</Manufacturer>
						<Model>a</Model>
						<CertificationNumber>token</CertificationNumber>
						<Date>2017-01-01T00:00:00Z</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>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="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>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="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="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>
						<DragCurve>
							<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
							<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
						</DragCurve>
						<Conditioning>
							<Entry coolantTempInlet="30" coolingPower="5000"/>
						</Conditioning>
					</v2.3:Data>
					<v2.3:Signature>
						<di:Reference>
							<di:DigestMethod Algorithm=""/>
							<di:DigestValue/>
						</di:Reference>
					</v2.3:Signature>
				</ElectricMachineSystem>
				<P2.5GearRatios>
					<!-- only for P2.5 HEV -->
					<Ratio gear="1">1.000</Ratio>
					<Ratio gear="2">2.000</Ratio>
				</P2.5GearRatios>
			</ElectricMachine>
			<ElectricEnergyStorage>
				<Battery>
					<StringID>0</StringID>
					<REESS>
						<v2.4:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
							<Manufacturer>a</Manufacturer>
							<Model>a</Model>
							<CertificationNumber>token</CertificationNumber>
							<Date>2017-01-01T00:00:00Z</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="0" OCV="620.00"/>
								<Entry SoC="100" OCV="640.00"/>
							</OCV>
							<InternalResistance>
								<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"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.4:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm=""/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
					<SOCmin>20</SOCmin>
					<SOCmax>80</SOCmax>
				</Battery>
				<Battery>
					<StringID>1</StringID>
					<REESS>
						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
							<Manufacturer>a</Manufacturer>
							<Model>a</Model>
							<CertificationNumber>token</CertificationNumber>
							<Date>2017-01-01T00:00:00Z</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="0" OCV="620.00"/>
								<Entry SoC="100" OCV="640.00"/>
							</OCV>
							<InternalResistance>
								<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"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.4:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm=""/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
				</Battery>
			</ElectricEnergyStorage>
			<Retarder>
				<!-- optional -->
				<v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
					<Model>Generic Retarder</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<CertificationMethod>Standard values</CertificationMethod>
					<RetarderLossMap>
						<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
						<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
					</RetarderLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#RET-Shai9imi">
						<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>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Retarder>
			<AxleWheels>
				<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Axles>
						<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleNonDriven</AxleType>
							<TwinTyres>false</TwinTyres>
							<Steered>true</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0055</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
						<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleDriven</AxleType>
							<TwinTyres>true</TwinTyres>
							<Steered>false</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0063</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
					</Axles>
				</v2.0:Data>
			</AxleWheels>
			<Auxiliaries>
				<Data xsi:type="AUX_PEV_LorryDataType">
					<SteeringPump>
						<Technology axleNumber="1">Electric driven pump</Technology>
					</SteeringPump>
					<ElectricSystem>
						<Technology>Standard technology - LED headlights, all</Technology>
					</ElectricSystem>
					<PneumaticSystem>
						<Technology>Medium Supply 2-stage + elec. driven</Technology>
					</PneumaticSystem>
					<HVAC>
						<Technology>Default</Technology>
					</HVAC>
				</Data>
			</Auxiliaries>
			<AirDrag>
				<!-- optional -->
				<Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Manufacturer</Manufacturer>
					<Model>Generic Model</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-03-24T15:00:00Z</Date>
					<AppVersion>Vecto AirDrag x.y</AppVersion>
					<CdxA_0>6.31</CdxA_0>
					<TransferredCdxA>6.32</TransferredCdxA>
					<DeclaredCdxA>6.34</DeclaredCdxA>
				</Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/Conventional_mediumLorry_AMT.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/Conventional_mediumLorry_AMT.xml
index 76ae5f3d51..ed50f91e8d 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/Conventional_mediumLorry_AMT.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/Conventional_mediumLorry_AMT.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_Conventional_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_AMT_S2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_AMT_S2.xml
index 071e7a170a..40178220ff 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_AMT_S2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_AMT_S2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -37,15 +37,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -57,15 +57,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -113,7 +113,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -168,20 +168,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -205,7 +205,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -219,7 +219,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+						<v2.4:Data xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -243,7 +243,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -257,7 +257,7 @@
 				<PowertrainPosition>2</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -312,13 +312,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_IEPC-S.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_IEPC-S.xml
index cc3a651005..73f9215020 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_IEPC-S.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_IEPC-S.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-IEPC-S_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -30,22 +30,22 @@
 			<!-- optional -->
 			<v2.0:Entry gear="9" maxTorque="2000"/>
 		</TorqueLimits>
-		<ElectricMotorTorqueLimits xsi:type="v2.10.2:ElectricMachineTorqueLimitsType">
+		<ElectricMotorTorqueLimits xsi:type="v2.4:ElectricMachineTorqueLimitsType">
 			<!-- optional -->
 			<ElectricMachine>
 				<Position>GEN</Position>
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -93,7 +93,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -148,20 +148,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -185,7 +185,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -199,7 +199,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -223,7 +223,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -234,7 +234,7 @@
 				</Battery>
 			</ElectricEnergyStorage>
 			<IEPC>
-				<v2.10.1:Data xsi:type="IEPCMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+				<v2.3:Data xsi:type="IEPCMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 					<Manufacturer>a</Manufacturer>
 					<Model>a</Model>
 					<CertificationNumber>token</CertificationNumber>
@@ -246,7 +246,7 @@
 					<RotationalInertia>0.10</RotationalInertia>
 					<DifferentialIncluded>false</DifferentialIncluded>
 					<DesignTypeWheelMotor>false</DesignTypeWheelMotor>
-					<Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+					<Gears xsi:type="v2.3:IEPCGearsDeclarationType">
 						<Gear number="1">
 							<Ratio>3.000</Ratio>
 						</Gear>
@@ -314,13 +314,13 @@
 					<Conditioning>
 						<Entry coolantTempInlet="30" coolingPower="5000"/>
 					</Conditioning>
-				</v2.10.1:Data>
-				<v2.10.1:Signature>
+				</v2.3:Data>
+				<v2.3:Signature>
 					<di:Reference>
 						<di:DigestMethod Algorithm=""/>
 						<di:DigestValue/>
 					</di:Reference>
-				</v2.10.1:Signature>
+				</v2.3:Signature>
 			</IEPC>
 			<Retarder>
 				<!-- optional -->
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_S3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_S3.xml
index 555ee32680..97f8be8d0f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_S3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_S3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -22,7 +22,7 @@
 		<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
 		<ArchitectureID>S3</ArchitectureID>
 		<OvcHev>false</OvcHev>
-		<ADAS xsi:type="v2.10.2:ADAS_HEV_Type">
+		<ADAS xsi:type="v2.4:ADAS_HEV_Type">
 			<EngineStopStart>true</EngineStopStart>
 			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
 		</ADAS>
@@ -37,15 +37,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -57,15 +57,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -113,7 +113,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -168,20 +168,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -205,7 +205,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -219,7 +219,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -243,7 +243,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -257,7 +257,7 @@
 				<PowertrainPosition>3</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -312,13 +312,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_S4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_S4.xml
index 6d1109770c..49eac0f157 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_S4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV-S_mediumLorry_S4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -37,15 +37,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -57,15 +57,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -113,7 +113,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -168,20 +168,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -205,7 +205,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -219,7 +219,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -243,7 +243,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -257,7 +257,7 @@
 				<PowertrainPosition>4</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -312,13 +312,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV_mediumLorry_AMT_Px.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV_mediumLorry_AMT_Px.xml
index 3622235f4c..4cfc25a24b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV_mediumLorry_AMT_Px.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/HEV_mediumLorry_AMT_Px.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -37,15 +37,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -98,7 +98,7 @@
 				<PowertrainPosition>2</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -153,13 +153,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -171,7 +171,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -195,7 +195,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -211,7 +211,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -235,7 +235,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/IEPC_mediumLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/IEPC_mediumLorry.xml
index 9c72a174c2..d7b7b6979b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/IEPC_mediumLorry.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/IEPC_mediumLorry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_IEPC_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -24,7 +24,7 @@
 		</ADAS>
 		<Components xsi:type="Components_IEPC_LorryType">
 			<IEPC>
-				<v2.10.1:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+				<v2.3:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
 					<Manufacturer>a</Manufacturer>
 					<Model>a</Model>
 					<CertificationNumber>token</CertificationNumber>
@@ -36,7 +36,7 @@
 					<RotationalInertia>0.10</RotationalInertia>
 					<DifferentialIncluded>false</DifferentialIncluded>
 					<DesignTypeWheelMotor>true</DesignTypeWheelMotor>
-					<Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+					<Gears xsi:type="v2.3:IEPCGearsDeclarationType">
 						<Gear number="1">
 							<Ratio>3.000</Ratio>
 						</Gear>
@@ -104,19 +104,19 @@
 					<Conditioning>
 						<Entry coolantTempInlet="30" coolingPower="5000"/>
 					</Conditioning>
-				</v2.10.1:Data>
-				<v2.10.1:Signature>
+				</v2.3:Data>
+				<v2.3:Signature>
 					<di:Reference>
 						<di:DigestMethod Algorithm=""/>
 						<di:DigestValue/>
 					</di:Reference>
-				</v2.10.1:Signature>
+				</v2.3:Signature>
 			</IEPC>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -140,7 +140,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -154,7 +154,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -178,7 +178,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml
index 23f14b8fd3..d5b264abfc 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -30,15 +30,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -48,7 +48,7 @@
 				<PowertrainPosition>2</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -103,13 +103,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios><!-- only for P2.5 HEV -->
 					<Ratio gear="1">1.000</Ratio>
@@ -120,7 +120,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1"  xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"  xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -144,7 +144,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -158,7 +158,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1"  xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"  xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -182,7 +182,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2_EM_Std.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2_EM_Std.xml
index dcd41fb036..4a943b2c41 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2_EM_Std.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2_EM_Std.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -33,15 +33,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -51,7 +51,7 @@
 				<PowertrainPosition>2</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="ElectricMachineSystemStandardValuesDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemStandardValuesDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -84,13 +84,13 @@
 							<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
 							<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
 						</DragCurve>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -102,7 +102,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -126,7 +126,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -140,7 +140,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -164,7 +164,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml
index 764be23dfc..a371b7c849 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -33,15 +33,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -51,7 +51,7 @@
 				<PowertrainPosition>2</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -106,13 +106,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -124,7 +124,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -148,7 +148,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -162,7 +162,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -186,7 +186,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -197,7 +197,7 @@
 				</Battery>
 			</ElectricEnergyStorage>
 			<Gearbox>
-				<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.10.1:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+				<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.3:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 					<Manufacturer>Generic Vendor</Manufacturer>
 					<Model>GB_12-gear</Model>
 					<CertificationNumber>GBX-GB_12-gear</CertificationNumber>
@@ -205,7 +205,7 @@
 					<AppVersion>VectoCore</AppVersion>
 					<TransmissionType>APT-N</TransmissionType>
 					<MainCertificationMethod>Standard values</MainCertificationMethod>
-					<v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+					<v2.3:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 						<Gear number="1">
 							<Ratio>14.930</Ratio>
 							<TorqueLossMap>
@@ -251,7 +251,7 @@
 								<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
 							</TorqueLossMap>
 						</Gear>
-					</v2.10.1:Gears>
+					</v2.3:Gears>
 				</v2.0:Data>
 				<v2.0:Signature>
 					<di:Reference URI="#gbx-vi2Oak2N">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E3.xml
index fa4b3af77c..403f15e1aa 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -33,15 +33,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -51,7 +51,7 @@
 				<PowertrainPosition>3</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -106,13 +106,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -124,7 +124,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -148,7 +148,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -162,7 +162,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -186,7 +186,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E4.xml
index ac34d77d70..45661f61bd 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -19,7 +19,7 @@
 		<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
 		<ArchitectureID>E4</ArchitectureID>
 		<OvcHev>false</OvcHev>
-		<ADAS xsi:type="v2.10.2:ADAS_PEV_Type">
+		<ADAS xsi:type="v2.4:ADAS_PEV_Type">
 			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
 		</ADAS>
 		<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
@@ -33,15 +33,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -51,7 +51,7 @@
 				<PowertrainPosition>4</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -106,13 +106,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -124,7 +124,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -148,7 +148,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -162,7 +162,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -186,7 +186,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/Conventional_primaryBus_AMT.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/Conventional_primaryBus_AMT.xml
index eb10927870..ec2fb26bbf 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/Conventional_primaryBus_AMT.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/Conventional_primaryBus_AMT.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 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" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 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" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/HEV-S_primaryBus_AMT_S2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/HEV-S_primaryBus_AMT_S2.xml
index 4e87883fd1..0c6661425a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/HEV-S_primaryBus_AMT_S2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/HEV-S_primaryBus_AMT_S2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 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" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 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" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_HEV-Sx_PrimaryBusDeclarationType">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -37,15 +37,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -57,15 +57,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -117,7 +117,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -172,20 +172,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -209,7 +209,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -223,7 +223,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -247,7 +247,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -261,7 +261,7 @@
 				<PowertrainPosition>2</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -316,13 +316,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/HEV-S_primaryBus_IEPC-S.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/HEV-S_primaryBus_IEPC-S.xml
index 8af0527a88..a310db7f09 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/HEV-S_primaryBus_IEPC-S.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/HEV-S_primaryBus_IEPC-S.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-IEPC-S_PrimaryBusDeclarationType" id="a">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -33,15 +33,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -89,7 +89,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -144,20 +144,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -181,7 +181,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -195,7 +195,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -219,7 +219,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -230,7 +230,7 @@
 				</Battery>
 			</ElectricEnergyStorage>
 			<IEPC>
-				<v2.10.1:Data xsi:type="IEPCMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+				<v2.3:Data xsi:type="IEPCMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 					<Manufacturer>a</Manufacturer>
 					<Model>a</Model>
 					<CertificationNumber>token</CertificationNumber>
@@ -242,7 +242,7 @@
 					<RotationalInertia>0.10</RotationalInertia>
 					<DifferentialIncluded>false</DifferentialIncluded>
 					<DesignTypeWheelMotor>false</DesignTypeWheelMotor>
-					<Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+					<Gears xsi:type="v2.3:IEPCGearsDeclarationType">
 						<Gear number="1">
 							<Ratio>3.000</Ratio>
 						</Gear>
@@ -310,13 +310,13 @@
 					<Conditioning>
 						<Entry coolantTempInlet="30" coolingPower="5000"/>
 					</Conditioning>
-				</v2.10.1:Data>
-				<v2.10.1:Signature>
+				</v2.3:Data>
+				<v2.3:Signature>
 					<di:Reference>
 						<di:DigestMethod Algorithm=""/>
 						<di:DigestValue/>
 					</di:Reference>
-				</v2.10.1:Signature>
+				</v2.3:Signature>
 			</IEPC>
 			<Retarder>
 				<!-- optional -->
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/HEV-S_primaryBus_S3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/HEV-S_primaryBus_S3.xml
index 5d6db42360..f1aeb455c6 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/HEV-S_primaryBus_S3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/HEV-S_primaryBus_S3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_PrimaryBusDeclarationType" id="a">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -18,7 +18,7 @@
 		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
 		<ArchitectureID>S3</ArchitectureID>
 		<OvcHev>false</OvcHev>
-		<ADAS xsi:type="v2.10.2:ADAS_HEV_Type">
+		<ADAS xsi:type="v2.4:ADAS_HEV_Type">
 			<EngineStopStart>true</EngineStopStart>
 			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
 		</ADAS>
@@ -33,15 +33,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -53,15 +53,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -109,7 +109,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -164,20 +164,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -201,7 +201,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -215,7 +215,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -239,7 +239,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -253,7 +253,7 @@
 				<PowertrainPosition>3</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -308,13 +308,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/HEV-S_primaryBus_S4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/HEV-S_primaryBus_S4.xml
index dab14b2ee0..19774aabcf 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/HEV-S_primaryBus_S4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/HEV-S_primaryBus_S4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_PrimaryBusDeclarationType" id="a">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -33,15 +33,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -53,15 +53,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -109,7 +109,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -164,20 +164,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -201,7 +201,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -215,7 +215,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -239,7 +239,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -253,7 +253,7 @@
 				<PowertrainPosition>4</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -308,13 +308,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/HEV_primaryBus_AMT_Px.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/HEV_primaryBus_AMT_Px.xml
index c98d511867..bac6d07089 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/HEV_primaryBus_AMT_Px.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/HEV_primaryBus_AMT_Px.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
	<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_PrimaryBusDeclarationType" id="a">
		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
		<Model>Generic Model</Model>
		<VIN>VEH-1234567890</VIN>
		<Date>2017-02-15T11:00:00Z</Date>
		<LegislativeCategory>M3</LegislativeCategory>
		<ChassisConfiguration>Bus</ChassisConfiguration>
		<AxleConfiguration>4x2</AxleConfiguration>
		<Articulated>false</Articulated>
		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
		<IdlingSpeed>600</IdlingSpeed>
		<RetarderType>Transmission Output Retarder</RetarderType>
		<RetarderRatio>1.000</RetarderRatio>
		<AngledriveType>None</AngledriveType>
		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
		<ArchitectureID>P2</ArchitectureID>
		<OvcHev>false</OvcHev>
		<ADAS xsi:type="ADAS_HEV_Type">
			<EngineStopStart>true</EngineStopStart>
			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
		</ADAS>
		<TorqueLimits xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:TorqueLimitsType">
			<!-- optional -->
			<v2.0:Entry gear="9" maxTorque="2000"/>
		</TorqueLimits>
		<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
			<!-- optional -->
			<ElectricMachine>
				<Position>2</Position>
				<VoltageLevel>
					<Voltage>100</Voltage>
					<MaxTorqueCurve>
						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
					</MaxTorqueCurve>
				</VoltageLevel>
				<VoltageLevel>
					<Voltage>500</Voltage>
					<MaxTorqueCurve>
						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
					</MaxTorqueCurve>
				</VoltageLevel>
			</ElectricMachine>
		</ElectricMotorTorqueLimits>
		<BoostingLimitations xsi:type="BoostingLimitationsType">
			<!-- optional -->
			<Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
			<Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
		</BoostingLimitations>
		<Components xsi:type="Components_HEV-Px_PrimaryBusType">
			<Engine>
				<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
					<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>
					<IdlingSpeed>560</IdlingSpeed>
					<RatedSpeed>2200</RatedSpeed>
					<RatedPower>380000</RatedPower>
					<MaxEngineTorque>2300</MaxEngineTorque>
					<WHTCUrban>1.0097</WHTCUrban>
					<WHTCRural>1.0035</WHTCRural>
					<WHTCMotorway>1.0200</WHTCMotorway>
					<BFColdHot>1.0000</BFColdHot>
					<CFRegPer>1.0000</CFRegPer>
					<CFNCV>1.0000</CFNCV>
					<FuelType>NG</FuelType>
					<FuelConsumptionMap>
						<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
						<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
						<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
						<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
					</FuelConsumptionMap>
					<FullLoadAndDragCurve>
						<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
						<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
						<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
					</FullLoadAndDragCurve>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference>
						<di:DigestMethod Algorithm=""/>
						<di:DigestValue/>
					</di:Reference>
				</v2.0:Signature>
			</Engine>
			<ElectricMachine>
				<PowertrainPosition>2</PowertrainPosition>
				<Count>1</Count>
				<ElectricMachineSystem>
					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
						<Manufacturer>a</Manufacturer>
						<Model>a</Model>
						<CertificationNumber>token</CertificationNumber>
						<Date>2017-01-01T00:00:00Z</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>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="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>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="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="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>
						<DragCurve>
							<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
							<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
						</DragCurve>
						<Conditioning>
							<Entry coolantTempInlet="30" coolingPower="5000"/>
						</Conditioning>
					</v2.10.1:Data>
					<v2.10.1:Signature>
						<di:Reference>
							<di:DigestMethod Algorithm=""/>
							<di:DigestValue/>
						</di:Reference>
					</v2.10.1:Signature>
				</ElectricMachineSystem>
				<P2.5GearRatios>
					<!-- only for P2.5 HEV -->
					<Ratio gear="1">1.000</Ratio>
					<Ratio gear="2">2.000</Ratio>
				</P2.5GearRatios>
			</ElectricMachine>
			<ElectricEnergyStorage>
				<Battery>
					<StringID>0</StringID>
					<REESS>
						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
							<Manufacturer>a</Manufacturer>
							<Model>a</Model>
							<CertificationNumber>token</CertificationNumber>
							<Date>2017-01-01T00:00:00Z</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="0" OCV="620.00"/>
								<Entry SoC="100" OCV="640.00"/>
							</OCV>
							<InternalResistance>
								<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"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.10.2:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm=""/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
					<SOCmin>20</SOCmin>
					<SOCmax>80</SOCmax>
				</Battery>
				<Battery>
					<StringID>1</StringID>
					<REESS>
						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
							<Manufacturer>a</Manufacturer>
							<Model>a</Model>
							<CertificationNumber>token</CertificationNumber>
							<Date>2017-01-01T00:00:00Z</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="0" OCV="620.00"/>
								<Entry SoC="100" OCV="640.00"/>
							</OCV>
							<InternalResistance>
								<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"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.10.2:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm=""/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
				</Battery>
			</ElectricEnergyStorage>
			<Gearbox>
				<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck Gearbox</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<TransmissionType>AMT</TransmissionType>
					<MainCertificationMethod>Standard values</MainCertificationMethod>
					<Gears xsi:type="GearsDeclarationType">
						<Gear number="1">
							<Ratio>14.930</Ratio>
							<MaxTorque>1900</MaxTorque>
							<MaxSpeed>2000</MaxSpeed>
							<TorqueLossMap>
								<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
								<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
								<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
								<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
								<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
								<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
							</TorqueLossMap>
						</Gear>
						<Gear number="2">
							<Ratio>11.640</Ratio>
							<MaxTorque>1900</MaxTorque>
							<MaxSpeed>2000</MaxSpeed>
							<TorqueLossMap>
								<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
								<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
								<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
								<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
								<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
								<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
							</TorqueLossMap>
						</Gear>
					</Gears>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#gbx-vi2Oak2N">
						<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>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Gearbox>
			<TorqueConverter>
				<!-- optional -->
				<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
					<Manufacturer>Some Manufacturer</Manufacturer>
					<Model>Some Model</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-02-15T11:00:00Z</Date>
					<AppVersion>TC CalcApp 123</AppVersion>
					<CertificationMethod>Standard values</CertificationMethod>
					<Characteristics>
						<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
						<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
						<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
					</Characteristics>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference>
						<di:DigestMethod Algorithm=""/>
						<di:DigestValue/>
					</di:Reference>
				</v2.0:Signature>
			</TorqueConverter>
			<Angledrive>
				<!-- optional -->
				<v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck Gearbox</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<Ratio>2.345</Ratio>
					<CertificationMethod>Standard values</CertificationMethod>
					<TorqueLossMap>
						<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
						<Entry inputSpeed="1000.00" inputTorque="-1000.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="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
						<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
					</TorqueLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#agl-vi2Oak2N">
						<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>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Angledrive>
			<Retarder>
				<!-- optional -->
				<v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
					<Model>Generic Retarder</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<CertificationMethod>Standard values</CertificationMethod>
					<RetarderLossMap>
						<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
						<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
					</RetarderLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#RET-Shai9imi">
						<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>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Retarder>
			<Axlegear>
				<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck AxleGear</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<LineType>Single portal axle</LineType>
					<Ratio>2.590</Ratio>
					<CertificationMethod>Standard values</CertificationMethod>
					<TorqueLossMap>
						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
						<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
					</TorqueLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#AXL-EC3ohnoh">
						<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>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Axlegear>
			<AxleWheels>
				<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Axles>
						<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleNonDriven</AxleType>
							<TwinTyres>false</TwinTyres>
							<Steered>true</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0055</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
						<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleDriven</AxleType>
							<TwinTyres>true</TwinTyres>
							<Steered>false</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0063</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
					</Axles>
				</v2.0:Data>
			</AxleWheels>
			<Auxiliaries>
				<Data xsi:type="AUX_HEV-P_PrimaryBusType">
					<Fan>
						<Technology>Hydraulic driven - Constant displacement pump</Technology>
					</Fan>
					<SteeringPump>
						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
					</SteeringPump>
					<ElectricSystem>
						<AlternatorTechnology>conventional</AlternatorTechnology>
						<SmartAlternator>
							<!-- optional -->
							<RatedCurrent>100</RatedCurrent>
							<RatedVoltage>48</RatedVoltage>
						</SmartAlternator>
						<SmartAlternator>
							<!-- optional -->
							<RatedCurrent>50</RatedCurrent>
							<RatedVoltage>48</RatedVoltage>
						</SmartAlternator>
						<Battery>
							<!-- optional -->
							<BatteryTechnology>li-ion battery - high power</BatteryTechnology>
							<RatedCapacity>50</RatedCapacity>
							<NominalVoltage>48</NominalVoltage>
						</Battery>
						<Capacitor>
							<!-- optional -->
							<CapacitorTechnology>with DCDC converter</CapacitorTechnology>
							<RatedCapacitance>120</RatedCapacitance>
							<RatedVoltage>30</RatedVoltage>
						</Capacitor>
						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
					</ElectricSystem>
					<PneumaticSystem>
						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
						<CompressorDrive>mechanically</CompressorDrive>
						<Clutch>none</Clutch>
						<CompressorRatio>1.000</CompressorRatio>
						<SmartCompressionSystem>true</SmartCompressionSystem>
						<SmartRegenerationSystem>false</SmartRegenerationSystem>
						<AirsuspensionControl>electronically</AirsuspensionControl>
						<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
					</PneumaticSystem>
					<HVAC>
						<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
						<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
	<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_PrimaryBusDeclarationType" id="a">
		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
		<Model>Generic Model</Model>
		<VIN>VEH-1234567890</VIN>
		<Date>2017-02-15T11:00:00Z</Date>
		<LegislativeCategory>M3</LegislativeCategory>
		<ChassisConfiguration>Bus</ChassisConfiguration>
		<AxleConfiguration>4x2</AxleConfiguration>
		<Articulated>false</Articulated>
		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
		<IdlingSpeed>600</IdlingSpeed>
		<RetarderType>Transmission Output Retarder</RetarderType>
		<RetarderRatio>1.000</RetarderRatio>
		<AngledriveType>None</AngledriveType>
		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
		<ArchitectureID>P2</ArchitectureID>
		<OvcHev>false</OvcHev>
		<ADAS xsi:type="ADAS_HEV_Type">
			<EngineStopStart>true</EngineStopStart>
			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
		</ADAS>
		<TorqueLimits xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:TorqueLimitsType">
			<!-- optional -->
			<v2.0:Entry gear="9" maxTorque="2000"/>
		</TorqueLimits>
		<ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType">
			<!-- optional -->
			<ElectricMachine>
				<Position>2</Position>
				<VoltageLevel>
					<Voltage>100</Voltage>
					<MaxTorqueCurve>
						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
					</MaxTorqueCurve>
				</VoltageLevel>
				<VoltageLevel>
					<Voltage>500</Voltage>
					<MaxTorqueCurve>
						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
					</MaxTorqueCurve>
				</VoltageLevel>
			</ElectricMachine>
		</ElectricMotorTorqueLimits>
		<BoostingLimitations xsi:type="BoostingLimitationsType">
			<!-- optional -->
			<Entry rotationalSpeed="0.00" boostingTorque="0.00"/>
			<Entry rotationalSpeed="1000.00" boostingTorque="0.00"/>
		</BoostingLimitations>
		<Components xsi:type="Components_HEV-Px_PrimaryBusType">
			<Engine>
				<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
					<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>
					<IdlingSpeed>560</IdlingSpeed>
					<RatedSpeed>2200</RatedSpeed>
					<RatedPower>380000</RatedPower>
					<MaxEngineTorque>2300</MaxEngineTorque>
					<WHTCUrban>1.0097</WHTCUrban>
					<WHTCRural>1.0035</WHTCRural>
					<WHTCMotorway>1.0200</WHTCMotorway>
					<BFColdHot>1.0000</BFColdHot>
					<CFRegPer>1.0000</CFRegPer>
					<CFNCV>1.0000</CFNCV>
					<FuelType>NG</FuelType>
					<FuelConsumptionMap>
						<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
						<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
						<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
						<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
					</FuelConsumptionMap>
					<FullLoadAndDragCurve>
						<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
						<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
						<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
					</FullLoadAndDragCurve>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference>
						<di:DigestMethod Algorithm=""/>
						<di:DigestValue/>
					</di:Reference>
				</v2.0:Signature>
			</Engine>
			<ElectricMachine>
				<PowertrainPosition>2</PowertrainPosition>
				<Count>1</Count>
				<ElectricMachineSystem>
					<v2.3:Data xsi:type="v2.3:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
						<Manufacturer>a</Manufacturer>
						<Model>a</Model>
						<CertificationNumber>token</CertificationNumber>
						<Date>2017-01-01T00:00:00Z</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>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="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>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="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="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>
						<DragCurve>
							<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
							<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
						</DragCurve>
						<Conditioning>
							<Entry coolantTempInlet="30" coolingPower="5000"/>
						</Conditioning>
					</v2.3:Data>
					<v2.3:Signature>
						<di:Reference>
							<di:DigestMethod Algorithm=""/>
							<di:DigestValue/>
						</di:Reference>
					</v2.3:Signature>
				</ElectricMachineSystem>
				<P2.5GearRatios>
					<!-- only for P2.5 HEV -->
					<Ratio gear="1">1.000</Ratio>
					<Ratio gear="2">2.000</Ratio>
				</P2.5GearRatios>
			</ElectricMachine>
			<ElectricEnergyStorage>
				<Battery>
					<StringID>0</StringID>
					<REESS>
						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
							<Manufacturer>a</Manufacturer>
							<Model>a</Model>
							<CertificationNumber>token</CertificationNumber>
							<Date>2017-01-01T00:00:00Z</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="0" OCV="620.00"/>
								<Entry SoC="100" OCV="640.00"/>
							</OCV>
							<InternalResistance>
								<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"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.4:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm=""/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
					<SOCmin>20</SOCmin>
					<SOCmax>80</SOCmax>
				</Battery>
				<Battery>
					<StringID>1</StringID>
					<REESS>
						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
							<Manufacturer>a</Manufacturer>
							<Model>a</Model>
							<CertificationNumber>token</CertificationNumber>
							<Date>2017-01-01T00:00:00Z</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="0" OCV="620.00"/>
								<Entry SoC="100" OCV="640.00"/>
							</OCV>
							<InternalResistance>
								<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"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.4:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm=""/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
				</Battery>
			</ElectricEnergyStorage>
			<Gearbox>
				<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck Gearbox</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<TransmissionType>AMT</TransmissionType>
					<MainCertificationMethod>Standard values</MainCertificationMethod>
					<Gears xsi:type="GearsDeclarationType">
						<Gear number="1">
							<Ratio>14.930</Ratio>
							<MaxTorque>1900</MaxTorque>
							<MaxSpeed>2000</MaxSpeed>
							<TorqueLossMap>
								<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
								<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
								<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
								<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
								<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
								<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
							</TorqueLossMap>
						</Gear>
						<Gear number="2">
							<Ratio>11.640</Ratio>
							<MaxTorque>1900</MaxTorque>
							<MaxSpeed>2000</MaxSpeed>
							<TorqueLossMap>
								<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
								<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
								<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
								<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
								<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
								<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
							</TorqueLossMap>
						</Gear>
					</Gears>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#gbx-vi2Oak2N">
						<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>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Gearbox>
			<TorqueConverter>
				<!-- optional -->
				<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
					<Manufacturer>Some Manufacturer</Manufacturer>
					<Model>Some Model</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-02-15T11:00:00Z</Date>
					<AppVersion>TC CalcApp 123</AppVersion>
					<CertificationMethod>Standard values</CertificationMethod>
					<Characteristics>
						<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
						<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
						<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
					</Characteristics>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference>
						<di:DigestMethod Algorithm=""/>
						<di:DigestValue/>
					</di:Reference>
				</v2.0:Signature>
			</TorqueConverter>
			<Angledrive>
				<!-- optional -->
				<v2.0:Data id="agl-vi2Oak2N" xsi:type="v2.0:AngledriveDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck Gearbox</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<Ratio>2.345</Ratio>
					<CertificationMethod>Standard values</CertificationMethod>
					<TorqueLossMap>
						<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
						<Entry inputSpeed="1000.00" inputTorque="-1000.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="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
						<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
					</TorqueLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#agl-vi2Oak2N">
						<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>1tuF9SoA8luoUBQGym4bYi1TurDSmcYqBDJ6AP20OSs=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Angledrive>
			<Retarder>
				<!-- optional -->
				<v2.0:Data id="RET-Shai9imi" xsi:type="v2.0:RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Retarder Manufacturer</Manufacturer>
					<Model>Generic Retarder</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<CertificationMethod>Standard values</CertificationMethod>
					<RetarderLossMap>
						<Entry retarderSpeed="0.00" torqueLoss="10.00"/>
						<Entry retarderSpeed="2300.00" torqueLoss="20.58"/>
					</RetarderLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#RET-Shai9imi">
						<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>fcEtYfDAbfuRq0xpuzapmEj+Py1PIPUZwVmx+amNvcc=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Retarder>
			<Axlegear>
				<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck AxleGear</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<LineType>Single portal axle</LineType>
					<Ratio>2.590</Ratio>
					<CertificationMethod>Standard values</CertificationMethod>
					<TorqueLossMap>
						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
						<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
					</TorqueLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#AXL-EC3ohnoh">
						<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>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Axlegear>
			<AxleWheels>
				<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Axles>
						<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleNonDriven</AxleType>
							<TwinTyres>false</TwinTyres>
							<Steered>true</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0055</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
						<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleDriven</AxleType>
							<TwinTyres>true</TwinTyres>
							<Steered>false</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0063</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
					</Axles>
				</v2.0:Data>
			</AxleWheels>
			<Auxiliaries>
				<Data xsi:type="AUX_HEV-P_PrimaryBusType">
					<Fan>
						<Technology>Hydraulic driven - Constant displacement pump</Technology>
					</Fan>
					<SteeringPump>
						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
					</SteeringPump>
					<ElectricSystem>
						<AlternatorTechnology>conventional</AlternatorTechnology>
						<SmartAlternator>
							<!-- optional -->
							<RatedCurrent>100</RatedCurrent>
							<RatedVoltage>48</RatedVoltage>
						</SmartAlternator>
						<SmartAlternator>
							<!-- optional -->
							<RatedCurrent>50</RatedCurrent>
							<RatedVoltage>48</RatedVoltage>
						</SmartAlternator>
						<Battery>
							<!-- optional -->
							<BatteryTechnology>li-ion battery - high power</BatteryTechnology>
							<RatedCapacity>50</RatedCapacity>
							<NominalVoltage>48</NominalVoltage>
						</Battery>
						<Capacitor>
							<!-- optional -->
							<CapacitorTechnology>with DCDC converter</CapacitorTechnology>
							<RatedCapacitance>120</RatedCapacitance>
							<RatedVoltage>30</RatedVoltage>
						</Capacitor>
						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
					</ElectricSystem>
					<PneumaticSystem>
						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
						<CompressorDrive>mechanically</CompressorDrive>
						<Clutch>none</Clutch>
						<CompressorRatio>1.000</CompressorRatio>
						<SmartCompressionSystem>true</SmartCompressionSystem>
						<SmartRegenerationSystem>false</SmartRegenerationSystem>
						<AirsuspensionControl>electronically</AirsuspensionControl>
						<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
					</PneumaticSystem>
					<HVAC>
						<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
						<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/IEPC_primaryBus.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/IEPC_primaryBus.xml
index d92d589bbe..16f7124d04 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/IEPC_primaryBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/IEPC_primaryBus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_IEPC_PrimaryBusDeclarationType" id="a">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -22,7 +22,7 @@
 		</ADAS>
 		<Components xsi:type="Components_IEPC_PrimaryBusType">
 			<IEPC>
-				<v2.10.1:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+				<v2.3:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
 					<Manufacturer>a</Manufacturer>
 					<Model>a</Model>
 					<CertificationNumber>token</CertificationNumber>
@@ -34,7 +34,7 @@
 					<RotationalInertia>0.10</RotationalInertia>
 					<DifferentialIncluded>false</DifferentialIncluded>
 					<DesignTypeWheelMotor>true</DesignTypeWheelMotor>
-					<Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+					<Gears xsi:type="v2.3:IEPCGearsDeclarationType">
 						<Gear number="1">
 							<Ratio>3.000</Ratio>
 						</Gear>
@@ -102,19 +102,19 @@
 					<Conditioning>
 						<Entry coolantTempInlet="30" coolingPower="5000"/>
 					</Conditioning>
-				</v2.10.1:Data>
-				<v2.10.1:Signature>
+				</v2.3:Data>
+				<v2.3:Signature>
 					<di:Reference>
 						<di:DigestMethod Algorithm=""/>
 						<di:DigestValue/>
 					</di:Reference>
-				</v2.10.1:Signature>
+				</v2.3:Signature>
 			</IEPC>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -138,7 +138,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -152,7 +152,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -176,7 +176,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/PEV_primaryBus_AMT_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/PEV_primaryBus_AMT_E2.xml
index 1e13fab780..ced1ee06cb 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/PEV_primaryBus_AMT_E2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/PEV_primaryBus_AMT_E2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_PEV_PrimaryBusDeclarationType" id="a">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -31,15 +31,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -49,7 +49,7 @@
 				<PowertrainPosition>2</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -104,13 +104,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -122,7 +122,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -146,7 +146,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -160,7 +160,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -184,7 +184,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/PEV_primaryBus_E3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/PEV_primaryBus_E3.xml
index 313cf0e686..da8fbe99fe 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/PEV_primaryBus_E3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/PEV_primaryBus_E3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_PEV_PrimaryBusDeclarationType" id="a">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -29,15 +29,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -47,7 +47,7 @@
 				<PowertrainPosition>3</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -102,13 +102,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios><!-- only for P2.5 HEV -->
 					<Ratio gear="1">1.000</Ratio>
@@ -119,7 +119,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1"  xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"  xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -143,7 +143,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -157,7 +157,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1"  xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"  xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -181,7 +181,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/PEV_primaryBus_E4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/PEV_primaryBus_E4.xml
index 1ef33c360d..f3aae791aa 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/PEV_primaryBus_E4.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/PrimaryBus/PEV_primaryBus_E4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_PEV_PrimaryBusDeclarationType" id="a">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -31,15 +31,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -49,7 +49,7 @@
 				<PowertrainPosition>4</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -104,13 +104,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -122,7 +122,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -146,7 +146,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -160,7 +160,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -184,7 +184,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_heavyLorry_AMT_S2_ADC.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_heavyLorry_AMT_S2_ADC.xml
index 1368149067..52f8ab9efe 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_heavyLorry_AMT_S2_ADC.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV-S_heavyLorry_AMT_S2_ADC.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_HeavyLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -27,8 +27,8 @@
 		<ArchitectureID>S2</ArchitectureID>
 		<OvcHev>false</OvcHev>
 		<ADAS xsi:type="ADAS_HEV_Type">
-			<v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
-			<v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2:PredictiveCruiseControl>
+			<EngineStopStart>true</EngineStopStart>
+			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
 		</ADAS>
 		<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
 			<!-- optional -->
@@ -41,15 +41,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -61,15 +61,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -117,7 +117,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -172,17 +172,17 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<ADC>
 					<!-- optional -->
-					<v2.10.1:Data xsi:type="v2.10.1:ADCDataDeclarationType" id="adc" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ADCDataDeclarationType" id="adc" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>ADC Manufacturer</Manufacturer>
 						<Model>ADC Model</Model>
 						<CertificationNumber>adcadc</CertificationNumber>
@@ -196,20 +196,20 @@
 							<Entry inputSpeed="12.00" inputTorque="41.00" torqueLoss="32.00"/>
 							<Entry inputSpeed="13.00" inputTorque="42.00" torqueLoss="33.00"/>
 						</TorqueLossMap>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ADC>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -233,7 +233,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -247,7 +247,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -271,7 +271,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -285,7 +285,7 @@
 				<PowertrainPosition>2</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -340,17 +340,17 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<ADC>
 					<!-- optional -->
-					<v2.10.1:Data xsi:type="v2.10.1:ADCDataDeclarationType" id="ad" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ADCDataDeclarationType" id="ad" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>ADC Manufacturer</Manufacturer>
 						<Model>ADC Model</Model>
 						<CertificationNumber>adcadc</CertificationNumber>
@@ -364,13 +364,13 @@
 							<Entry inputSpeed="12.00" inputTorque="41.00" torqueLoss="32.00"/>
 							<Entry inputSpeed="13.00" inputTorque="42.00" torqueLoss="33.00"/>
 						</TorqueLossMap>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ADC>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -595,7 +595,7 @@
 				</v2.0:Data>
 			</AxleWheels>
 			<Auxiliaries>
-				<v2.10.2:Data xsi:type="AUX_HEV-S_LorryDataType">
+				<Data xsi:type="AUX_HEV-S_LorryDataType">
 					<Fan>
 						<Technology>Hydraulic driven - Constant displacement pump</Technology>
 					</Fan>
@@ -611,7 +611,7 @@
 					<HVAC>
 						<Technology>Default</Technology>
 					</HVAC>
-				</v2.10.2:Data>
+				</v2.4:Data>
 			</Auxiliaries>
 			<AirDrag>
 				<!-- optional -->
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV_heavyLorry_AMT_Px_Capacitor.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV_heavyLorry_AMT_Px_Capacitor.xml
index 83e1ee30b1..317875ab41 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV_heavyLorry_AMT_Px_Capacitor.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/HEV_heavyLorry_AMT_Px_Capacitor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -27,8 +27,8 @@
 		<ArchitectureID>P2</ArchitectureID>
 		<OvcHev>false</OvcHev>
 		<ADAS xsi:type="ADAS_HEV_Type">
-			<v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
-			<v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2:PredictiveCruiseControl>
+			<EngineStopStart>true</EngineStopStart>
+			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
 		</ADAS>
 		<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
 			<!-- optional -->
@@ -41,15 +41,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -102,7 +102,7 @@
 				<PowertrainPosition>2</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -157,13 +157,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -173,7 +173,7 @@
 			</ElectricMachine>
 			<ElectricEnergyStorage>
 				<Capacitor>
-					<v2.10.2:Data id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="CapacitorSystemDataType">
+					<v2.4:Data id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="CapacitorSystemDataType">
 						<Manufacturer>Capacitor Manufacturer</Manufacturer>
 						<Model>Capacitor Model</Model>
 						<CertificationNumber>ccccccc</CertificationNumber>
@@ -186,7 +186,7 @@
 						<MaxVoltage>100.00</MaxVoltage>
 						<MaxChargingCurrent>80.00</MaxChargingCurrent>
 						<MaxDischargingCurrent>20.00</MaxDischargingCurrent>
-					</v2.10.2:Data>
+					</v2.4:Data>
 					<Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm="123"/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/Conventional_heavyLorry_AMT_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/Conventional_heavyLorry_AMT_n_opt.xml
index 7d33e5344b..ea3dda3e1c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/Conventional_heavyLorry_AMT_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/Conventional_heavyLorry_AMT_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/Conventional_mediumLorry_AMT_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/Conventional_mediumLorry_AMT_n_opt.xml
index 9f677193a8..fd240eddf7 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/Conventional_mediumLorry_AMT_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/Conventional_mediumLorry_AMT_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_Conventional_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/Conventional_primaryBus_AMT_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/Conventional_primaryBus_AMT_n_opt.xml
index e39e8920c4..55e4213577 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/Conventional_primaryBus_AMT_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/Conventional_primaryBus_AMT_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 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" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 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" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_heavyLorry_AMT_S2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_heavyLorry_AMT_S2_n_opt.xml
index 27649917ff..615c385e6c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_heavyLorry_AMT_S2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_heavyLorry_AMT_S2_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_HeavyLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -27,8 +27,8 @@
 		<OvcHev>true</OvcHev>
 		<MaxChargingPower>11</MaxChargingPower>
 		<ADAS xsi:type="ADAS_HEV_Type">
-			<v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
-			<v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2:PredictiveCruiseControl>
+			<EngineStopStart>true</EngineStopStart>
+			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
 		</ADAS>
 		<Components xsi:type="Components_HEV-S2_LorryType">
 			<Engine>
@@ -73,7 +73,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -128,20 +128,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -165,7 +165,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -179,7 +179,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -203,7 +203,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -217,7 +217,7 @@
 				<PowertrainPosition>2</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -272,13 +272,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -448,7 +448,7 @@
 				</v2.0:Data>
 			</AxleWheels>
 			<Auxiliaries>
-				<v2.10.2:Data xsi:type="AUX_HEV-S_LorryDataType">
+				<Data xsi:type="AUX_HEV-S_LorryDataType">
 					<Fan>
 						<Technology>Hydraulic driven - Constant displacement pump</Technology>
 					</Fan>
@@ -464,7 +464,7 @@
 					<HVAC>
 						<Technology>Default</Technology>
 					</HVAC>
-				</v2.10.2:Data>
+				</Data>
 			</Auxiliaries>
 		</Components>
 	</v2.0:Vehicle>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_heavyLorry_IEPC-S_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_heavyLorry_IEPC-S_n_opt.xml
index bffa8d070e..3f40409ced 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_heavyLorry_IEPC-S_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_heavyLorry_IEPC-S_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-IEPC-S_HeavyLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -27,8 +27,8 @@
 		<OvcHev>true</OvcHev>
 		<MaxChargingPower>11</MaxChargingPower>
 		<ADAS xsi:type="ADAS_HEV_Type">
-			<v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
-			<v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2:PredictiveCruiseControl>
+			<EngineStopStart>true</EngineStopStart>
+			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
 		</ADAS>
 		<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
 			<!-- optional -->
@@ -41,15 +41,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -97,7 +97,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -152,20 +152,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -189,7 +189,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -203,7 +203,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -227,7 +227,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -238,7 +238,7 @@
 				</Battery>
 			</ElectricEnergyStorage>
 			<IEPC>
-				<v2.10.1:Data xsi:type="IEPCMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+				<v2.3:Data xsi:type="IEPCMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 					<Manufacturer>a</Manufacturer>
 					<Model>a</Model>
 					<CertificationNumber>token</CertificationNumber>
@@ -250,7 +250,7 @@
 					<RotationalInertia>0.10</RotationalInertia>
 					<DifferentialIncluded>false</DifferentialIncluded>
 					<DesignTypeWheelMotor>false</DesignTypeWheelMotor>
-					<Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+					<Gears xsi:type="v2.3:IEPCGearsDeclarationType">
 						<Gear number="1">
 							<Ratio>3.000</Ratio>
 						</Gear>
@@ -318,13 +318,13 @@
 					<Conditioning>
 						<Entry coolantTempInlet="30" coolingPower="5000"/>
 					</Conditioning>
-				</v2.10.1:Data>
-				<v2.10.1:Signature>
+				</v2.3:Data>
+				<v2.3:Signature>
 					<di:Reference>
 						<di:DigestMethod Algorithm=""/>
 						<di:DigestValue/>
 					</di:Reference>
-				</v2.10.1:Signature>
+				</v2.3:Signature>
 			</IEPC>
 			<AxleWheels>
 				<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_heavyLorry_S3_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_heavyLorry_S3_n_opt.xml
index d4a3c5dfab..772b4948e4 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_heavyLorry_S3_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_heavyLorry_S3_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_HeavyLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -77,7 +77,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -132,20 +132,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -169,7 +169,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -183,7 +183,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -207,7 +207,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -221,7 +221,7 @@
 				<PowertrainPosition>3</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -276,13 +276,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_heavyLorry_S4_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_heavyLorry_S4_n_opt.xml
index be0660e445..e88c3b4882 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_heavyLorry_S4_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_heavyLorry_S4_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_HeavyLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -27,8 +27,8 @@
 		<OvcHev>true</OvcHev>
 		<MaxChargingPower>11</MaxChargingPower>
 		<ADAS xsi:type="ADAS_HEV_Type">
-			<v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
-			<v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2:PredictiveCruiseControl>
+			<EngineStopStart>true</EngineStopStart>
+			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
 		</ADAS>
 		<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
 			<!-- optional -->
@@ -77,7 +77,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -132,20 +132,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -169,7 +169,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -183,7 +183,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -207,7 +207,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -221,7 +221,7 @@
 				<PowertrainPosition>4</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -276,13 +276,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_mediumLorry_AMT_S2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_mediumLorry_AMT_S2_n_opt.xml
index bce538395e..84849e9279 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_mediumLorry_AMT_S2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_mediumLorry_AMT_S2_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -67,7 +67,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -122,20 +122,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -159,7 +159,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -173,7 +173,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -197,7 +197,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -211,7 +211,7 @@
 				<PowertrainPosition>2</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -266,13 +266,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_mediumLorry_IEPC-S_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_mediumLorry_IEPC-S_n_opt.xml
index 55d2bd2196..570e13303b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_mediumLorry_IEPC-S_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_mediumLorry_IEPC-S_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-IEPC-S_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -28,22 +28,22 @@
 			<!-- optional -->
 			<v2.0:Entry gear="9" maxTorque="2000"/>
 		</TorqueLimits>
-		<ElectricMotorTorqueLimits xsi:type="v2.10.2:ElectricMachineTorqueLimitsType">
+		<ElectricMotorTorqueLimits xsi:type="v2.4:ElectricMachineTorqueLimitsType">
 			<!-- optional -->
 			<ElectricMachine>
 				<Position>GEN</Position>
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -91,7 +91,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -146,20 +146,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -183,7 +183,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -197,7 +197,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -221,7 +221,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -232,7 +232,7 @@
 				</Battery>
 			</ElectricEnergyStorage>
 			<IEPC>
-				<v2.10.1:Data xsi:type="IEPCMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+				<v2.3:Data xsi:type="IEPCMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 					<Manufacturer>a</Manufacturer>
 					<Model>a</Model>
 					<CertificationNumber>token</CertificationNumber>
@@ -244,7 +244,7 @@
 					<RotationalInertia>0.10</RotationalInertia>
 					<DifferentialIncluded>false</DifferentialIncluded>
 					<DesignTypeWheelMotor>false</DesignTypeWheelMotor>
-					<Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+					<Gears xsi:type="v2.3:IEPCGearsDeclarationType">
 						<Gear number="1">
 							<Ratio>3.000</Ratio>
 						</Gear>
@@ -312,13 +312,13 @@
 					<Conditioning>
 						<Entry coolantTempInlet="30" coolingPower="5000"/>
 					</Conditioning>
-				</v2.10.1:Data>
-				<v2.10.1:Signature>
+				</v2.3:Data>
+				<v2.3:Signature>
 					<di:Reference>
 						<di:DigestMethod Algorithm=""/>
 						<di:DigestValue/>
 					</di:Reference>
-				</v2.10.1:Signature>
+				</v2.3:Signature>
 			</IEPC>
 			<AxleWheels>
 				<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_mediumLorry_S3_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_mediumLorry_S3_n_opt.xml
index 877945136c..0a7780ff5d 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_mediumLorry_S3_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_mediumLorry_S3_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -20,7 +20,7 @@
 		<ArchitectureID>S3</ArchitectureID>
 		<OvcHev>true</OvcHev>
 		<MaxChargingPower>11</MaxChargingPower>
-		<ADAS xsi:type="v2.10.2:ADAS_HEV_Type">
+		<ADAS xsi:type="v2.4:ADAS_HEV_Type">
 			<EngineStopStart>true</EngineStopStart>
 			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
 		</ADAS>
@@ -71,7 +71,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -126,20 +126,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -163,7 +163,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -177,7 +177,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -201,7 +201,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -215,7 +215,7 @@
 				<PowertrainPosition>3</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -270,13 +270,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_mediumLorry_S4_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_mediumLorry_S4_n_opt.xml
index ad658bb7de..ff25df7438 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_mediumLorry_S4_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_mediumLorry_S4_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -71,7 +71,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -126,20 +126,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -163,7 +163,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -177,7 +177,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -201,7 +201,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -215,7 +215,7 @@
 				<PowertrainPosition>4</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -270,13 +270,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_primaryBus_AMT_S2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_primaryBus_AMT_S2_n_opt.xml
index b64d408b73..97b4f3895b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_primaryBus_AMT_S2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_primaryBus_AMT_S2_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 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" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 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" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_HEV-Sx_PrimaryBusDeclarationType">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -70,7 +70,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -125,20 +125,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -162,7 +162,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -176,7 +176,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -200,7 +200,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -214,7 +214,7 @@
 				<PowertrainPosition>2</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -269,13 +269,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_primaryBus_IEPC-S_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_primaryBus_IEPC-S_n_opt.xml
index 4d30cc4aa4..907654955e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_primaryBus_IEPC-S_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_primaryBus_IEPC-S_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-IEPC-S_PrimaryBusDeclarationType" id="a">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -34,15 +34,15 @@
 				<VoltageLevel>
 					<Voltage>100</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 				<VoltageLevel>
 					<Voltage>500</Voltage>
 					<MaxTorqueCurve>
-						<v2.10.1:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
-						<v2.10.1:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
+						<v2.3:Entry outShaftSpeed="0.00" maxTorque="200.00" minTorque="-200.00"/>
+						<v2.3:Entry outShaftSpeed="1000.00" maxTorque="300.00" minTorque="-300.00"/>
 					</MaxTorqueCurve>
 				</VoltageLevel>
 			</ElectricMachine>
@@ -90,7 +90,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -145,20 +145,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -182,7 +182,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -196,7 +196,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -220,7 +220,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -231,7 +231,7 @@
 				</Battery>
 			</ElectricEnergyStorage>
 			<IEPC>
-				<v2.10.1:Data xsi:type="IEPCMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+				<v2.3:Data xsi:type="IEPCMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 					<Manufacturer>a</Manufacturer>
 					<Model>a</Model>
 					<CertificationNumber>token</CertificationNumber>
@@ -243,7 +243,7 @@
 					<RotationalInertia>0.10</RotationalInertia>
 					<DifferentialIncluded>false</DifferentialIncluded>
 					<DesignTypeWheelMotor>false</DesignTypeWheelMotor>
-					<Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+					<Gears xsi:type="v2.3:IEPCGearsDeclarationType">
 						<Gear number="1">
 							<Ratio>3.000</Ratio>
 						</Gear>
@@ -311,13 +311,13 @@
 					<Conditioning>
 						<Entry coolantTempInlet="30" coolingPower="5000"/>
 					</Conditioning>
-				</v2.10.1:Data>
-				<v2.10.1:Signature>
+				</v2.3:Data>
+				<v2.3:Signature>
 					<di:Reference>
 						<di:DigestMethod Algorithm=""/>
 						<di:DigestValue/>
 					</di:Reference>
-				</v2.10.1:Signature>
+				</v2.3:Signature>
 			</IEPC>
 			<AxleWheels>
 				<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_primaryBus_S3_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_primaryBus_S3_n_opt.xml
index ff2630b37b..93e19524be 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_primaryBus_S3_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_primaryBus_S3_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_PrimaryBusDeclarationType" id="a">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -19,7 +19,7 @@
 		<ArchitectureID>S3</ArchitectureID>
 		<OvcHev>true</OvcHev>
 		<MaxChargingPower>11</MaxChargingPower>
-		<ADAS xsi:type="v2.10.2:ADAS_HEV_Type">
+		<ADAS xsi:type="v2.4:ADAS_HEV_Type">
 			<EngineStopStart>true</EngineStopStart>
 			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
 		</ADAS>
@@ -70,7 +70,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -125,20 +125,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -162,7 +162,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -176,7 +176,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -200,7 +200,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -214,7 +214,7 @@
 				<PowertrainPosition>3</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -269,13 +269,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_primaryBus_S4_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_primaryBus_S4_n_opt.xml
index 2b27c508ac..81bc840493 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_primaryBus_S4_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV-S_primaryBus_S4_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-Sx_PrimaryBusDeclarationType" id="a">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -70,7 +70,7 @@
 				<PowertrainPosition>GEN</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -125,20 +125,20 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 			</ElectricMachineGEN>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -162,7 +162,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -176,7 +176,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -200,7 +200,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -214,7 +214,7 @@
 				<PowertrainPosition>4</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -269,13 +269,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV_heavyLorry_AMT_Px_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV_heavyLorry_AMT_Px_n_opt.xml
index 41ab3fbc6f..733c8d8ca8 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV_heavyLorry_AMT_Px_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV_heavyLorry_AMT_Px_n_opt.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
	<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
		<Manufacturer>TU Graz</Manufacturer>
		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
		<Model>HEV Heavy Lorry Px</Model>
		<VIN>1234</VIN>
		<Date>2017-01-01T00:00:00Z</Date>
		<LegislativeCategory>N3</LegislativeCategory>
		<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
		<AxleConfiguration>4x2</AxleConfiguration>
		<CorrectedActualMass>6000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
		<IdlingSpeed>650</IdlingSpeed>
		<RetarderType>Losses included in Gearbox</RetarderType>
		<RetarderRatio>2.000</RetarderRatio>
		<AngledriveType>Separate Angledrive</AngledriveType>
		<PTO xsi:type="PTOType">
			<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
			<PTOOtherElements>none</PTOOtherElements>
		</PTO>
		<ZeroEmissionVehicle>true</ZeroEmissionVehicle>
		<VocationalVehicle>true</VocationalVehicle>
		<SleeperCab>true</SleeperCab>
		<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
		<ArchitectureID>P2.5</ArchitectureID>
		<OvcHev>true</OvcHev>
		<MaxChargingPower>11</MaxChargingPower>
		<ADAS xsi:type="ADAS_HEV_Type">
			<v2.10.2:EngineStopStart>true</v2.10.2:EngineStopStart>
			<v2.10.2:PredictiveCruiseControl>1,2,3</v2.10.2:PredictiveCruiseControl>
		</ADAS>
		<Components xsi:type="Components_HEV-Px_LorryType">
			<Engine>
				<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
					<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>
					<IdlingSpeed>560</IdlingSpeed>
					<RatedSpeed>2200</RatedSpeed>
					<RatedPower>380000</RatedPower>
					<MaxEngineTorque>2300</MaxEngineTorque>
					<WHTCUrban>1.0097</WHTCUrban>
					<WHTCRural>1.0035</WHTCRural>
					<WHTCMotorway>1.0200</WHTCMotorway>
					<BFColdHot>1.0000</BFColdHot>
					<CFRegPer>1.0000</CFRegPer>
					<CFNCV>1.0000</CFNCV>
					<FuelType>NG</FuelType>
					<FuelConsumptionMap>
						<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
						<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
						<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
						<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
					</FuelConsumptionMap>
					<FullLoadAndDragCurve>
						<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
						<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
						<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
					</FullLoadAndDragCurve>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference>
						<di:DigestMethod Algorithm=""/>
						<di:DigestValue/>
					</di:Reference>
				</v2.0:Signature>
			</Engine>
			<ElectricMachine>
				<PowertrainPosition>2</PowertrainPosition>
				<Count>1</Count>
				<ElectricMachineSystem>
					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
						<Manufacturer>a</Manufacturer>
						<Model>a</Model>
						<CertificationNumber>token</CertificationNumber>
						<Date>2017-01-01T00:00:00Z</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>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="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>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="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="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>
						<DragCurve>
							<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
							<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
						</DragCurve>
					</v2.10.1:Data>
					<v2.10.1:Signature>
						<di:Reference>
							<di:DigestMethod Algorithm=""/>
							<di:DigestValue/>
						</di:Reference>
					</v2.10.1:Signature>
				</ElectricMachineSystem>
				<P2.5GearRatios>
					<!-- only for P2.5 HEV -->
					<Ratio gear="1">1.000</Ratio>
					<Ratio gear="2">2.000</Ratio>
				</P2.5GearRatios>
			</ElectricMachine>
			<ElectricEnergyStorage>
				<Battery>
					<StringID>0</StringID>
					<REESS>
						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
							<Manufacturer>a</Manufacturer>
							<Model>a</Model>
							<CertificationNumber>tokena</CertificationNumber>
							<Date>2017-01-01T00:00:00Z</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="0" OCV="620.00"/>
								<Entry SoC="100" OCV="640.00"/>
							</OCV>
							<InternalResistance>
								<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"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.10.2:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm="asf"/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
					<SOCmin>20</SOCmin>
					<SOCmax>80</SOCmax>
				</Battery>
				<Battery>
					<StringID>1</StringID>
					<REESS>
						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
							<Manufacturer>b</Manufacturer>
							<Model>b</Model>
							<CertificationNumber>tokenb</CertificationNumber>
							<Date>2017-02-02T00:00:00Z</Date>
							<AppVersion>bbbbb</AppVersion>
							<CertificationMethod>Measured</CertificationMethod>
							<BatteryType>HPBS</BatteryType>
							<RatedCapacity>73.00</RatedCapacity>
							<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
							<JunctionboxIncluded>true</JunctionboxIncluded>
							<TestingTemperature>20</TestingTemperature>
							<OCV>
								<Entry SoC="0" OCV="621.00"/>
								<Entry SoC="100" OCV="641.00"/>
							</OCV>
							<InternalResistance>
								<Entry SoC="0" R_2="11.00" R_10="12.00" R_20="13.00"/>
								<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="51.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.10.2:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm="bsf"/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
				</Battery>
			</ElectricEnergyStorage>
			<Gearbox>
				<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck Gearbox</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<TransmissionType>AMT</TransmissionType>
					<MainCertificationMethod>Standard values</MainCertificationMethod>
					<Gears xsi:type="GearsDeclarationType">
						<Gear number="1">
							<Ratio>14.930</Ratio>
							<MaxTorque>1900</MaxTorque>
							<MaxSpeed>2000</MaxSpeed>
							<TorqueLossMap>
								<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
								<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
								<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
								<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
								<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
								<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
							</TorqueLossMap>
						</Gear>
						<Gear number="2">
							<Ratio>11.640</Ratio>
							<MaxTorque>1900</MaxTorque>
							<MaxSpeed>2000</MaxSpeed>
							<TorqueLossMap>
								<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
								<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
								<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
								<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
								<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
								<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
							</TorqueLossMap>
						</Gear>
					</Gears>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#gbx-vi2Oak2N">
						<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>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Gearbox>
			<TorqueConverter>
				<!-- optional -->
				<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
					<Manufacturer>Some Manufacturer</Manufacturer>
					<Model>Some Model</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-02-15T11:00:00Z</Date>
					<AppVersion>TC CalcApp 123</AppVersion>
					<CertificationMethod>Standard values</CertificationMethod>
					<Characteristics>
						<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
						<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
						<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
					</Characteristics>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference>
						<di:DigestMethod Algorithm=""/>
						<di:DigestValue/>
					</di:Reference>
				</v2.0:Signature>
			</TorqueConverter>
			<Axlegear>
				<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck AxleGear</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<LineType>Single portal axle</LineType>
					<Ratio>2.590</Ratio>
					<CertificationMethod>Standard values</CertificationMethod>
					<TorqueLossMap>
						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
						<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
					</TorqueLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#AXL-EC3ohnoh">
						<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>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Axlegear>
			<AxleWheels>
				<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Axles>
						<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleNonDriven</AxleType>
							<TwinTyres>false</TwinTyres>
							<Steered>true</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0055</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
						<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleDriven</AxleType>
							<TwinTyres>true</TwinTyres>
							<Steered>false</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0063</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
					</Axles>
				</v2.0:Data>
			</AxleWheels>
			<Auxiliaries>
				<Data xsi:type="AUX_HEV-P_LorryDataType">
					<Fan>
						<Technology>Hydraulic driven - Constant displacement pump</Technology>
					</Fan>
					<SteeringPump>
						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
					</SteeringPump>
					<ElectricSystem>
						<Technology>Standard technology - LED headlights, all</Technology>
					</ElectricSystem>
					<PneumaticSystem>
						<Technology>Medium Supply 2-stage</Technology>
					</PneumaticSystem>
					<HVAC>
						<Technology>Default</Technology>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
	<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_HeavyLorryDeclarationType" id="a">
		<Manufacturer>TU Graz</Manufacturer>
		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
		<Model>HEV Heavy Lorry Px</Model>
		<VIN>1234</VIN>
		<Date>2017-01-01T00:00:00Z</Date>
		<LegislativeCategory>N3</LegislativeCategory>
		<ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
		<AxleConfiguration>4x2</AxleConfiguration>
		<CorrectedActualMass>6000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass>
		<IdlingSpeed>650</IdlingSpeed>
		<RetarderType>Losses included in Gearbox</RetarderType>
		<RetarderRatio>2.000</RetarderRatio>
		<AngledriveType>Separate Angledrive</AngledriveType>
		<PTO xsi:type="PTOType">
			<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
			<PTOOtherElements>none</PTOOtherElements>
		</PTO>
		<ZeroEmissionVehicle>true</ZeroEmissionVehicle>
		<VocationalVehicle>true</VocationalVehicle>
		<SleeperCab>true</SleeperCab>
		<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
		<ArchitectureID>P2.5</ArchitectureID>
		<OvcHev>true</OvcHev>
		<MaxChargingPower>11</MaxChargingPower>
		<ADAS xsi:type="ADAS_HEV_Type">
			<EngineStopStart>true</EngineStopStart>
			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
		</ADAS>
		<Components xsi:type="Components_HEV-Px_LorryType">
			<Engine>
				<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
					<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>
					<IdlingSpeed>560</IdlingSpeed>
					<RatedSpeed>2200</RatedSpeed>
					<RatedPower>380000</RatedPower>
					<MaxEngineTorque>2300</MaxEngineTorque>
					<WHTCUrban>1.0097</WHTCUrban>
					<WHTCRural>1.0035</WHTCRural>
					<WHTCMotorway>1.0200</WHTCMotorway>
					<BFColdHot>1.0000</BFColdHot>
					<CFRegPer>1.0000</CFRegPer>
					<CFNCV>1.0000</CFNCV>
					<FuelType>NG</FuelType>
					<FuelConsumptionMap>
						<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
						<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
						<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
						<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
					</FuelConsumptionMap>
					<FullLoadAndDragCurve>
						<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
						<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
						<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
					</FullLoadAndDragCurve>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference>
						<di:DigestMethod Algorithm=""/>
						<di:DigestValue/>
					</di:Reference>
				</v2.0:Signature>
			</Engine>
			<ElectricMachine>
				<PowertrainPosition>2</PowertrainPosition>
				<Count>1</Count>
				<ElectricMachineSystem>
					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
						<Manufacturer>a</Manufacturer>
						<Model>a</Model>
						<CertificationNumber>token</CertificationNumber>
						<Date>2017-01-01T00:00:00Z</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>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="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>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="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="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>
						<DragCurve>
							<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
							<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
						</DragCurve>
					</v2.3:Data>
					<v2.3:Signature>
						<di:Reference>
							<di:DigestMethod Algorithm=""/>
							<di:DigestValue/>
						</di:Reference>
					</v2.3:Signature>
				</ElectricMachineSystem>
				<P2.5GearRatios>
					<!-- only for P2.5 HEV -->
					<Ratio gear="1">1.000</Ratio>
					<Ratio gear="2">2.000</Ratio>
				</P2.5GearRatios>
			</ElectricMachine>
			<ElectricEnergyStorage>
				<Battery>
					<StringID>0</StringID>
					<REESS>
						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
							<Manufacturer>a</Manufacturer>
							<Model>a</Model>
							<CertificationNumber>tokena</CertificationNumber>
							<Date>2017-01-01T00:00:00Z</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="0" OCV="620.00"/>
								<Entry SoC="100" OCV="640.00"/>
							</OCV>
							<InternalResistance>
								<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"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.4:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm="asf"/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
					<SOCmin>20</SOCmin>
					<SOCmax>80</SOCmax>
				</Battery>
				<Battery>
					<StringID>1</StringID>
					<REESS>
						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
							<Manufacturer>b</Manufacturer>
							<Model>b</Model>
							<CertificationNumber>tokenb</CertificationNumber>
							<Date>2017-02-02T00:00:00Z</Date>
							<AppVersion>bbbbb</AppVersion>
							<CertificationMethod>Measured</CertificationMethod>
							<BatteryType>HPBS</BatteryType>
							<RatedCapacity>73.00</RatedCapacity>
							<ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
							<JunctionboxIncluded>true</JunctionboxIncluded>
							<TestingTemperature>20</TestingTemperature>
							<OCV>
								<Entry SoC="0" OCV="621.00"/>
								<Entry SoC="100" OCV="641.00"/>
							</OCV>
							<InternalResistance>
								<Entry SoC="0" R_2="11.00" R_10="12.00" R_20="13.00"/>
								<Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="51.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.4:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm="bsf"/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
				</Battery>
			</ElectricEnergyStorage>
			<Gearbox>
				<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck Gearbox</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<TransmissionType>AMT</TransmissionType>
					<MainCertificationMethod>Standard values</MainCertificationMethod>
					<Gears xsi:type="GearsDeclarationType">
						<Gear number="1">
							<Ratio>14.930</Ratio>
							<MaxTorque>1900</MaxTorque>
							<MaxSpeed>2000</MaxSpeed>
							<TorqueLossMap>
								<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
								<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
								<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
								<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
								<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
								<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
							</TorqueLossMap>
						</Gear>
						<Gear number="2">
							<Ratio>11.640</Ratio>
							<MaxTorque>1900</MaxTorque>
							<MaxSpeed>2000</MaxSpeed>
							<TorqueLossMap>
								<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
								<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
								<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
								<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
								<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
								<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
							</TorqueLossMap>
						</Gear>
					</Gears>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#gbx-vi2Oak2N">
						<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>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Gearbox>
			<TorqueConverter>
				<!-- optional -->
				<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
					<Manufacturer>Some Manufacturer</Manufacturer>
					<Model>Some Model</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-02-15T11:00:00Z</Date>
					<AppVersion>TC CalcApp 123</AppVersion>
					<CertificationMethod>Standard values</CertificationMethod>
					<Characteristics>
						<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
						<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
						<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
					</Characteristics>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference>
						<di:DigestMethod Algorithm=""/>
						<di:DigestValue/>
					</di:Reference>
				</v2.0:Signature>
			</TorqueConverter>
			<Axlegear>
				<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck AxleGear</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<LineType>Single portal axle</LineType>
					<Ratio>2.590</Ratio>
					<CertificationMethod>Standard values</CertificationMethod>
					<TorqueLossMap>
						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
						<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
					</TorqueLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#AXL-EC3ohnoh">
						<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>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Axlegear>
			<AxleWheels>
				<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Axles>
						<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleNonDriven</AxleType>
							<TwinTyres>false</TwinTyres>
							<Steered>true</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0055</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
						<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleDriven</AxleType>
							<TwinTyres>true</TwinTyres>
							<Steered>false</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0063</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
					</Axles>
				</v2.0:Data>
			</AxleWheels>
			<Auxiliaries>
				<Data xsi:type="AUX_HEV-P_LorryDataType">
					<Fan>
						<Technology>Hydraulic driven - Constant displacement pump</Technology>
					</Fan>
					<SteeringPump>
						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
					</SteeringPump>
					<ElectricSystem>
						<Technology>Standard technology - LED headlights, all</Technology>
					</ElectricSystem>
					<PneumaticSystem>
						<Technology>Medium Supply 2-stage</Technology>
					</PneumaticSystem>
					<HVAC>
						<Technology>Default</Technology>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV_mediumLorry_AMT_Px_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV_mediumLorry_AMT_Px_n_opt.xml
index 76670342de..68ba28d5eb 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV_mediumLorry_AMT_Px_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV_mediumLorry_AMT_Px_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -67,7 +67,7 @@
 				<PowertrainPosition>2</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -122,13 +122,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -140,7 +140,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -164,7 +164,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -180,7 +180,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -204,7 +204,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV_primaryBus_AMT_Px_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV_primaryBus_AMT_Px_n_opt.xml
index 0aff851da4..ced7dfb8fb 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV_primaryBus_AMT_Px_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV_primaryBus_AMT_Px_n_opt.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
	<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_PrimaryBusDeclarationType" id="a">
		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
		<Model>Generic Model</Model>
		<VIN>VEH-1234567890</VIN>
		<Date>2017-02-15T11:00:00Z</Date>
		<LegislativeCategory>M3</LegislativeCategory>
		<ChassisConfiguration>Bus</ChassisConfiguration>
		<AxleConfiguration>4x2</AxleConfiguration>
		<Articulated>true</Articulated>
		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
		<IdlingSpeed>600</IdlingSpeed>
		<RetarderType>Losses included in Gearbox</RetarderType>
		<RetarderRatio>2.000</RetarderRatio>
		<AngledriveType>Separate Angledrive</AngledriveType>
		<ZeroEmissionVehicle>true</ZeroEmissionVehicle>
		<ArchitectureID>P2</ArchitectureID>
		<OvcHev>true</OvcHev>
		<MaxChargingPower>11</MaxChargingPower>
		<ADAS xsi:type="ADAS_HEV_Type">
			<EngineStopStart>true</EngineStopStart>
			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
		</ADAS>
		<Components xsi:type="Components_HEV-Px_PrimaryBusType">
			<Engine>
				<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
					<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>
					<IdlingSpeed>560</IdlingSpeed>
					<RatedSpeed>2200</RatedSpeed>
					<RatedPower>380000</RatedPower>
					<MaxEngineTorque>2300</MaxEngineTorque>
					<WHTCUrban>1.0097</WHTCUrban>
					<WHTCRural>1.0035</WHTCRural>
					<WHTCMotorway>1.0200</WHTCMotorway>
					<BFColdHot>1.0000</BFColdHot>
					<CFRegPer>1.0000</CFRegPer>
					<CFNCV>1.0000</CFNCV>
					<FuelType>NG</FuelType>
					<FuelConsumptionMap>
						<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
						<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
						<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
						<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
					</FuelConsumptionMap>
					<FullLoadAndDragCurve>
						<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
						<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
						<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
					</FullLoadAndDragCurve>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference>
						<di:DigestMethod Algorithm=""/>
						<di:DigestValue/>
					</di:Reference>
				</v2.0:Signature>
			</Engine>
			<ElectricMachine>
				<PowertrainPosition>2</PowertrainPosition>
				<Count>1</Count>
				<ElectricMachineSystem>
					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
						<Manufacturer>a</Manufacturer>
						<Model>a</Model>
						<CertificationNumber>token</CertificationNumber>
						<Date>2017-01-01T00:00:00Z</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>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="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>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="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="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>
						<DragCurve>
							<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
							<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
						</DragCurve>
						<Conditioning>
							<Entry coolantTempInlet="30" coolingPower="5000"/>
						</Conditioning>
					</v2.10.1:Data>
					<v2.10.1:Signature>
						<di:Reference>
							<di:DigestMethod Algorithm=""/>
							<di:DigestValue/>
						</di:Reference>
					</v2.10.1:Signature>
				</ElectricMachineSystem>
				<P2.5GearRatios>
					<!-- only for P2.5 HEV -->
					<Ratio gear="1">1.000</Ratio>
					<Ratio gear="2">2.000</Ratio>
				</P2.5GearRatios>
			</ElectricMachine>
			<ElectricEnergyStorage>
				<Battery>
					<StringID>0</StringID>
					<REESS>
						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
							<Manufacturer>a</Manufacturer>
							<Model>a</Model>
							<CertificationNumber>token</CertificationNumber>
							<Date>2017-01-01T00:00:00Z</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="0" OCV="620.00"/>
								<Entry SoC="100" OCV="640.00"/>
							</OCV>
							<InternalResistance>
								<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"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.10.2:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm=""/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
					<SOCmin>20</SOCmin>
					<SOCmax>80</SOCmax>
				</Battery>
				<Battery>
					<StringID>1</StringID>
					<REESS>
						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
							<Manufacturer>a</Manufacturer>
							<Model>a</Model>
							<CertificationNumber>token</CertificationNumber>
							<Date>2017-01-01T00:00:00Z</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="0" OCV="620.00"/>
								<Entry SoC="100" OCV="640.00"/>
							</OCV>
							<InternalResistance>
								<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"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.10.2:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm=""/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
				</Battery>
			</ElectricEnergyStorage>
			<Gearbox>
				<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck Gearbox</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<TransmissionType>AMT</TransmissionType>
					<MainCertificationMethod>Standard values</MainCertificationMethod>
					<Gears xsi:type="GearsDeclarationType">
						<Gear number="1">
							<Ratio>14.930</Ratio>
							<MaxTorque>1900</MaxTorque>
							<MaxSpeed>2000</MaxSpeed>
							<TorqueLossMap>
								<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
								<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
								<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
								<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
								<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
								<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
							</TorqueLossMap>
						</Gear>
						<Gear number="2">
							<Ratio>11.640</Ratio>
							<MaxTorque>1900</MaxTorque>
							<MaxSpeed>2000</MaxSpeed>
							<TorqueLossMap>
								<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
								<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
								<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
								<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
								<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
								<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
							</TorqueLossMap>
						</Gear>
					</Gears>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#gbx-vi2Oak2N">
						<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>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Gearbox>
			<TorqueConverter>
				<!-- optional -->
				<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
					<Manufacturer>Some Manufacturer</Manufacturer>
					<Model>Some Model</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-02-15T11:00:00Z</Date>
					<AppVersion>TC CalcApp 123</AppVersion>
					<CertificationMethod>Standard values</CertificationMethod>
					<Characteristics>
						<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
						<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
						<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
					</Characteristics>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference>
						<di:DigestMethod Algorithm=""/>
						<di:DigestValue/>
					</di:Reference>
				</v2.0:Signature>
			</TorqueConverter>
			<Axlegear>
				<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck AxleGear</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<LineType>Single portal axle</LineType>
					<Ratio>2.590</Ratio>
					<CertificationMethod>Standard values</CertificationMethod>
					<TorqueLossMap>
						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
						<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
					</TorqueLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#AXL-EC3ohnoh">
						<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>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Axlegear>
			<AxleWheels>
				<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Axles>
						<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleNonDriven</AxleType>
							<TwinTyres>false</TwinTyres>
							<Steered>true</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0055</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
						<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleDriven</AxleType>
							<TwinTyres>true</TwinTyres>
							<Steered>false</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0063</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
					</Axles>
				</v2.0:Data>
			</AxleWheels>
			<Auxiliaries>
				<Data xsi:type="AUX_HEV-P_PrimaryBusType">
					<Fan>
						<Technology>Hydraulic driven - Constant displacement pump</Technology>
					</Fan>
					<SteeringPump>
						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
					</SteeringPump>
					<ElectricSystem>
						<AlternatorTechnology>conventional</AlternatorTechnology>
						<SmartAlternator>
							<!-- optional -->
							<RatedCurrent>100</RatedCurrent>
							<RatedVoltage>48</RatedVoltage>
						</SmartAlternator>
						<SmartAlternator>
							<!-- optional -->
							<RatedCurrent>50</RatedCurrent>
							<RatedVoltage>48</RatedVoltage>
						</SmartAlternator>
						<Battery>
							<!-- optional -->
							<BatteryTechnology>li-ion battery - high power</BatteryTechnology>
							<RatedCapacity>50</RatedCapacity>
							<NominalVoltage>48</NominalVoltage>
						</Battery>
						<Capacitor>
							<!-- optional -->
							<CapacitorTechnology>with DCDC converter</CapacitorTechnology>
							<RatedCapacitance>120</RatedCapacitance>
							<RatedVoltage>30</RatedVoltage>
						</Capacitor>
						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
					</ElectricSystem>
					<PneumaticSystem>
						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
						<CompressorDrive>mechanically</CompressorDrive>
						<Clutch>none</Clutch>
						<CompressorRatio>1.000</CompressorRatio>
						<SmartCompressionSystem>true</SmartCompressionSystem>
						<SmartRegenerationSystem>false</SmartRegenerationSystem>
						<AirsuspensionControl>electronically</AirsuspensionControl>
						<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
					</PneumaticSystem>
					<HVAC>
						<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
						<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
	<v2.0:Vehicle xsi:type="Vehicle_HEV-Px_PrimaryBusDeclarationType" id="a">
		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
		<Model>Generic Model</Model>
		<VIN>VEH-1234567890</VIN>
		<Date>2017-02-15T11:00:00Z</Date>
		<LegislativeCategory>M3</LegislativeCategory>
		<ChassisConfiguration>Bus</ChassisConfiguration>
		<AxleConfiguration>4x2</AxleConfiguration>
		<Articulated>true</Articulated>
		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
		<IdlingSpeed>600</IdlingSpeed>
		<RetarderType>Losses included in Gearbox</RetarderType>
		<RetarderRatio>2.000</RetarderRatio>
		<AngledriveType>Separate Angledrive</AngledriveType>
		<ZeroEmissionVehicle>true</ZeroEmissionVehicle>
		<ArchitectureID>P2</ArchitectureID>
		<OvcHev>true</OvcHev>
		<MaxChargingPower>11</MaxChargingPower>
		<ADAS xsi:type="ADAS_HEV_Type">
			<EngineStopStart>true</EngineStopStart>
			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
		</ADAS>
		<Components xsi:type="Components_HEV-Px_PrimaryBusType">
			<Engine>
				<v2.0:Data xsi:type="v1.0:EngineDataDeclarationType" id="ENG-gooZah3D" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
					<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>
					<IdlingSpeed>560</IdlingSpeed>
					<RatedSpeed>2200</RatedSpeed>
					<RatedPower>380000</RatedPower>
					<MaxEngineTorque>2300</MaxEngineTorque>
					<WHTCUrban>1.0097</WHTCUrban>
					<WHTCRural>1.0035</WHTCRural>
					<WHTCMotorway>1.0200</WHTCMotorway>
					<BFColdHot>1.0000</BFColdHot>
					<CFRegPer>1.0000</CFRegPer>
					<CFNCV>1.0000</CFNCV>
					<FuelType>NG</FuelType>
					<FuelConsumptionMap>
						<Entry engineSpeed="560.00" torque="-149.00" fuelConsumption="0.00"/>
						<Entry engineSpeed="560.00" torque="1180.00" fuelConsumption="12869.00"/>
						<Entry engineSpeed="2100.00" torque="-320.00" fuelConsumption="0.00"/>
						<Entry engineSpeed="2100.00" torque="1100.00" fuelConsumption="50653.00"/>
					</FuelConsumptionMap>
					<FullLoadAndDragCurve>
						<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
						<Entry engineSpeed="1800.00" maxTorque="1800.00" dragTorque="-300.00"/>
						<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
					</FullLoadAndDragCurve>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference>
						<di:DigestMethod Algorithm=""/>
						<di:DigestValue/>
					</di:Reference>
				</v2.0:Signature>
			</Engine>
			<ElectricMachine>
				<PowertrainPosition>2</PowertrainPosition>
				<Count>1</Count>
				<ElectricMachineSystem>
					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
						<Manufacturer>a</Manufacturer>
						<Model>a</Model>
						<CertificationNumber>token</CertificationNumber>
						<Date>2017-01-01T00:00:00Z</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>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="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>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="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="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>
						<DragCurve>
							<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
							<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
						</DragCurve>
						<Conditioning>
							<Entry coolantTempInlet="30" coolingPower="5000"/>
						</Conditioning>
					</v2.3:Data>
					<v2.3:Signature>
						<di:Reference>
							<di:DigestMethod Algorithm=""/>
							<di:DigestValue/>
						</di:Reference>
					</v2.3:Signature>
				</ElectricMachineSystem>
				<P2.5GearRatios>
					<!-- only for P2.5 HEV -->
					<Ratio gear="1">1.000</Ratio>
					<Ratio gear="2">2.000</Ratio>
				</P2.5GearRatios>
			</ElectricMachine>
			<ElectricEnergyStorage>
				<Battery>
					<StringID>0</StringID>
					<REESS>
						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
							<Manufacturer>a</Manufacturer>
							<Model>a</Model>
							<CertificationNumber>token</CertificationNumber>
							<Date>2017-01-01T00:00:00Z</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="0" OCV="620.00"/>
								<Entry SoC="100" OCV="640.00"/>
							</OCV>
							<InternalResistance>
								<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"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.4:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm=""/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
					<SOCmin>20</SOCmin>
					<SOCmax>80</SOCmax>
				</Battery>
				<Battery>
					<StringID>1</StringID>
					<REESS>
						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
							<Manufacturer>a</Manufacturer>
							<Model>a</Model>
							<CertificationNumber>token</CertificationNumber>
							<Date>2017-01-01T00:00:00Z</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="0" OCV="620.00"/>
								<Entry SoC="100" OCV="640.00"/>
							</OCV>
							<InternalResistance>
								<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"/>
							</InternalResistance>
							<CurrentLimits>
								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
							</CurrentLimits>
						</v2.4:Data>
						<Signature>
							<di:Reference>
								<di:DigestMethod Algorithm=""/>
								<di:DigestValue/>
							</di:Reference>
						</Signature>
					</REESS>
				</Battery>
			</ElectricEnergyStorage>
			<Gearbox>
				<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.0:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck Gearbox</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<TransmissionType>AMT</TransmissionType>
					<MainCertificationMethod>Standard values</MainCertificationMethod>
					<Gears xsi:type="GearsDeclarationType">
						<Gear number="1">
							<Ratio>14.930</Ratio>
							<MaxTorque>1900</MaxTorque>
							<MaxSpeed>2000</MaxSpeed>
							<TorqueLossMap>
								<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
								<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
								<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
								<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
								<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
								<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
							</TorqueLossMap>
						</Gear>
						<Gear number="2">
							<Ratio>11.640</Ratio>
							<MaxTorque>1900</MaxTorque>
							<MaxSpeed>2000</MaxSpeed>
							<TorqueLossMap>
								<Entry inputSpeed="0.00" inputTorque="-1000.00" torqueLoss="25.06"/>
								<Entry inputSpeed="0.00" inputTorque="50.00" torqueLoss="6.06"/>
								<Entry inputSpeed="0.00" inputTorque="3000.00" torqueLoss="54.06"/>
								<Entry inputSpeed="2100.00" inputTorque="-1000.00" torqueLoss="35.69"/>
								<Entry inputSpeed="2100.00" inputTorque="50.00" torqueLoss="16.69"/>
								<Entry inputSpeed="2100.00" inputTorque="3000.00" torqueLoss="64.69"/>
							</TorqueLossMap>
						</Gear>
					</Gears>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#gbx-vi2Oak2N">
						<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>ieNmjofFObDBGnB7+GX9of3HYe3ydK/ra+YvmULVJIk=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Gearbox>
			<TorqueConverter>
				<!-- optional -->
				<v2.0:Data xsi:type="v1.0:TorqueConverterDataDeclarationType" id="TQ-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
					<Manufacturer>Some Manufacturer</Manufacturer>
					<Model>Some Model</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-02-15T11:00:00Z</Date>
					<AppVersion>TC CalcApp 123</AppVersion>
					<CertificationMethod>Standard values</CertificationMethod>
					<Characteristics>
						<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
						<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
						<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
					</Characteristics>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference>
						<di:DigestMethod Algorithm=""/>
						<di:DigestValue/>
					</di:Reference>
				</v2.0:Signature>
			</TorqueConverter>
			<Axlegear>
				<v2.0:Data id="AXL-EC3ohnoh" xsi:type="v2.0:AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
					<Model>Generic 40t Long Haul Truck AxleGear</Model>
					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
					<Date>2017-01-11T11:00:00Z</Date>
					<AppVersion>3.0.1</AppVersion>
					<LineType>Single portal axle</LineType>
					<Ratio>2.590</Ratio>
					<CertificationMethod>Standard values</CertificationMethod>
					<TorqueLossMap>
						<Entry inputSpeed="0.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="0.00" inputTorque="15000.00" torqueLoss="265.00"/>
						<Entry inputSpeed="2100.00" inputTorque="-5000.00" torqueLoss="115.00"/>
						<Entry inputSpeed="2100.00" inputTorque="0.00" torqueLoss="40.00"/>
						<Entry inputSpeed="2100.00" inputTorque="35000.00" torqueLoss="565.00"/>
					</TorqueLossMap>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#AXL-EC3ohnoh">
						<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>o4nYTajmWKaduxys5ShmnfJbYd23rpxZ01JbuG6dmzU=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</Axlegear>
			<AxleWheels>
				<v2.0:Data xsi:type="v2.0:AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
					<Axles>
						<Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleNonDriven</AxleType>
							<TwinTyres>false</TwinTyres>
							<Steered>true</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0055</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
						<Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
							<AxleType>VehicleDriven</AxleType>
							<TwinTyres>true</TwinTyres>
							<Steered>false</Steered>
							<Tyre>
								<Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
									<Manufacturer>Generic Wheels Manufacturer</Manufacturer>
									<Model>Generic Wheel</Model>
									<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
									<Date>2017-01-11T14:00:00Z</Date>
									<AppVersion>Tyre Generation App 1.0</AppVersion>
									<Dimension>315/70 R22.5</Dimension>
									<RRCDeclared>0.0063</RRCDeclared>
									<FzISO>31300</FzISO>
								</Data>
								<Signature>
									<di:Reference URI="#WHL-5432198760-315-70-R22.5">
										<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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
									</di:Reference>
								</Signature>
							</Tyre>
						</Axle>
					</Axles>
				</v2.0:Data>
			</AxleWheels>
			<Auxiliaries>
				<Data xsi:type="AUX_HEV-P_PrimaryBusType">
					<Fan>
						<Technology>Hydraulic driven - Constant displacement pump</Technology>
					</Fan>
					<SteeringPump>
						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
					</SteeringPump>
					<ElectricSystem>
						<AlternatorTechnology>conventional</AlternatorTechnology>
						<SmartAlternator>
							<!-- optional -->
							<RatedCurrent>100</RatedCurrent>
							<RatedVoltage>48</RatedVoltage>
						</SmartAlternator>
						<SmartAlternator>
							<!-- optional -->
							<RatedCurrent>50</RatedCurrent>
							<RatedVoltage>48</RatedVoltage>
						</SmartAlternator>
						<Battery>
							<!-- optional -->
							<BatteryTechnology>li-ion battery - high power</BatteryTechnology>
							<RatedCapacity>50</RatedCapacity>
							<NominalVoltage>48</NominalVoltage>
						</Battery>
						<Capacitor>
							<!-- optional -->
							<CapacitorTechnology>with DCDC converter</CapacitorTechnology>
							<RatedCapacitance>120</RatedCapacitance>
							<RatedVoltage>30</RatedVoltage>
						</Capacitor>
						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
					</ElectricSystem>
					<PneumaticSystem>
						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
						<CompressorDrive>mechanically</CompressorDrive>
						<Clutch>none</Clutch>
						<CompressorRatio>1.000</CompressorRatio>
						<SmartCompressionSystem>true</SmartCompressionSystem>
						<SmartRegenerationSystem>false</SmartRegenerationSystem>
						<AirsuspensionControl>electronically</AirsuspensionControl>
						<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
					</PneumaticSystem>
					<HVAC>
						<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
						<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/IEPC_heavyLorry_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/IEPC_heavyLorry_n_opt.xml
index 44ff9e084d..bd8d18634f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/IEPC_heavyLorry_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/IEPC_heavyLorry_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_IEPC_HeavyLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -30,7 +30,7 @@
 		</ADAS>
 		<Components xsi:type="Components_IEPC_LorryType">
 			<IEPC>
-				<v2.10.1:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+				<v2.3:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
 					<Manufacturer>a</Manufacturer>
 					<Model>a</Model>
 					<CertificationNumber>token</CertificationNumber>
@@ -42,7 +42,7 @@
 					<RotationalInertia>0.10</RotationalInertia>
 					<DifferentialIncluded>false</DifferentialIncluded>
 					<DesignTypeWheelMotor>true</DesignTypeWheelMotor>
-					<Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+					<Gears xsi:type="v2.3:IEPCGearsDeclarationType">
 						<Gear number="1">
 							<Ratio>3.000</Ratio>
 						</Gear>
@@ -110,19 +110,19 @@
 					<Conditioning>
 						<Entry coolantTempInlet="30" coolingPower="5000"/>
 					</Conditioning>
-				</v2.10.1:Data>
-				<v2.10.1:Signature>
+				</v2.3:Data>
+				<v2.3:Signature>
 					<di:Reference>
 						<di:DigestMethod Algorithm=""/>
 						<di:DigestValue/>
 					</di:Reference>
-				</v2.10.1:Signature>
+				</v2.3:Signature>
 			</IEPC>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -146,7 +146,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -160,7 +160,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -184,7 +184,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/IEPC_mediumLorry_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/IEPC_mediumLorry_n_opt.xml
index 632ff17792..f2188a6248 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/IEPC_mediumLorry_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/IEPC_mediumLorry_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_IEPC_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -24,7 +24,7 @@
 		</ADAS>
 		<Components xsi:type="Components_IEPC_LorryType">
 			<IEPC>
-				<v2.10.1:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+				<v2.3:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
 					<Manufacturer>a</Manufacturer>
 					<Model>a</Model>
 					<CertificationNumber>token</CertificationNumber>
@@ -36,7 +36,7 @@
 					<RotationalInertia>0.10</RotationalInertia>
 					<DifferentialIncluded>false</DifferentialIncluded>
 					<DesignTypeWheelMotor>true</DesignTypeWheelMotor>
-					<Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+					<Gears xsi:type="v2.3:IEPCGearsDeclarationType">
 						<Gear number="1">
 							<Ratio>3.000</Ratio>
 						</Gear>
@@ -104,19 +104,19 @@
 					<Conditioning>
 						<Entry coolantTempInlet="30" coolingPower="5000"/>
 					</Conditioning>
-				</v2.10.1:Data>
-				<v2.10.1:Signature>
+				</v2.3:Data>
+				<v2.3:Signature>
 					<di:Reference>
 						<di:DigestMethod Algorithm=""/>
 						<di:DigestValue/>
 					</di:Reference>
-				</v2.10.1:Signature>
+				</v2.3:Signature>
 			</IEPC>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -140,7 +140,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -154,7 +154,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -178,7 +178,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/IEPC_primaryBus_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/IEPC_primaryBus_n_opt.xml
index aebf14584f..d74b5bbcd3 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/IEPC_primaryBus_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/IEPC_primaryBus_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_IEPC_PrimaryBusDeclarationType" id="a">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -23,7 +23,7 @@
 		</ADAS>
 		<Components xsi:type="Components_IEPC_PrimaryBusType">
 			<IEPC>
-				<v2.10.1:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
+				<v2.3:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf">
 					<Manufacturer>a</Manufacturer>
 					<Model>a</Model>
 					<CertificationNumber>token</CertificationNumber>
@@ -35,7 +35,7 @@
 					<RotationalInertia>0.10</RotationalInertia>
 					<DifferentialIncluded>false</DifferentialIncluded>
 					<DesignTypeWheelMotor>true</DesignTypeWheelMotor>
-					<Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+					<Gears xsi:type="v2.3:IEPCGearsDeclarationType">
 						<Gear number="1">
 							<Ratio>3.000</Ratio>
 						</Gear>
@@ -103,19 +103,19 @@
 					<Conditioning>
 						<Entry coolantTempInlet="30" coolingPower="5000"/>
 					</Conditioning>
-				</v2.10.1:Data>
-				<v2.10.1:Signature>
+				</v2.3:Data>
+				<v2.3:Signature>
 					<di:Reference>
 						<di:DigestMethod Algorithm=""/>
 						<di:DigestValue/>
 					</di:Reference>
-				</v2.10.1:Signature>
+				</v2.3:Signature>
 			</IEPC>
 			<ElectricEnergyStorage>
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -139,7 +139,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -153,7 +153,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -177,7 +177,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_heavyLorry_AMT_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_heavyLorry_AMT_E2_n_opt.xml
index ec55a2e215..9faf314210 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_heavyLorry_AMT_E2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_heavyLorry_AMT_E2_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_PEV_HeavyLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -34,7 +34,7 @@
 				<PowertrainPosition>2</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -89,13 +89,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -107,7 +107,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -131,7 +131,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -145,7 +145,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -169,7 +169,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_heavyLorry_APT-N_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_heavyLorry_APT-N_E2_n_opt.xml
index 9da3982ea2..e55067566a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_heavyLorry_APT-N_E2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_heavyLorry_APT-N_E2_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_PEV_HeavyLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -23,7 +23,7 @@
 		<VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber>
 		<ArchitectureID>E2</ArchitectureID>
 		<OvcHev>false</OvcHev>
-		<ADAS xsi:type="v2.10.2:ADAS_PEV_Type">
+		<ADAS xsi:type="v2.4:ADAS_PEV_Type">
 			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
 		</ADAS>
 		<Components xsi:type="Components_PEV-E2_LorryType">
@@ -31,7 +31,7 @@
 				<PowertrainPosition>2</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -86,13 +86,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -104,7 +104,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -128,7 +128,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -142,7 +142,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -166,7 +166,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -177,7 +177,7 @@
 				</Battery>
 			</ElectricEnergyStorage>
 			<Gearbox>
-				<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.10.1:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+				<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.3:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 					<Manufacturer>Generic Vendor</Manufacturer>
 					<Model>GB_12-gear</Model>
 					<CertificationNumber>GBX-GB_12-gear</CertificationNumber>
@@ -185,7 +185,7 @@
 					<AppVersion>VectoCore</AppVersion>
 					<TransmissionType>APT-N</TransmissionType>
 					<MainCertificationMethod>Standard values</MainCertificationMethod>
-					<v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+					<v2.3:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 						<Gear number="1">
 							<Ratio>14.930</Ratio>
 							<TorqueLossMap>
@@ -231,7 +231,7 @@
 								<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
 							</TorqueLossMap>
 						</Gear>
-					</v2.10.1:Gears>
+					</v2.3:Gears>
 				</v2.0:Data>
 				<v2.0:Signature>
 					<di:Reference URI="#gbx-vi2Oak2N">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_heavyLorry_E3_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_heavyLorry_E3_n_opt.xml
index 43baabf549..aeffe86c34 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_heavyLorry_E3_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_heavyLorry_E3_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_PEV_HeavyLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -37,7 +37,7 @@
 				<PowertrainPosition>3</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -92,13 +92,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -110,7 +110,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -134,7 +134,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -148,7 +148,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -172,7 +172,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_heavyLorry_E4_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_heavyLorry_E4_n_opt.xml
index 6b494f5c35..762cf2ab99 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_heavyLorry_E4_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_heavyLorry_E4_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_PEV_HeavyLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -37,7 +37,7 @@
 				<PowertrainPosition>4</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -92,13 +92,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -110,7 +110,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -134,7 +134,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -148,7 +148,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -172,7 +172,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_mediumLorry_AMT_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_mediumLorry_AMT_E2_n_opt.xml
index 6984af2840..79173c8f65 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_mediumLorry_AMT_E2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_mediumLorry_AMT_E2_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -27,7 +27,7 @@
 				<PowertrainPosition>2</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -82,13 +82,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -100,7 +100,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -124,7 +124,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -138,7 +138,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -162,7 +162,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_mediumLorry_APT-N_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_mediumLorry_APT-N_E2_n_opt.xml
index 8a267f1ab9..a6c822362b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_mediumLorry_APT-N_E2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_mediumLorry_APT-N_E2_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -25,7 +25,7 @@
 				<PowertrainPosition>2</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -80,13 +80,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -98,7 +98,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -122,7 +122,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -136,7 +136,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -160,7 +160,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -171,7 +171,7 @@
 				</Battery>
 			</ElectricEnergyStorage>
 			<Gearbox>
-				<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.10.1:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+				<v2.0:Data id="gbx-vi2Oak2N" xsi:type="v2.3:GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 					<Manufacturer>Generic Vendor</Manufacturer>
 					<Model>GB_12-gear</Model>
 					<CertificationNumber>GBX-GB_12-gear</CertificationNumber>
@@ -179,7 +179,7 @@
 					<AppVersion>VectoCore</AppVersion>
 					<TransmissionType>APT-N</TransmissionType>
 					<MainCertificationMethod>Standard values</MainCertificationMethod>
-					<v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+					<v2.3:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 						<Gear number="1">
 							<Ratio>14.930</Ratio>
 							<TorqueLossMap>
@@ -225,7 +225,7 @@
 								<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
 							</TorqueLossMap>
 						</Gear>
-					</v2.10.1:Gears>
+					</v2.3:Gears>
 				</v2.0:Data>
 				<v2.0:Signature>
 					<di:Reference URI="#gbx-vi2Oak2N">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_mediumLorry_E3_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_mediumLorry_E3_n_opt.xml
index 042871f31a..1c930537fa 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_mediumLorry_E3_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_mediumLorry_E3_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -31,7 +31,7 @@
 				<PowertrainPosition>3</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -86,13 +86,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -104,7 +104,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -128,7 +128,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -142,7 +142,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -166,7 +166,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_mediumLorry_E4_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_mediumLorry_E4_n_opt.xml
index d2e6d7c311..7c09fe9fef 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_mediumLorry_E4_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_mediumLorry_E4_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_PEV_MediumLorryDeclarationType" id="a">
 		<Manufacturer>TU Graz</Manufacturer>
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
@@ -19,7 +19,7 @@
 		<ArchitectureID>E4</ArchitectureID>
 		<OvcHev>true</OvcHev>
 		<MaxChargingPower>11</MaxChargingPower>
-		<ADAS xsi:type="v2.10.2:ADAS_PEV_Type">
+		<ADAS xsi:type="v2.4:ADAS_PEV_Type">
 			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
 		</ADAS>
 		<TorqueLimits xsi:type="v2.0:TorqueLimitsType">
@@ -31,7 +31,7 @@
 				<PowertrainPosition>4</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -86,13 +86,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -104,7 +104,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -128,7 +128,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -142,7 +142,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -166,7 +166,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_primaryBus_AMT_E2_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_primaryBus_AMT_E2_n_opt.xml
index b43bfa5b07..c30eba3db3 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_primaryBus_AMT_E2_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_primaryBus_AMT_E2_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_PEV_PrimaryBusDeclarationType" id="a">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -26,7 +26,7 @@
 				<PowertrainPosition>2</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -81,13 +81,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -99,7 +99,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -123,7 +123,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -137,7 +137,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -161,7 +161,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_primaryBus_E3_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_primaryBus_E3_n_opt.xml
index 24de0ba786..754b0ce6b7 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_primaryBus_E3_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_primaryBus_E3_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_PEV_PrimaryBusDeclarationType" id="a">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -30,7 +30,7 @@
 				<PowertrainPosition>3</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -85,13 +85,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -103,7 +103,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -127,7 +127,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -141,7 +141,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -165,7 +165,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_primaryBus_E4_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_primaryBus_E4_n_opt.xml
index 2448668cb9..b1621914b5 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_primaryBus_E4_n_opt.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/PEV_primaryBus_E4_n_opt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"  xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 	<v2.0:Vehicle xsi:type="Vehicle_PEV_PrimaryBusDeclarationType" id="a">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
@@ -30,7 +30,7 @@
 				<PowertrainPosition>4</PowertrainPosition>
 				<Count>1</Count>
 				<ElectricMachineSystem>
-					<v2.10.1:Data xsi:type="v2.10.1:ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+					<v2.3:Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
 						<Manufacturer>a</Manufacturer>
 						<Model>a</Model>
 						<CertificationNumber>token</CertificationNumber>
@@ -85,13 +85,13 @@
 						<Conditioning>
 							<Entry coolantTempInlet="30" coolingPower="5000"/>
 						</Conditioning>
-					</v2.10.1:Data>
-					<v2.10.1:Signature>
+					</v2.3:Data>
+					<v2.3:Signature>
 						<di:Reference>
 							<di:DigestMethod Algorithm=""/>
 							<di:DigestValue/>
 						</di:Reference>
-					</v2.10.1:Signature>
+					</v2.3:Signature>
 				</ElectricMachineSystem>
 				<P2.5GearRatios>
 					<!-- only for P2.5 HEV -->
@@ -103,7 +103,7 @@
 				<Battery>
 					<StringID>0</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -127,7 +127,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
@@ -141,7 +141,7 @@
 				<Battery>
 					<StringID>1</StringID>
 					<REESS>
-						<v2.10.2:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType">
+						<v2.4:Data id="BAT-asdf" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xsi:type="BatterySystemDataType">
 							<Manufacturer>a</Manufacturer>
 							<Model>a</Model>
 							<CertificationNumber>token</CertificationNumber>
@@ -165,7 +165,7 @@
 								<Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/>
 								<Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
 							</CurrentLimits>
-						</v2.10.2:Data>
+						</v2.4:Data>
 						<Signature>
 							<di:Reference>
 								<di:DigestMethod Algorithm=""/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/exempted_primary_heavyBus.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/exempted_primary_heavyBus.xml
index 7a42287103..f008453a28 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/exempted_primary_heavyBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/exempted_primary_heavyBus.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tns:VectoInputDeclaration schemaVersion="2.0" 
-xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-completed_heavyBus-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-completed_heavyBus-sample.xml
index 2833bcebf6..940cc299ee 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-completed_heavyBus-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-completed_heavyBus-sample.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType"><!--xsi:type="CompletedVehicleDeclarationType">-->
 		<Manufacturer>Some Manufacturer</Manufacturer>
 		<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_full-sample.xml
index c03460f972..5d5bf009ef 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_full-sample.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType">
 		<Manufacturer>Some Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
index 7ecb5e926b..a73d2d6efe 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType">
		<Manufacturer>Some Manufacturer 1</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>7000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
		<BodyworkCode>CC</BodyworkCode>
		<LowEntry>false</LowEntry>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType">
		<Manufacturer>Some Manufacturer 1</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>7000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
		<BodyworkCode>CC</BodyworkCode>
		<LowEntry>false</LowEntry>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
index 9d649c8913..3c09c5deb2 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_mandatory_entries.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_mandatory_entries.xml
index b04e71dc32..385695e0a7 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_mandatory_entries.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-exempted_input_only_mandatory_entries.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType" >
		<Manufacturer>Some Manufacturer 3</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType" >
		<Manufacturer>Some Manufacturer 3</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-medium_lorry-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-medium_lorry-sample.xml
index e16d649641..5f9cd4691a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-medium_lorry-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-medium_lorry-sample.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-class5_Class-5_5t0" xsi:type="Vehicle_Conventional_MediumLorryDeclarationType">
 		<Manufacturer>Generic Vendor</Manufacturer>
 		<ManufacturerAddress>N.A.</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-primary_heavyBus-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-primary_heavyBus-sample.xml
index fd72e169b7..ce2029db18 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-primary_heavyBus-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-primary_heavyBus-sample.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-primary_heavyBusSmartES-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-primary_heavyBusSmartES-sample.xml
index 4644888e99..74636ec5dd 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-primary_heavyBusSmartES-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-primary_heavyBusSmartES-sample.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-primary_heavyBusSmartES_invalid_testdata.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-primary_heavyBusSmartES_invalid_testdata.xml
index 860e6ee1fd..bce70ae884 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-primary_heavyBusSmartES_invalid_testdata.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-primary_heavyBusSmartES_invalid_testdata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"  
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
@@ -25,11 +24,11 @@ xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt
 			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
 			<APTEcoRollReleaseLockupClutch>false</APTEcoRollReleaseLockupClutch>
 		</ADAS>
-		<v2.10.2:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+		<v2.4:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Entry gear="6" maxTorque="1800"/>
 			<Entry gear="1" maxTorque="2500"/>
 			<Entry gear="12" maxTorque="1900"/>
-		</v2.10.2:TorqueLimits>
+		</v2.4:TorqueLimits>
 		<Components xsi:type="Components_Conventional_PrimaryBusType">
 			<Engine>
 				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample.xml
index 8172d18e79..d353862e95 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
 		<Manufacturer>Some Manufacturer</Manufacturer>
 		<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
@@ -9,7 +9,7 @@
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>500</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem>
 		<NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample_group41.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample_group41.xml
index 61f700afa8..249636ca17 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample_group41.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample_group41.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
@@ -15,7 +14,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>8300</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>false</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem>
 		<NumberPassengerSeatsLowerDeck>2</NumberPassengerSeatsLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_certain_entries01-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
index a547601497..ebf028b21c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
		<Manufacturer>Some Manufacturer 1</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model 2</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>5000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
		<ClassBus>A</ClassBus>
		<NgTankSystem>Compressed</NgTankSystem>
		<BodyworkCode>CG</BodyworkCode>
		<LowEntry>true</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>10000</VehicleLength>
		<VehicleWidth>2600</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
		<VehicleDeclarationType>interim</VehicleDeclarationType>
		<ADAS xsi:type="ADAS_Conventional_Type">
			<EngineStopStart>true</EngineStopStart>
			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
			<PredictiveCruiseControl>none</PredictiveCruiseControl>
			<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="Components_Conventional_CompletedBusType">
			<Auxiliaries>
				<Data xsi:type="AUX_Conventional_CompletedBusType">
					<ElectricSystem>
						<LEDLights>
							<Interiorlights>false</Interiorlights>
							<Dayrunninglights>true</Dayrunninglights>
							<Headlights>false</Headlights>
						</LEDLights>		
					</ElectricSystem>
					<HVAC>
						<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
						<DoubleGlazing>false</DoubleGlazing>
						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
		<Manufacturer>Some Manufacturer 1</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model 2</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>5000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
		<AirdragModifiedMultistep>false</AirdragModifiedMultistep>
		<ClassBus>A</ClassBus>
		<NgTankSystem>Compressed</NgTankSystem>
		<BodyworkCode>CG</BodyworkCode>
		<LowEntry>true</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>10000</VehicleLength>
		<VehicleWidth>2600</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
		<VehicleDeclarationType>interim</VehicleDeclarationType>
		<ADAS xsi:type="ADAS_Conventional_Type">
			<EngineStopStart>true</EngineStopStart>
			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
			<PredictiveCruiseControl>none</PredictiveCruiseControl>
			<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="Components_Conventional_CompletedBusType">
			<Auxiliaries>
				<Data xsi:type="AUX_Conventional_CompletedBusType">
					<ElectricSystem>
						<LEDLights>
							<Interiorlights>false</Interiorlights>
							<Dayrunninglights>true</Dayrunninglights>
							<Headlights>false</Headlights>
						</LEDLights>		
					</ElectricSystem>
					<HVAC>
						<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
						<DoubleGlazing>false</DoubleGlazing>
						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_certain_entries02-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
index 6fde1b5432..df7f099924 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
		<Manufacturer>Some Manufacturer 2</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>500</CorrectedActualMass>
		<ClassBus>II+III</ClassBus>
		<NgTankSystem>Compressed</NgTankSystem>
		<NumberPassengerSeatsLowerDeck>5</NumberPassengerSeatsLowerDeck>
		<NumberPassengersStandingLowerDeck>15</NumberPassengersStandingLowerDeck>
		<NumberPassengerSeatsUpperDeck>10</NumberPassengerSeatsUpperDeck>
		<NumberPassengersStandingUpperDeck>6</NumberPassengersStandingUpperDeck>
		<BodyworkCode>CB</BodyworkCode>
		<LowEntry>false</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>9500</VehicleLength>
		<VehicleWidth>2500</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<VehicleDeclarationType>interim</VehicleDeclarationType>
		<ADAS xsi:type="ADAS_Conventional_Type">
			<EngineStopStart>true</EngineStopStart>
			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
			<PredictiveCruiseControl>none</PredictiveCruiseControl>
			<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="Components_Conventional_CompletedBusType">
			<AirDrag>
				<v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX23h">
					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
					<v2.0:Model>Generic Model</v2.0:Model>
					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
			<Auxiliaries>
				<Data xsi:type="AUX_Conventional_CompletedBusType">
					<HVAC>
						<SystemConfiguration>0</SystemConfiguration>
						<HeatPumpTypeDriverCompartment>
							<Cooling>none</Cooling>
							<Heating>none</Heating>
						</HeatPumpTypeDriverCompartment>
						<HeatPumpTypePassengerCompartment>
							<Cooling>non R-744 2-stage</Cooling>
							<Heating>none</Heating>
						</HeatPumpTypePassengerCompartment>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
		<Manufacturer>Some Manufacturer 2</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>500</CorrectedActualMass>
		<ClassBus>II+III</ClassBus>
		<NgTankSystem>Compressed</NgTankSystem>
		<NumberPassengerSeatsLowerDeck>5</NumberPassengerSeatsLowerDeck>
		<NumberPassengersStandingLowerDeck>15</NumberPassengersStandingLowerDeck>
		<NumberPassengerSeatsUpperDeck>10</NumberPassengerSeatsUpperDeck>
		<NumberPassengersStandingUpperDeck>6</NumberPassengersStandingUpperDeck>
		<BodyworkCode>CB</BodyworkCode>
		<LowEntry>false</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>9500</VehicleLength>
		<VehicleWidth>2500</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<VehicleDeclarationType>interim</VehicleDeclarationType>
		<ADAS xsi:type="ADAS_Conventional_Type">
			<EngineStopStart>true</EngineStopStart>
			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
			<PredictiveCruiseControl>none</PredictiveCruiseControl>
			<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="Components_Conventional_CompletedBusType">
			<AirDrag>
				<v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX23h">
					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
					<v2.0:Model>Generic Model</v2.0:Model>
					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
			<Auxiliaries>
				<Data xsi:type="AUX_Conventional_CompletedBusType">
					<HVAC>
						<SystemConfiguration>0</SystemConfiguration>
						<HeatPumpTypeDriverCompartment>
							<Cooling>none</Cooling>
							<Heating>none</Heating>
						</HeatPumpTypeDriverCompartment>
						<HeatPumpTypePassengerCompartment>
							<Cooling>non R-744 2-stage</Cooling>
							<Heating>none</Heating>
						</HeatPumpTypePassengerCompartment>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_component_nullable_entries.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_component_nullable_entries.xml
index 1d856e3047..1973372655 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_component_nullable_entries.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_component_nullable_entries.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
		<Manufacturer>Some Manufacturer 4</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 4</ManufacturerAddress>
		<VIN>VEH-1234567894</VIN>
		<Date>2022-01-09T11:00:00Z</Date>
		<VehicleDeclarationType>interim</VehicleDeclarationType>
		<ADAS xsi:type="ADAS_Conventional_Type">
			<EngineStopStart>true</EngineStopStart>
			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
			<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
		</ADAS>
		<Components xsi:type="Components_Conventional_CompletedBusType">
			<Auxiliaries>
				<Data xsi:type="AUX_Conventional_CompletedBusType">
					<ElectricSystem>
						<LEDLights>
						</LEDLights>
					</ElectricSystem>				
					<HVAC>
					</HVAC>
				</Data>			
			</Auxiliaries>			
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
		<Manufacturer>Some Manufacturer 4</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 4</ManufacturerAddress>
		<VIN>VEH-1234567894</VIN>
		<Date>2022-01-09T11:00:00Z</Date>
		<VehicleDeclarationType>interim</VehicleDeclarationType>
		<ADAS xsi:type="ADAS_Conventional_Type">
			<EngineStopStart>true</EngineStopStart>
			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
			<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
			<PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
		</ADAS>
		<Components xsi:type="Components_Conventional_CompletedBusType">
			<Auxiliaries>
				<Data xsi:type="AUX_Conventional_CompletedBusType">
					<ElectricSystem>
						<LEDLights>
						</LEDLights>
					</ElectricSystem>				
					<HVAC>
					</HVAC>
				</Data>			
			</Auxiliaries>			
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_mandatory_entries.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_mandatory_entries.xml
index ba774e4ec7..93899b203b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_mandatory_entries.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_mandatory_entries.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
		<Manufacturer>Some Manufacturer 3</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<VehicleDeclarationType>final</VehicleDeclarationType>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
		<Manufacturer>Some Manufacturer 3</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<VehicleDeclarationType>final</VehicleDeclarationType>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_mandatory_standard_value_airdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_mandatory_standard_value_airdrag.xml
index c2035bdca3..737deac2ac 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_mandatory_standard_value_airdrag.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_mandatory_standard_value_airdrag.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_vif_input.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_vif_input.xml
index 04e70322c5..53d349600d 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_vif_input.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_vif_input.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
			<v2.0:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle">
				<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
				<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
				<VIN>VEH-2234567866</VIN>
				<Date>2021-02-13T07:20:08.0187663Z</Date>
				<LegislativeCategory>M3</LegislativeCategory>				
				<TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>				
				<ClassBus>B</ClassBus>			
				<NgTankSystem>Liquefied</NgTankSystem>				
				<VehicleDeclarationType>interim</VehicleDeclarationType>
				<ADAS xsi:type="ADAS_Conventional_Type">
					<EngineStopStart>true</EngineStopStart>
					<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
					<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
					<PredictiveCruiseControl>1,2</PredictiveCruiseControl>
					<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
				</ADAS>				
				<Components xsi:type="Components_Conventional_CompletedBusType">
					<Auxiliaries>
						<Data xsi:type="AUX_Conventional_CompletedBusType">
							<ElectricSystem>
								<LEDLights>
									<Positionlights>false</Positionlights>
									<Brakelights>false</Brakelights>
									<Headlights>true</Headlights>									
								</LEDLights>
							</ElectricSystem>
							<HVAC>
							</HVAC>
						</Data>
					</Auxiliaries>
				</Components>
			</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
			<v2.0:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle">
				<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
				<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
				<VIN>VEH-2234567866</VIN>
				<Date>2021-02-13T07:20:08.0187663Z</Date>
				<LegislativeCategory>M3</LegislativeCategory>				
				<TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>				
				<ClassBus>B</ClassBus>			
				<NgTankSystem>Liquefied</NgTankSystem>				
				<VehicleDeclarationType>interim</VehicleDeclarationType>
				<ADAS xsi:type="ADAS_Conventional_Type">
					<EngineStopStart>true</EngineStopStart>
					<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
					<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
					<PredictiveCruiseControl>1,2</PredictiveCruiseControl>
					<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
				</ADAS>				
				<Components xsi:type="Components_Conventional_CompletedBusType">
					<Auxiliaries>
						<Data xsi:type="AUX_Conventional_CompletedBusType">
							<ElectricSystem>
								<LEDLights>
									<Positionlights>false</Positionlights>
									<Brakelights>false</Brakelights>
									<Headlights>true</Headlights>									
								</LEDLights>
							</ElectricSystem>
							<HVAC>
							</HVAC>
						</Data>
					</Auxiliaries>
				</Components>
			</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample.xml
index c5659826e4..2e03b8c4a2 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample.xml
@@ -2,12 +2,12 @@
 <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:DEV:v2.3"
+	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 xsi:type="v2.0:EngineComponentDeclarationType">
-		<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">
+		<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3: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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSampleDualModeDualFuel.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSampleDualModeDualFuel.xml
index 6a8aec969e..3671aa6cfd 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSampleDualModeDualFuel.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSampleDualModeDualFuel.xml
@@ -2,12 +2,12 @@
 <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:DEV:v2.3"
+	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 xsi:type="v2.0:EngineComponentDeclarationType">
-		<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">
+		<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3: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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample_WHR.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample_WHR.xml
index e2e9a37427..e0a79b6e6b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample_WHR.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/engineSample_WHR.xml
@@ -2,12 +2,12 @@
 <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:DEV:v2.3"
+	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 xsi:type="v2.0:EngineComponentDeclarationType">
-		<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">
+		<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3: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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vecto_tyre-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vecto_tyre-sample.xml
index 5245c7f5da..97123e239b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vecto_tyre-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vecto_tyre-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>

<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
	xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
	xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
	xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"
	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
	xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0"
	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 E:\QUAM\Workspace\VECTO_DEV_Hybrid\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
	<tns:Tyre xsi:type="v2.0:TyreComponentDeclarationType">
		<v2.0:Data id="TYR-gooZah3D" xsi:type="v2.3:TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">
			<Manufacturer>Generic Tyre Manufacturer</Manufacturer>
			<Model>Generic Tyre Model</Model>
			<CertificationNumber>e12*0815/8051*2017/05T0000*00</CertificationNumber>
			<Date>2017-02-15T11:00:00Z</Date>
			<AppVersion>DemoTyreApp 1.0</AppVersion>
			<Dimension>235/60 R17C</Dimension><!--- New tyre dimension added in version 2.2 -->
			<TyreClass>C1</TyreClass>
			<FuelEfficiencyClass>A</FuelEfficiencyClass>
			<RRCDeclared>0.0055</RRCDeclared>
			<FzISO>33500</FzISO>
		</v2.0:Data>
		<Signature>
			<di:Reference URI="#TYR-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>JWEwzKSP0lXvwRgQZTiWJm9dpdtQ72FOX0CC5Vy6f2Y=</di:DigestValue>
			</di:Reference>
		</Signature>
	</tns:Tyre>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>

<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
	xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
	xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
	xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"
	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
	xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0"
	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:Tyre xsi:type="v2.0:TyreComponentDeclarationType">
		<v2.0:Data id="TYR-gooZah3D" xsi:type="TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3">
			<Manufacturer>Generic Tyre Manufacturer</Manufacturer>
			<Model>Generic Tyre Model</Model>
			<CertificationNumber>e12*0815/8051*2017/05T0000*00</CertificationNumber>
			<Date>2017-02-15T11:00:00Z</Date>
			<AppVersion>DemoTyreApp 1.0</AppVersion>
			<Dimension>235/60 R17C</Dimension><!--- New tyre dimension added in version 2.2 -->
			<TyreClass>C1</TyreClass>
			<FuelEfficiencyClass>A</FuelEfficiencyClass>
			<RRCDeclared>0.0055</RRCDeclared>
			<FzISO>33500</FzISO>
		</v2.0:Data>
		<Signature>
			<di:Reference URI="#TYR-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>JWEwzKSP0lXvwRgQZTiWJm9dpdtQ72FOX0CC5Vy6f2Y=</di:DigestValue>
			</di:Reference>
		</Signature>
	</tns:Tyre>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel.xml
index e46bf8a4a4..fd3b4c1196 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel.xml
@@ -6,7 +6,7 @@
 	xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 
 	xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 	xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
-	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
+	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
 	xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
 	xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
@@ -45,7 +45,7 @@
 		</v2.1:TorqueLimits>
 		<Components xsi:type="v2.0:VehicleComponentsType">
 			<Engine xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="EngineComponentDeclarationType">
-				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">
+				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3: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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel_WHR.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel_WHR.xml
index 7412703304..0685cc32c7 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel_WHR.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel_WHR.xml
@@ -5,7 +5,7 @@
 	xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
 	xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
 	xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
-	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
+	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
 	xmlns:di="http://www.w3.org/2000/09/xmldsig#"
 	xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
 	>
@@ -35,7 +35,7 @@
 		</TorqueLimits>
 		<Components xsi:type="VehicleComponentsType">
 			<Engine>
-				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">
+				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3: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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel.xml
index 5cc40175de..7ecbc3d47e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel.xml
@@ -5,7 +5,7 @@
 	xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
 	xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
 	xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
-	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
+	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
 	xmlns:di="http://www.w3.org/2000/09/xmldsig#"
 	xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
 	>
@@ -35,7 +35,7 @@
 		</TorqueLimits>
 		<Components xsi:type="VehicleComponentsType">
 			<Engine>
-				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">
+				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3: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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel_WHR.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel_WHR.xml
index 7ed32a6d06..6154ca5146 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel_WHR.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeDualFuel_WHR.xml
@@ -5,7 +5,7 @@
 	xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
 	xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
 	xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
-	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
+	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
 	xmlns:di="http://www.w3.org/2000/09/xmldsig#"
 	xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
 	>
@@ -35,7 +35,7 @@
 		</TorqueLimits>
 		<Components xsi:type="VehicleComponentsType">
 			<Engine>
-				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">
+				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3: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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeSingleFuel_WHR.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeSingleFuel_WHR.xml
index fe4bc2b444..f20c7112d7 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeSingleFuel_WHR.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleSingleModeSingleFuel_WHR.xml
@@ -6,7 +6,7 @@
 	xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
 	xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
 	xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
-	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
+	xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
 	xmlns:di="http://www.w3.org/2000/09/xmldsig#"
 	xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"
 	>
@@ -45,7 +45,7 @@
 		</v2.1:TorqueLimits>
 		<Components xsi:type="v2.0:VehicleComponentsType">
 			<Engine xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="EngineComponentDeclarationType">
-				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">
+				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.3: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>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_primary_heavyBus.VIF.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_primary_heavyBus.VIF.xml
index 717a41fa2e..c2c322ce6b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_primary_heavyBus.VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_primary_heavyBus.VIF.xml
@@ -5,8 +5,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
   <PrimaryVehicle xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
     <Data id="VEH-4cb168560c0d4b3d886d" xsi:type="PrimaryVehicleDataType">
       <Vehicle xsi:type="VehicleExemptedPrimaryBusType">
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
index ddb8848417..3e2b236e45 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
@@ -5,8 +5,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -651,7 +651,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
 				<VIN>VEH-1234567890</VIN>
@@ -697,7 +697,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
 				<VIN>VEH-2234567890</VIN>
@@ -768,7 +768,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 				</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
 				<VIN>VEH-2234567866</VIN>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
index ec58ffc33b..24fa25c43e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
@@ -5,8 +5,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -652,7 +652,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
 				<VIN>VEH-1234567890</VIN>
@@ -702,7 +702,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
 				<VIN>VEH-2234567890</VIN>
@@ -773,7 +773,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 				</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
 				<VIN>VEH-2234567866</VIN>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
index 9ba01e5ed2..c9cc5cc25a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
@@ -5,8 +5,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -651,7 +651,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" >
+			<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" >
 				<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
 				<VIN>VEH-1234567890</VIN>
@@ -741,7 +741,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
 				<VIN>VEH-2234567890</VIN>
@@ -813,7 +813,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 				</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
 				<VIN>VEH-2234567866</VIN>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
index 3b4c783fd0..1547c3d430 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
@@ -5,8 +5,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -651,7 +651,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
 				<VIN>VEH-1234567890</VIN>
@@ -697,7 +697,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
 				<VIN>VEH-2234567890</VIN>
@@ -768,7 +768,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 				</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
 				<VIN>VEH-2234567866</VIN>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
index a6155088be..5b12bea6be 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
@@ -5,8 +5,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"  
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"  
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -651,7 +651,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
 				<VIN>VEH-1234567890</VIN>
@@ -697,7 +697,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
 				<VIN>VEH-2234567890</VIN>
@@ -768,7 +768,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 				</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
 				<VIN>VEH-2234567866</VIN>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
index f8e59b4fef..b033b0fbac 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
@@ -5,8 +5,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -651,7 +651,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
 				<VIN>VEH-1234567890</VIN>
@@ -697,7 +697,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
 				<VIN>VEH-2234567890</VIN>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
index e628c2d947..3d9866059d 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
@@ -5,8 +5,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -651,7 +651,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
 				<VIN>VEH-1234567890</VIN>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
index 92aae76f37..6d37f14e3b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
@@ -5,8 +5,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -651,7 +651,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle"  xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle"  xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
 				<VIN>VEH-1234567890</VIN>
@@ -697,7 +697,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle"  xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle"  xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
 				<VIN>VEH-2234567890</VIN>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
index f75ed2dd82..92f86a152c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
	<PrimaryVehicle>
		<Data id="text" xsi:type="PrimaryVehicleDataType">
			<Vehicle xsi:type="VehiclePIFType">
				<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
				<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
				<Model>Generic Model</Model>
				<VIN>VEH-1234567890_nonSmart-ESS</VIN>
				<Date>2017-02-15T11:00:00Z</Date>
				<LegislativeCategory>M3</LegislativeCategory>
				<ChassisConfiguration>Bus</ChassisConfiguration>
				<AxleConfiguration>8x2</AxleConfiguration>
				<Articulated>true</Articulated>
				<TechnicalPermissibleMaximumLadenMass>4000</TechnicalPermissibleMaximumLadenMass>
				<IdlingSpeed>600</IdlingSpeed>
				<RetarderType>Transmission Output Retarder</RetarderType>
				<RetarderRatio>1.000</RetarderRatio>
				<AngledriveType>None</AngledriveType>
				<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
				<ADAS xsi:type="v2.3:AdvancedDriverAssistantSystemsType">
					<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
					<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
					<v2.3:EcoRollWithEngineStop>true</v2.3:EcoRollWithEngineStop>
					<v2.3:PredictiveCruiseControl>1,2,3</v2.3:PredictiveCruiseControl>
					<v2.3:APTEcoRollReleaseLockupClutch>false</v2.3:APTEcoRollReleaseLockupClutch>
				</ADAS>
				<TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
					<tcl:Entry gear="6" maxTorque="1800"/>
					<tcl:Entry gear="1" maxTorque="2500"/>
					<tcl:Entry gear="12" maxTorque="1900"/>
				</TorqueLimits>
				<Components xsi:type="VehicleComponentsPIFType">
					<Engine>
						<Data xsi:type="EngineDataPIFType">
							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
							<Model>Bus 6x2</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>1800</RatedSpeed>
							<RatedPower>325032</RatedPower>
							<MaxEngineTorque>2134</MaxEngineTorque>
							<WHRType>
								<v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
								<v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
								<v2.3:ElectricalOutput>true</v2.3: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>
								<Fuels>
									<FuelType>Diesel CI</FuelType>
								</Fuels>
							</Mode>
						</Data>
					</Engine>
					<Transmission>
						<Data xsi:type="TransmissionDataPIFType">
							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
							<Model>Generic 40t Long Haul Truck Gearbox</Model>
							<MainCertificationMethod>Standard values</MainCertificationMethod>
							<CertificationNumber>Trans-5464sdf6sdf555</CertificationNumber>
							<Date>2017-01-11T11:00:00Z</Date>
							<AppVersion>3.0.1</AppVersion>
							<TransmissionType>AMT</TransmissionType>
							<Gears xsi:type="TransmissionGearsPIFType">
								<Gear number="1">
									<Ratio>14.930</Ratio>
									<MaxTorque>1900</MaxTorque>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="2">
									<Ratio>11.640</Ratio>
									<MaxTorque>1900</MaxTorque>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="3">
									<Ratio>9.020</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="4">
									<Ratio>7.040</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="5">
									<Ratio>5.640</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="6">
									<Ratio>4.400</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="7">
									<Ratio>3.390</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="8">
									<Ratio>2.650</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="9">
									<Ratio>2.050</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="10">
									<Ratio>1.600</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="11">
									<Ratio>1.280</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="12">
									<Ratio>1.000</Ratio>
								</Gear>
							</Gears>
						</Data>
					</Transmission>
					<TorqueConverter>
						<Data xsi:type="TorqueConverterDataPIFType">
							<Manufacturer>Generic Torque Converter</Manufacturer>
							<Model>Generic Torque Converter Model</Model>
							<CertificationMethod>Standard values</CertificationMethod>
							<CertificationNumber>Torq-4546565455</CertificationNumber>
							<Date>2018-01-12T12:00:00Z</Date>
							<AppVersion>3.0.3</AppVersion>
							<Characteristics>
								<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
								<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
								<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
							</Characteristics>
						</Data>
					</TorqueConverter>
					<Angledrive>
						<Data xsi:type="AngledriveDataPIFType">
							<Manufacturer>Generic Angledrive</Manufacturer>
							<Model>Generic Angledrive Model</Model>
							<CertificationMethod>Standard values</CertificationMethod>
							<CertificationNumber>ANG-Z64665456654</CertificationNumber>
							<Date>2019-01-12T12:00:00Z</Date>
							<AppVersion>3.2.3</AppVersion>
							<Ratio>20</Ratio>
						</Data>
					</Angledrive>
					<Axlegear>
						<Data xsi:type="AxlegearDataPIFType">
							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
							<Model>Generic 40t Long Haul Truck AxleGear</Model>
							<CertificationMethod>Standard values</CertificationMethod>
							<CertificationNumber>AX-6654888s5f4</CertificationNumber>
							<Date>2017-01-11T11:00:00Z</Date>
							<AppVersion>3.0.1</AppVersion>
							<LineType>Single portal axle</LineType>
							<Ratio>2.590</Ratio>
						</Data>
					</Axlegear>
					<AxleWheels>
						<Data xsi:type="AxleWheelsDataPIFType">
							<Axles>
								<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
									<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
									<v2.0:TwinTyres>false</v2.0:TwinTyres>
									<v2.0:Steered>true</v2.0:Steered>
									<v2.0:Tyre>
										<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
											<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
											<v2.0:Model>Generic Wheel</v2.0:Model>
											<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
											<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
											<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
											<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
											<v2.0:RRCDeclared>0.0055</v2.0:RRCDeclared>
											<v2.0:FzISO>31300</v2.0:FzISO>
										</v2.0:Data>
										<v2.0:Signature>
											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
												<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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
											</di:Reference>
										</v2.0:Signature>
									</v2.0:Tyre>
								</Axle>
								<Axle axleNumber="2" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
									<v2.0:AxleType>VehicleDriven</v2.0:AxleType>
									<v2.0:TwinTyres>true</v2.0:TwinTyres>
									<v2.0:Steered>false</v2.0:Steered>
									<v2.0:Tyre>
										<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
											<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
											<v2.0:Model>Generic Wheel</v2.0:Model>
											<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
											<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
											<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
											<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
											<v2.0:RRCDeclared>0.0063</v2.0:RRCDeclared>
											<v2.0:FzISO>31300</v2.0:FzISO>
										</v2.0:Data>
										<v2.0:Signature>
											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
												<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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
											</di:Reference>
										</v2.0:Signature>
									</v2.0:Tyre>
								</Axle>
								<Axle axleNumber="3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
									<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
									<v2.0:TwinTyres>false</v2.0:TwinTyres>
									<v2.0:Steered>false</v2.0:Steered>
									<v2.0:Tyre>
										<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
											<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
											<v2.0:Model>Generic Wheel</v2.0:Model>
											<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
											<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
											<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
											<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
											<v2.0:RRCDeclared>0.0055</v2.0:RRCDeclared>
											<v2.0:FzISO>31300</v2.0:FzISO>
										</v2.0:Data>
										<v2.0:Signature>
											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
												<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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
											</di:Reference>
										</v2.0:Signature>
									</v2.0:Tyre>
								</Axle>
							</Axles>
						</Data>
					</AxleWheels>
					<Auxiliaries>
						<Data xsi:type="AuxiliaryDataPIFType">
							<Fan>
								<Technology>Hydraulic driven - Constant displacement pump</Technology>
							</Fan>
							<SteeringPump>
								<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
							</SteeringPump>
							<ElectricSystem>
								<AlternatorTechnology>smart</AlternatorTechnology>
								<SmartAlternator>
									<RatedCurrent>10</RatedCurrent>
									<RatedVoltage>12</RatedVoltage>
									</SmartAlternator>
									<Battery>
									<BatteryTechnology>lead-acid battery – conventional</BatteryTechnology>
									<RatedCapacity>50</RatedCapacity>
									<NominalVoltage>12</NominalVoltage>
									</Battery>
									<Capacitor>
										<CapacitorTechnology></CapacitorTechnology>
										<RatedCapacitance>30</RatedCapacitance>
										<RatedVoltage>3</RatedVoltage>
									</Capacitor>
								<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
							</ElectricSystem>
							<PneumaticSystem>
								<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
								<CompressorDrive>electrically</CompressorDrive>
								<Clutch>none</Clutch>
								<CompressorRatio>1.000</CompressorRatio>
								<SmartCompressionSystem>true</SmartCompressionSystem>
								<SmartRegenerationSystem>false</SmartRegenerationSystem>
								<AirsuspensionControl>electronically</AirsuspensionControl>
								<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
							</PneumaticSystem>
							<HVAC>
								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
								<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
							</HVAC>
						</Data>
					</Auxiliaries>
				</Components>
			</Vehicle>
			<InputDataSignature>
				<di:Reference URI="#VEH-PrimaryBus_SmartPS">
					<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>uqcFIXtDYxvl513ruiYYJCrV1fIiyw37t8vJhg4xxoo=</di:DigestValue>
				</di:Reference>
			</InputDataSignature>
			<ManufacturerRecordSignature>
				<di:Reference URI="#RESULT-5f30c7fe665a47938f6b">
					<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>KUpFCKh1bu/YPwYj36kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
				</di:Reference>
			</ManufacturerRecordSignature>
			<Results>
				<Status>success</Status>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
						<Payload unit="kg">1352.52</Payload>
						<PassengerCount>19.89</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">21.22359</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1555.73</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
						<Payload unit="kg">6762.60</Payload>
						<PassengerCount>99.45</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">25.40945</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1862.57</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
						<Payload unit="kg">1352.52</Payload>
						<PassengerCount>19.89</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">16.74101</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1227.15</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
						<Payload unit="kg">6762.60</Payload>
						<PassengerCount>99.45</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">20.24221</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1483.80</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
						<Payload unit="kg">1352.52</Payload>
						<PassengerCount>19.89</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">14.34578</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1051.58</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
						<Payload unit="kg">6762.60</Payload>
						<PassengerCount>99.45</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">17.60016</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1290.13</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
						<Payload unit="kg">1294.51</Payload>
						<PassengerCount>18.23</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">11.82313</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">866.66</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
						<Payload unit="kg">4236.57</Payload>
						<PassengerCount>59.67</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">13.24283</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">970.73</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
						<Payload unit="kg">1578.29</Payload>
						<PassengerCount>23.21</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">22.72091</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1665.49</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
						<Payload unit="kg">7891.43</Payload>
						<PassengerCount>116.05</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">27.95930</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">2049.48</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
						<Payload unit="kg">1578.29</Payload>
						<PassengerCount>23.21</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">17.90756</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1312.66</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
						<Payload unit="kg">7891.43</Payload>
						<PassengerCount>116.05</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">22.23796</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1630.09</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
						<Payload unit="kg">1578.29</Payload>
						<PassengerCount>23.21</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">15.28035</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1120.08</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
						<Payload unit="kg">7891.43</Payload>
						<PassengerCount>116.05</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">19.26201</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1411.95</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16467.68</TotalVehicleMass>
						<Payload unit="kg">1254.68</Payload>
						<PassengerCount>17.67</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">11.93701</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">875.01</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
						<Payload unit="kg">4106.21</Payload>
						<PassengerCount>57.83</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">13.32341</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">976.63</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16490.49</TotalVehicleMass>
						<Payload unit="kg">1277.49</Payload>
						<PassengerCount>17.99</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">8.71847</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">639.08</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">18406.72</TotalVehicleMass>
						<Payload unit="kg">3193.72</Payload>
						<PassengerCount>44.98</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">9.20255</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">674.57</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">19588.08</TotalVehicleMass>
						<Payload unit="kg">1738.08</Payload>
						<PassengerCount>24.48</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">13.58335</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">995.69</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
						<Payload unit="kg">5793.60</Payload>
						<PassengerCount>81.60</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">15.56740</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1141.12</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">19703.95</TotalVehicleMass>
						<Payload unit="kg">1853.95</Payload>
						<PassengerCount>26.11</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">9.82937</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">720.51</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22484.88</TotalVehicleMass>
						<Payload unit="kg">4634.88</Payload>
						<PassengerCount>65.28</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">10.56728</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">774.60</CO2>
				</Result>
			</Results>
			<ApplicationInformation>
				<SimulationToolVersion>String</SimulationToolVersion>
				<Date>2017-01-01T00:00:00Z</Date>
			</ApplicationInformation>
		</Data>
		<Signature>
			<di:Reference URI="#PIF-d10aff76c5d149948046">
				<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>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
			</di:Reference>
		</Signature>
	</PrimaryVehicle>
</VectoOutputMultistep>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
	<PrimaryVehicle>
		<Data id="text" xsi:type="PrimaryVehicleDataType">
			<Vehicle xsi:type="VehiclePIFType">
				<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
				<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
				<Model>Generic Model</Model>
				<VIN>VEH-1234567890_nonSmart-ESS</VIN>
				<Date>2017-02-15T11:00:00Z</Date>
				<LegislativeCategory>M3</LegislativeCategory>
				<ChassisConfiguration>Bus</ChassisConfiguration>
				<AxleConfiguration>8x2</AxleConfiguration>
				<Articulated>true</Articulated>
				<TechnicalPermissibleMaximumLadenMass>4000</TechnicalPermissibleMaximumLadenMass>
				<IdlingSpeed>600</IdlingSpeed>
				<RetarderType>Transmission Output Retarder</RetarderType>
				<RetarderRatio>1.000</RetarderRatio>
				<AngledriveType>None</AngledriveType>
				<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
				<ADAS xsi:type="v2.3:AdvancedDriverAssistantSystemsType">
					<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
					<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
					<v2.3:EcoRollWithEngineStop>true</v2.3:EcoRollWithEngineStop>
					<v2.3:PredictiveCruiseControl>1,2,3</v2.3:PredictiveCruiseControl>
					<v2.3:APTEcoRollReleaseLockupClutch>false</v2.3:APTEcoRollReleaseLockupClutch>
				</ADAS>
				<TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
					<tcl:Entry gear="6" maxTorque="1800"/>
					<tcl:Entry gear="1" maxTorque="2500"/>
					<tcl:Entry gear="12" maxTorque="1900"/>
				</TorqueLimits>
				<Components xsi:type="VehicleComponentsPIFType">
					<Engine>
						<Data xsi:type="EngineDataPIFType">
							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
							<Model>Bus 6x2</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>1800</RatedSpeed>
							<RatedPower>325032</RatedPower>
							<MaxEngineTorque>2134</MaxEngineTorque>
							<WHRType>
								<v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
								<v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
								<v2.3:ElectricalOutput>true</v2.3: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>
								<Fuels>
									<FuelType>Diesel CI</FuelType>
								</Fuels>
							</Mode>
						</Data>
					</Engine>
					<Transmission>
						<Data xsi:type="TransmissionDataPIFType">
							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
							<Model>Generic 40t Long Haul Truck Gearbox</Model>
							<MainCertificationMethod>Standard values</MainCertificationMethod>
							<CertificationNumber>Trans-5464sdf6sdf555</CertificationNumber>
							<Date>2017-01-11T11:00:00Z</Date>
							<AppVersion>3.0.1</AppVersion>
							<TransmissionType>AMT</TransmissionType>
							<Gears xsi:type="TransmissionGearsPIFType">
								<Gear number="1">
									<Ratio>14.930</Ratio>
									<MaxTorque>1900</MaxTorque>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="2">
									<Ratio>11.640</Ratio>
									<MaxTorque>1900</MaxTorque>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="3">
									<Ratio>9.020</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="4">
									<Ratio>7.040</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="5">
									<Ratio>5.640</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="6">
									<Ratio>4.400</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="7">
									<Ratio>3.390</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="8">
									<Ratio>2.650</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="9">
									<Ratio>2.050</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="10">
									<Ratio>1.600</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="11">
									<Ratio>1.280</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="12">
									<Ratio>1.000</Ratio>
								</Gear>
							</Gears>
						</Data>
					</Transmission>
					<TorqueConverter>
						<Data xsi:type="TorqueConverterDataPIFType">
							<Manufacturer>Generic Torque Converter</Manufacturer>
							<Model>Generic Torque Converter Model</Model>
							<CertificationMethod>Standard values</CertificationMethod>
							<CertificationNumber>Torq-4546565455</CertificationNumber>
							<Date>2018-01-12T12:00:00Z</Date>
							<AppVersion>3.0.3</AppVersion>
							<Characteristics>
								<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
								<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
								<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
							</Characteristics>
						</Data>
					</TorqueConverter>
					<Angledrive>
						<Data xsi:type="AngledriveDataPIFType">
							<Manufacturer>Generic Angledrive</Manufacturer>
							<Model>Generic Angledrive Model</Model>
							<CertificationMethod>Standard values</CertificationMethod>
							<CertificationNumber>ANG-Z64665456654</CertificationNumber>
							<Date>2019-01-12T12:00:00Z</Date>
							<AppVersion>3.2.3</AppVersion>
							<Ratio>20</Ratio>
						</Data>
					</Angledrive>
					<Axlegear>
						<Data xsi:type="AxlegearDataPIFType">
							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
							<Model>Generic 40t Long Haul Truck AxleGear</Model>
							<CertificationMethod>Standard values</CertificationMethod>
							<CertificationNumber>AX-6654888s5f4</CertificationNumber>
							<Date>2017-01-11T11:00:00Z</Date>
							<AppVersion>3.0.1</AppVersion>
							<LineType>Single portal axle</LineType>
							<Ratio>2.590</Ratio>
						</Data>
					</Axlegear>
					<AxleWheels>
						<Data xsi:type="AxleWheelsDataPIFType">
							<Axles>
								<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
									<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
									<v2.0:TwinTyres>false</v2.0:TwinTyres>
									<v2.0:Steered>true</v2.0:Steered>
									<v2.0:Tyre>
										<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
											<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
											<v2.0:Model>Generic Wheel</v2.0:Model>
											<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
											<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
											<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
											<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
											<v2.0:RRCDeclared>0.0055</v2.0:RRCDeclared>
											<v2.0:FzISO>31300</v2.0:FzISO>
										</v2.0:Data>
										<v2.0:Signature>
											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
												<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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
											</di:Reference>
										</v2.0:Signature>
									</v2.0:Tyre>
								</Axle>
								<Axle axleNumber="2" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
									<v2.0:AxleType>VehicleDriven</v2.0:AxleType>
									<v2.0:TwinTyres>true</v2.0:TwinTyres>
									<v2.0:Steered>false</v2.0:Steered>
									<v2.0:Tyre>
										<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
											<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
											<v2.0:Model>Generic Wheel</v2.0:Model>
											<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
											<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
											<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
											<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
											<v2.0:RRCDeclared>0.0063</v2.0:RRCDeclared>
											<v2.0:FzISO>31300</v2.0:FzISO>
										</v2.0:Data>
										<v2.0:Signature>
											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
												<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>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
											</di:Reference>
										</v2.0:Signature>
									</v2.0:Tyre>
								</Axle>
								<Axle axleNumber="3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
									<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
									<v2.0:TwinTyres>false</v2.0:TwinTyres>
									<v2.0:Steered>false</v2.0:Steered>
									<v2.0:Tyre>
										<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
											<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
											<v2.0:Model>Generic Wheel</v2.0:Model>
											<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
											<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
											<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
											<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
											<v2.0:RRCDeclared>0.0055</v2.0:RRCDeclared>
											<v2.0:FzISO>31300</v2.0:FzISO>
										</v2.0:Data>
										<v2.0:Signature>
											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
												<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>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
											</di:Reference>
										</v2.0:Signature>
									</v2.0:Tyre>
								</Axle>
							</Axles>
						</Data>
					</AxleWheels>
					<Auxiliaries>
						<Data xsi:type="AuxiliaryDataPIFType">
							<Fan>
								<Technology>Hydraulic driven - Constant displacement pump</Technology>
							</Fan>
							<SteeringPump>
								<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
							</SteeringPump>
							<ElectricSystem>
								<AlternatorTechnology>smart</AlternatorTechnology>
								<SmartAlternator>
									<RatedCurrent>10</RatedCurrent>
									<RatedVoltage>12</RatedVoltage>
									</SmartAlternator>
									<Battery>
									<BatteryTechnology>lead-acid battery – conventional</BatteryTechnology>
									<RatedCapacity>50</RatedCapacity>
									<NominalVoltage>12</NominalVoltage>
									</Battery>
									<Capacitor>
										<CapacitorTechnology></CapacitorTechnology>
										<RatedCapacitance>30</RatedCapacitance>
										<RatedVoltage>3</RatedVoltage>
									</Capacitor>
								<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
							</ElectricSystem>
							<PneumaticSystem>
								<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
								<CompressorDrive>electrically</CompressorDrive>
								<Clutch>none</Clutch>
								<CompressorRatio>1.000</CompressorRatio>
								<SmartCompressionSystem>true</SmartCompressionSystem>
								<SmartRegenerationSystem>false</SmartRegenerationSystem>
								<AirsuspensionControl>electronically</AirsuspensionControl>
								<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
							</PneumaticSystem>
							<HVAC>
								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
								<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
							</HVAC>
						</Data>
					</Auxiliaries>
				</Components>
			</Vehicle>
			<InputDataSignature>
				<di:Reference URI="#VEH-PrimaryBus_SmartPS">
					<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>uqcFIXtDYxvl513ruiYYJCrV1fIiyw37t8vJhg4xxoo=</di:DigestValue>
				</di:Reference>
			</InputDataSignature>
			<ManufacturerRecordSignature>
				<di:Reference URI="#RESULT-5f30c7fe665a47938f6b">
					<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>KUpFCKh1bu/YPwYj36kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
				</di:Reference>
			</ManufacturerRecordSignature>
			<Results>
				<Status>success</Status>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
						<Payload unit="kg">1352.52</Payload>
						<PassengerCount>19.89</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">21.22359</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1555.73</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
						<Payload unit="kg">6762.60</Payload>
						<PassengerCount>99.45</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">25.40945</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1862.57</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
						<Payload unit="kg">1352.52</Payload>
						<PassengerCount>19.89</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">16.74101</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1227.15</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
						<Payload unit="kg">6762.60</Payload>
						<PassengerCount>99.45</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">20.24221</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1483.80</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
						<Payload unit="kg">1352.52</Payload>
						<PassengerCount>19.89</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">14.34578</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1051.58</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
						<Payload unit="kg">6762.60</Payload>
						<PassengerCount>99.45</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">17.60016</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1290.13</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
						<Payload unit="kg">1294.51</Payload>
						<PassengerCount>18.23</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">11.82313</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">866.66</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
						<Payload unit="kg">4236.57</Payload>
						<PassengerCount>59.67</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">13.24283</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">970.73</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
						<Payload unit="kg">1578.29</Payload>
						<PassengerCount>23.21</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">22.72091</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1665.49</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
						<Payload unit="kg">7891.43</Payload>
						<PassengerCount>116.05</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">27.95930</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">2049.48</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
						<Payload unit="kg">1578.29</Payload>
						<PassengerCount>23.21</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">17.90756</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1312.66</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
						<Payload unit="kg">7891.43</Payload>
						<PassengerCount>116.05</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">22.23796</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1630.09</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
						<Payload unit="kg">1578.29</Payload>
						<PassengerCount>23.21</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">15.28035</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1120.08</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
						<Payload unit="kg">7891.43</Payload>
						<PassengerCount>116.05</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">19.26201</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1411.95</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16467.68</TotalVehicleMass>
						<Payload unit="kg">1254.68</Payload>
						<PassengerCount>17.67</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">11.93701</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">875.01</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
						<Payload unit="kg">4106.21</Payload>
						<PassengerCount>57.83</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">13.32341</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">976.63</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16490.49</TotalVehicleMass>
						<Payload unit="kg">1277.49</Payload>
						<PassengerCount>17.99</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">8.71847</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">639.08</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">18406.72</TotalVehicleMass>
						<Payload unit="kg">3193.72</Payload>
						<PassengerCount>44.98</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">9.20255</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">674.57</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">19588.08</TotalVehicleMass>
						<Payload unit="kg">1738.08</Payload>
						<PassengerCount>24.48</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">13.58335</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">995.69</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
						<Payload unit="kg">5793.60</Payload>
						<PassengerCount>81.60</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">15.56740</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1141.12</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">19703.95</TotalVehicleMass>
						<Payload unit="kg">1853.95</Payload>
						<PassengerCount>26.11</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">9.82937</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">720.51</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22484.88</TotalVehicleMass>
						<Payload unit="kg">4634.88</Payload>
						<PassengerCount>65.28</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">10.56728</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">774.60</CO2>
				</Result>
			</Results>
			<ApplicationInformation>
				<SimulationToolVersion>String</SimulationToolVersion>
				<Date>2017-01-01T00:00:00Z</Date>
			</ApplicationInformation>
		</Data>
		<Signature>
			<di:Reference URI="#PIF-d10aff76c5d149948046">
				<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>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
			</di:Reference>
		</Signature>
	</PrimaryVehicle>
</VectoOutputMultistep>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
index b9e72b4281..8c6b5476a3 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
@@ -5,8 +5,8 @@ xmlns:di="http://www.w3.org/2000/09/xmldsig#"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -686,7 +686,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
 				<VIN>VEH-2234567890</VIN>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
index d5df6890b2..b0a719de61 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
@@ -5,8 +5,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -584,7 +584,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
 				<VIN>VEH-1234567890</VIN>
@@ -619,7 +619,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
 				<ManufacturerAddress></ManufacturerAddress>
 				<VIN>VEH-2234567890</VIN>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
index ac8044ac8f..c9c9747200 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
@@ -5,8 +5,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -651,7 +651,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+67QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
 				<VIN>VIN-132564</VIN>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
index d143f41837..4eca8efd6a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
@@ -5,8 +5,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
-xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -651,7 +651,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStep>
-			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
 				<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
 				<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
 				<VIN>adfas</VIN>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_full-sample.xml
index 691e8c7ac7..c68f769354 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_full-sample.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
index 3d81eeb167..8f1ad092fa 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusType">
		<Manufacturer>Some Manufacturer 1</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>7000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
		<BodyworkCode>CC</BodyworkCode>
		<LowEntry>false</LowEntry>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusType">
		<Manufacturer>Some Manufacturer 1</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>7000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
		<BodyworkCode>CC</BodyworkCode>
		<LowEntry>false</LowEntry>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
index 7b64371181..ce5dfa4a45 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
+<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_mandatory_entries.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_mandatory_entries.xml
index 7aecb041c5..71c1adaf12 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_mandatory_entries.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_mandatory_entries.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusType" >
		<Manufacturer>Some Manufacturer 3</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_CompletedBusType" >
		<Manufacturer>Some Manufacturer 3</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_exempted.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_exempted.xml
index e8c42c7e40..32bd949e65 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_exempted.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_exempted.xml
@@ -3,7 +3,7 @@
 <tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
 													xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" schemaVersion="1.0"
 													xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0"
-													xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD/VectoInput.xsd"
+													xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 v:\VectoCore\VectoCore\Resources\XSD/VectoInput.1.0.xsd"
 													xmlns:di="http://www.w3.org/2000/09/xmldsig#">
 	<Vehicle id="VEH-1234567890">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_full-sample.xml
index a302b9e778..f04ac95f9b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_full-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
		<Manufacturer>Some Manufacturer</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>500</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
		<NgTankSystem>Compressed</NgTankSystem>
		<ClassBus>II+III</ClassBus>
		<NumberPassengerSeatsLowerDeck>0</NumberPassengerSeatsLowerDeck>
		<NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
		<NumberPassengerSeatsUpperDeck>10</NumberPassengerSeatsUpperDeck>
		<NumberPassengersStandingUpperDeck>10</NumberPassengersStandingUpperDeck>
		<BodyworkCode>CB</BodyworkCode>
		<LowEntry>false</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>9500</VehicleLength>
		<VehicleWidth>2500</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<DoorDriveTechnology>electric</DoorDriveTechnology>
		<VehicleDeclarationType>interim</VehicleDeclarationType>
		<ADAS xsi:type="ADAS_Conventional_Type">
			<EngineStopStart>true</EngineStopStart>
			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
			<PredictiveCruiseControl>none</PredictiveCruiseControl>
			<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="Components_Conventional_CompletedBusType">
			<AirDrag>
				<v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX23h">
					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
					<v2.0:Model>Generic Model</v2.0:Model>
					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
			<Auxiliaries>
				<Data xsi:type="AUX_Conventional_CompletedBusType">
					<ElectricSystem>
						<LEDLights>
							<Interiorlights>false</Interiorlights>
							<Dayrunninglights>true</Dayrunninglights>
							<Positionlights>true</Positionlights>
							<Brakelights>true</Brakelights>
							<Headlights>false</Headlights>
						</LEDLights>		
					</ElectricSystem>
					<HVAC>
						<SystemConfiguration>0</SystemConfiguration>
						<HeatPumpTypeDriverCompartment>
							<Cooling>none</Cooling>
							<Heating>none</Heating>
						</HeatPumpTypeDriverCompartment>
						<HeatPumpTypePassengerCompartment>
							<Cooling>non R-744 2-stage</Cooling>
							<Heating>none</Heating>
						</HeatPumpTypePassengerCompartment>
						<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
						<DoubleGlazing>false</DoubleGlazing>
						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
		<Manufacturer>Some Manufacturer</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>500</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
		<NgTankSystem>Compressed</NgTankSystem>
		<ClassBus>II+III</ClassBus>
		<NumberPassengerSeatsLowerDeck>0</NumberPassengerSeatsLowerDeck>
		<NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
		<NumberPassengerSeatsUpperDeck>10</NumberPassengerSeatsUpperDeck>
		<NumberPassengersStandingUpperDeck>10</NumberPassengersStandingUpperDeck>
		<BodyworkCode>CB</BodyworkCode>
		<LowEntry>false</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>9500</VehicleLength>
		<VehicleWidth>2500</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<DoorDriveTechnology>electric</DoorDriveTechnology>
		<VehicleDeclarationType>interim</VehicleDeclarationType>
		<ADAS xsi:type="ADAS_Conventional_Type">
			<EngineStopStart>true</EngineStopStart>
			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
			<PredictiveCruiseControl>none</PredictiveCruiseControl>
			<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="Components_Conventional_CompletedBusType">
			<AirDrag>
				<v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX23h">
					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
					<v2.0:Model>Generic Model</v2.0:Model>
					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
			<Auxiliaries>
				<Data xsi:type="AUX_Conventional_CompletedBusType">
					<ElectricSystem>
						<LEDLights>
							<Interiorlights>false</Interiorlights>
							<Dayrunninglights>true</Dayrunninglights>
							<Positionlights>true</Positionlights>
							<Brakelights>true</Brakelights>
							<Headlights>false</Headlights>
						</LEDLights>		
					</ElectricSystem>
					<HVAC>
						<SystemConfiguration>0</SystemConfiguration>
						<HeatPumpTypeDriverCompartment>
							<Cooling>none</Cooling>
							<Heating>none</Heating>
						</HeatPumpTypeDriverCompartment>
						<HeatPumpTypePassengerCompartment>
							<Cooling>non R-744 2-stage</Cooling>
							<Heating>none</Heating>
						</HeatPumpTypePassengerCompartment>
						<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
						<DoubleGlazing>false</DoubleGlazing>
						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries01-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
index bd79ab2489..c792951449 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
		<Manufacturer>Some Manufacturer 1</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model 2</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>5000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
		<NgTankSystem>Compressed</NgTankSystem>
		<ClassBus>A</ClassBus>
		<BodyworkCode>CG</BodyworkCode>
		<LowEntry>true</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>10000</VehicleLength>
		<VehicleWidth>2600</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
		<VehicleDeclarationType>interim</VehicleDeclarationType>
		<ADAS xsi:type="ADAS_Conventional_Type">
			<EngineStopStart>true</EngineStopStart>
			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
			<PredictiveCruiseControl>none</PredictiveCruiseControl>
			<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="Components_Conventional_CompletedBusType">
			<Auxiliaries>
				<Data xsi:type="AUX_Conventional_CompletedBusType">
					<ElectricSystem>
						<LEDLights>
							<Interiorlights>false</Interiorlights>
							<Dayrunninglights>true</Dayrunninglights>
							<Headlights>false</Headlights>
						</LEDLights>		
					</ElectricSystem>
					<HVAC>
						<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
						<DoubleGlazing>false</DoubleGlazing>
						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
		<Manufacturer>Some Manufacturer 1</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model 2</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>5000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
		<NgTankSystem>Compressed</NgTankSystem>
		<ClassBus>A</ClassBus>
		<BodyworkCode>CG</BodyworkCode>
		<LowEntry>true</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>10000</VehicleLength>
		<VehicleWidth>2600</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
		<VehicleDeclarationType>interim</VehicleDeclarationType>
		<ADAS xsi:type="ADAS_Conventional_Type">
			<EngineStopStart>true</EngineStopStart>
			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
			<PredictiveCruiseControl>none</PredictiveCruiseControl>
			<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="Components_Conventional_CompletedBusType">
			<Auxiliaries>
				<Data xsi:type="AUX_Conventional_CompletedBusType">
					<ElectricSystem>
						<LEDLights>
							<Interiorlights>false</Interiorlights>
							<Dayrunninglights>true</Dayrunninglights>
							<Headlights>false</Headlights>
						</LEDLights>		
					</ElectricSystem>
					<HVAC>
						<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
						<DoubleGlazing>false</DoubleGlazing>
						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries02-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
index b251809847..1fdead4aca 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
		<Manufacturer>Some Manufacturer 2</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>500</CorrectedActualMass>
		<NgTankSystem>Compressed</NgTankSystem>
		<ClassBus>II+III</ClassBus>
		<NumberPassengerSeatsLowerDeck>0</NumberPassengerSeatsLowerDeck>
		<NumberPassengersStandingLowerDeck>5</NumberPassengersStandingLowerDeck>
		<NumberPassengerSeatsUpperDeck>10</NumberPassengerSeatsUpperDeck>
		<NumberPassengersStandingUpperDeck>0</NumberPassengersStandingUpperDeck>
		<BodyworkCode>CB</BodyworkCode>
		<LowEntry>false</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>9500</VehicleLength>
		<VehicleWidth>2500</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<VehicleDeclarationType>interim</VehicleDeclarationType>
		<ADAS xsi:type="ADAS_Conventional_Type">
			<EngineStopStart>true</EngineStopStart>
			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
			<PredictiveCruiseControl>none</PredictiveCruiseControl>
			<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="Components_Conventional_CompletedBusType">
			<AirDrag>
				<v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX23h">
					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
					<v2.0:Model>Generic Model</v2.0:Model>
					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
			<Auxiliaries>
				<Data xsi:type="AUX_Conventional_CompletedBusType">
					<HVAC>
						<SystemConfiguration>0</SystemConfiguration>
						<HeatPumpTypeDriverCompartment>
							<Cooling>none</Cooling>
							<Heating>none</Heating>
						</HeatPumpTypeDriverCompartment>
						<HeatPumpTypePassengerCompartment>
							<Cooling>none</Cooling>
							<Heating>non R-744 2-stage</Heating>
						</HeatPumpTypePassengerCompartment>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
		<Manufacturer>Some Manufacturer 2</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>500</CorrectedActualMass>
		<NgTankSystem>Compressed</NgTankSystem>
		<ClassBus>II+III</ClassBus>
		<NumberPassengerSeatsLowerDeck>0</NumberPassengerSeatsLowerDeck>
		<NumberPassengersStandingLowerDeck>5</NumberPassengersStandingLowerDeck>
		<NumberPassengerSeatsUpperDeck>10</NumberPassengerSeatsUpperDeck>
		<NumberPassengersStandingUpperDeck>0</NumberPassengersStandingUpperDeck>
		<BodyworkCode>CB</BodyworkCode>
		<LowEntry>false</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>9500</VehicleLength>
		<VehicleWidth>2500</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<VehicleDeclarationType>interim</VehicleDeclarationType>
		<ADAS xsi:type="ADAS_Conventional_Type">
			<EngineStopStart>true</EngineStopStart>
			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
			<PredictiveCruiseControl>none</PredictiveCruiseControl>
			<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="Components_Conventional_CompletedBusType">
			<AirDrag>
				<v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX23h">
					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
					<v2.0:Model>Generic Model</v2.0:Model>
					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<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>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
			<Auxiliaries>
				<Data xsi:type="AUX_Conventional_CompletedBusType">
					<HVAC>
						<SystemConfiguration>0</SystemConfiguration>
						<HeatPumpTypeDriverCompartment>
							<Cooling>none</Cooling>
							<Heating>none</Heating>
						</HeatPumpTypeDriverCompartment>
						<HeatPumpTypePassengerCompartment>
							<Cooling>none</Cooling>
							<Heating>non R-744 2-stage</Heating>
						</HeatPumpTypePassengerCompartment>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_mandatory_entries.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_mandatory_entries.xml
index 11b38462dd..7bca53ff3c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_mandatory_entries.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_mandatory_entries.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
		<Manufacturer>Some Manufacturer 3</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<VehicleDeclarationType>interim</VehicleDeclarationType>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
		<Manufacturer>Some Manufacturer 3</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<VehicleDeclarationType>interim</VehicleDeclarationType>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp
index d8c324aac6..9fee6a2a66 100644
--- a/VectoCore/VectoXML.spp
+++ b/VectoCore/VectoXML.spp
@@ -116,7 +116,6 @@
 				<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\Conventional_primaryBus_AMT.xml" HomeFolder="Yes"/>
 				<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\HEV-S_primaryBus_AMT_S2.xml" HomeFolder="Yes"/>
 				<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\HEV-S_primaryBus_IEPC-S.xml" HomeFolder="Yes"/>
-				<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\HEV-S_primaryBus_IEPC-S_IEPC_Std.xml" HomeFolder="Yes"/>
 				<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\HEV-S_primaryBus_S3.xml" HomeFolder="Yes"/>
 				<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\HEV-S_primaryBus_S4.xml" HomeFolder="Yes"/>
 				<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\PrimaryBus\HEV_primaryBus_AMT_Px.xml" HomeFolder="Yes"/>
@@ -281,7 +280,6 @@
 			<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\engineSample_WHR.xml" HomeFolder="Yes"/>
 			<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\engineSampleDualModeDualFuel.xml"/>
 			<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vecto_tyre-sample.xml" HomeFolder="Yes"/>
-			<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vecto_vehicle-fullElectricSP.xml" HomeFolder="Yes"/>
 			<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vehicle_sampleDualModeDualFuel.xml"/>
 			<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vehicle_sampleDualModeDualFuel_WHR.xml" HomeFolder="Yes"/>
 			<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vehicle_sampleSingleModeDualFuel.xml" HomeFolder="Yes"/>
@@ -506,7 +504,6 @@
 			<File FilePath="VectoCore\Resources\XSD\VectoOutputManufacturer.0.8.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VectoOutputManufacturer.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VectoOutputMultistep.0.1.xsd" HomeFolder="Yes"/>
-			<File FilePath="VectoCore\Resources\XSD\VectoOutputPrimaryBus.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VTPReport.0.1.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VTPReport.0.2.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VTPReport.xsd" HomeFolder="Yes"/>
-- 
GitLab