From c66ee040357f932d81bd24a263f3433ecbc7e323 Mon Sep 17 00:00:00 2001
From: "VKMTHD\\haraldmartini" <martini@ivt.tugraz.at>
Date: Thu, 13 Jul 2023 14:49:08 +0200
Subject: [PATCH] updated generic vehicle files

---
 .../CompletedBus 31b2_NG-PI/airdrag.xml       |    2 +-
 .../input_airdragonly.xml                     |    2 +-
 .../CompletedBus 31b2_NG-PI/input_aux.xml     |    2 +-
 ...y_heavyBus group_P31_32_Smart_ES_NG-PI.xml |    6 +-
 .../vecto_vehicle-completed_heavyBus_31b.xml  |    2 +-
 .../completed_heavyBus_34f.VIF_Report_2.xml   | 1068 ++++++++---------
 ...mary_heavyBus group_P33_34_SmartPS.VIF.xml |  605 ----------
 .../vecto_vehicle-completed_heavyBus_39a.xml  |    2 +-
 ...imary_heavyBus group_P37_38_SmartES_PS.xml |    1 +
 .../Integration/GenericVehicleTest.cs         |    7 +-
 10 files changed, 540 insertions(+), 1157 deletions(-)
 delete mode 100644 Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.VIF.xml

diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/airdrag.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/airdrag.xml
index 68b28667f2..2733b9a646 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/airdrag.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/airdrag.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3_DF" 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:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3_DF" 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:AirDrag>
 		<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 			<Manufacturer>Generic Manufacturer</Manufacturer>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/input_airdragonly.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/input_airdragonly.xml
index 4d13801f3c..3533a571d3 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/input_airdragonly.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/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_NG-PI/input_aux.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/input_aux.xml
index 0103dbb159..54ee20aacd 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/input_aux.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/input_aux.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" 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>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/primary_heavyBus group_P31_32_Smart_ES_NG-PI.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/primary_heavyBus group_P31_32_Smart_ES_NG-PI.xml
index 8b71858e06..1b3ea89f99 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/primary_heavyBus group_P31_32_Smart_ES_NG-PI.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/primary_heavyBus group_P31_32_Smart_ES_NG-PI.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 xsi:type="v2.0:EngineComponentDeclarationType">
 				<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/CompletedBus 31b2_NG-PI/vecto_vehicle-completed_heavyBus_31b.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/vecto_vehicle-completed_heavyBus_31b.xml
index ed6fbe549d..65c63f8463 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/vecto_vehicle-completed_heavyBus_31b.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/vecto_vehicle-completed_heavyBus_31b.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:DEV: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>
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 13c3fca2ef..7e21aab70a 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,147 +1,166 @@
-<?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: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">
-        <vif0.1:ManufacturerPrimaryVehicle>Generic Bus Manufacturer</vif0.1:ManufacturerPrimaryVehicle>
-        <vif0.1:ManufacturerAddressPrimaryVehicle>Street, ZIP City</vif0.1:ManufacturerAddressPrimaryVehicle>
-        <vif0.1:Model>Generic Model</vif0.1:Model>
-        <vif0.1:VIN>VEH-1234567890_SmartPS</vif0.1:VIN>
-        <vif0.1:Date>2017-02-15T11:00:00Z</vif0.1:Date>
-        <vif0.1:LegislativeCategory>M3</vif0.1:LegislativeCategory>
-        <vif0.1:ChassisConfiguration>Bus</vif0.1:ChassisConfiguration>
-        <vif0.1:AxleConfiguration>6x2</vif0.1:AxleConfiguration>
-        <vif0.1:Articulated>false</vif0.1:Articulated>
-        <vif0.1:TechnicalPermissibleMaximumLadenMass>25000</vif0.1:TechnicalPermissibleMaximumLadenMass>
-        <vif0.1:IdlingSpeed>600</vif0.1:IdlingSpeed>
-        <vif0.1:RetarderType>Transmission Output Retarder</vif0.1:RetarderType>
-        <vif0.1:RetarderRatio>1.000</vif0.1:RetarderRatio>
-        <vif0.1:AngledriveType>None</vif0.1:AngledriveType>
-        <vif0.1:ZeroEmissionVehicle>false</vif0.1:ZeroEmissionVehicle>
-        <vif0.1:ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
-          <adas:EngineStopStart>false</adas:EngineStopStart>
-          <adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
-          <adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
-          <adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
-        </vif0.1:ADAS>
-        <vif0.1: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" />
-        </vif0.1:TorqueLimits>
-        <vif0.1:Components xsi:type="VehicleComponentsPIFType">
-          <vif0.1:Engine>
-            <vif0.1:Data xsi:type="EngineDataPIFType">
-              <vif0.1:Manufacturer>Generic Engine Manufacturer</vif0.1:Manufacturer>
-              <vif0.1:Model>Bus 6x2</vif0.1:Model>
-              <vif0.1:CertificationNumber>e12*0815/8051*2017/05E0000*00</vif0.1:CertificationNumber>
-              <vif0.1:Date>2017-02-15T11:00:00Z</vif0.1:Date>
-              <vif0.1:AppVersion>VectoEngine x.y</vif0.1:AppVersion>
-              <vif0.1:Displacement>12730</vif0.1:Displacement>
-              <vif0.1:RatedSpeed>1800</vif0.1:RatedSpeed>
-              <vif0.1:RatedPower>325032</vif0.1:RatedPower>
-              <vif0.1:MaxEngineTorque>2134</vif0.1:MaxEngineTorque>
-              <vif0.1:WHRType>
-                <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>
-                <vif0.1:FullLoadAndDragCurve>
-                  <vif0.1:Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00" />
-                  <vif0.1:Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00" />
-                  <vif0.1:Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00" />
-                  <vif0.1:Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00" />
-                  <vif0.1:Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00" />
-                  <vif0.1:Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00" />
-                  <vif0.1:Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00" />
-                  <vif0.1:Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00" />
-                  <vif0.1:Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00" />
-                  <vif0.1:Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00" />
-                </vif0.1:FullLoadAndDragCurve>
-                <vif0.1:Fuels>
-                  <vif0.1:FuelType>Diesel CI</vif0.1:FuelType>
-                </vif0.1:Fuels>
-              </vif0.1:Mode>
-            </vif0.1:Data>
-          </vif0.1:Engine>
-          <vif0.1:Transmission>
-            <vif0.1:Data xsi:type="TransmissionDataPIFType">
-              <vif0.1:Manufacturer>Generic Gearbox Manufacturer</vif0.1:Manufacturer>
-              <vif0.1:Model>Generic 40t Long Haul Truck Gearbox</vif0.1:Model>
-              <vif0.1:MainCertificationMethod>Standard values</vif0.1:MainCertificationMethod>
-              <vif0.1:Date>2017-01-11T11:00:00Z</vif0.1:Date>
-              <vif0.1:AppVersion>3.0.1</vif0.1:AppVersion>
-              <vif0.1:TransmissionType>AMT</vif0.1:TransmissionType>
-              <vif0.1:Gears xsi:type="TransmissionGearsPIFType">
-                <vif0.1:Gear number="1">
-                  <vif0.1:Ratio>14.930</vif0.1:Ratio>
-                  <vif0.1:MaxTorque>1900</vif0.1:MaxTorque>
-                  <vif0.1:MaxSpeed>2000</vif0.1:MaxSpeed>
-                </vif0.1:Gear>
-                <vif0.1:Gear number="2">
-                  <vif0.1:Ratio>11.640</vif0.1:Ratio>
-                  <vif0.1:MaxTorque>1900</vif0.1:MaxTorque>
-                  <vif0.1:MaxSpeed>2000</vif0.1:MaxSpeed>
-                </vif0.1:Gear>
-                <vif0.1:Gear number="3">
-                  <vif0.1:Ratio>9.020</vif0.1:Ratio>
-                  <vif0.1:MaxSpeed>2000</vif0.1:MaxSpeed>
-                </vif0.1:Gear>
-                <vif0.1:Gear number="4">
-                  <vif0.1:Ratio>7.040</vif0.1:Ratio>
-                  <vif0.1:MaxSpeed>2000</vif0.1:MaxSpeed>
-                </vif0.1:Gear>
-                <vif0.1:Gear number="5">
-                  <vif0.1:Ratio>5.640</vif0.1:Ratio>
-                  <vif0.1:MaxSpeed>2000</vif0.1:MaxSpeed>
-                </vif0.1:Gear>
-                <vif0.1:Gear number="6">
-                  <vif0.1:Ratio>4.400</vif0.1:Ratio>
-                  <vif0.1:MaxSpeed>2000</vif0.1:MaxSpeed>
-                </vif0.1:Gear>
-                <vif0.1:Gear number="7">
-                  <vif0.1:Ratio>3.390</vif0.1:Ratio>
-                  <vif0.1:MaxSpeed>2000</vif0.1:MaxSpeed>
-                </vif0.1:Gear>
-                <vif0.1:Gear number="8">
-                  <vif0.1:Ratio>2.650</vif0.1:Ratio>
-                  <vif0.1:MaxSpeed>2000</vif0.1:MaxSpeed>
-                </vif0.1:Gear>
-                <vif0.1:Gear number="9">
-                  <vif0.1:Ratio>2.050</vif0.1:Ratio>
-                  <vif0.1:MaxSpeed>2000</vif0.1:MaxSpeed>
-                </vif0.1:Gear>
-                <vif0.1:Gear number="10">
-                  <vif0.1:Ratio>1.600</vif0.1:Ratio>
-                  <vif0.1:MaxSpeed>2000</vif0.1:MaxSpeed>
-                </vif0.1:Gear>
-                <vif0.1:Gear number="11">
-                  <vif0.1:Ratio>1.280</vif0.1:Ratio>
-                  <vif0.1:MaxSpeed>2000</vif0.1:MaxSpeed>
-                </vif0.1:Gear>
-                <vif0.1:Gear number="12">
-                  <vif0.1:Ratio>1.000</vif0.1:Ratio>
-                </vif0.1:Gear>
-              </vif0.1:Gears>
-            </vif0.1:Data>
-          </vif0.1:Transmission>
-          <vif0.1:Axlegear>
-            <vif0.1:Data xsi:type="AxlegearDataPIFType">
-              <vif0.1:Manufacturer>Generic Gearbox Manufacturer</vif0.1:Manufacturer>
-              <vif0.1:Model>Generic 40t Long Haul Truck AxleGear</vif0.1:Model>
-              <vif0.1:CertificationMethod>Standard values</vif0.1:CertificationMethod>
-              <vif0.1:Date>2017-01-11T11:00:00Z</vif0.1:Date>
-              <vif0.1:AppVersion>3.0.1</vif0.1:AppVersion>
-              <vif0.1:LineType>Single portal axle</vif0.1:LineType>
-              <vif0.1:Ratio>2.590</vif0.1:Ratio>
-            </vif0.1:Data>
-          </vif0.1:Axlegear>
-          <vif0.1:AxleWheels>
-            <vif0.1:Data xsi:type="AxleWheelsDataPIFType">
-              <vif0.1:Axles>
-                <vif0.1:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<VectoOutputMultistep xmlns:di="http://www.w3.org/2000/09/xmldsig#" 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" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
+  <PrimaryVehicle>
+    <Data id="VIF_P-ae9e4e5438ad452990c0" xsi:type="PrimaryVehicleDataType">
+      <Vehicle xsi:type="ConventionalVehicleVIFType">
+        <Manufacturer>Generic Bus Manufacturer</Manufacturer>
+        <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
+        <Model>Generic Model</Model>
+        <VIN>VEH-1234567890_SmartPS</VIN>
+        <Date>2017-02-15T11:00:00Z</Date>
+        <LegislativeCategory>M3</LegislativeCategory>
+        <ChassisConfiguration>Bus</ChassisConfiguration>
+        <AxleConfiguration>6x2</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>
+        <vif:ADAS xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:type="ADAS_Conventional_Type">
+          <EngineStopStart>false</EngineStopStart>
+          <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+          <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+          <PredictiveCruiseControl>none</PredictiveCruiseControl>
+        </vif:ADAS>
+        <vif:TorqueLimits xsi:type="TorqueLimitsType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+          <Entry gear="1" maxTorque="2500" />
+          <Entry gear="6" maxTorque="1800" />
+          <Entry gear="12" maxTorque="1900" />
+        </vif:TorqueLimits>
+        <Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
+          <Engine>
+            <Data xsi:type="EngineDataVIFType">
+              <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>
+                <MechanicalOutputICE>false</MechanicalOutputICE>
+                <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+                <ElectricalOutput>false</ElectricalOutput>
+              </WHRType>
+              <Mode>
+                <IdlingSpeed>600</IdlingSpeed>
+                <FullLoadAndDragCurve>
+                  <Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00" />
+                  <Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00" />
+                  <Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00" />
+                  <Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00" />
+                  <Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00" />
+                  <Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00" />
+                  <Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00" />
+                  <Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00" />
+                  <Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00" />
+                  <Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00" />
+                </FullLoadAndDragCurve>
+                <Fuels>
+                  <FuelType>Diesel CI</FuelType>
+                </Fuels>
+              </Mode>
+            </Data>
+          </Engine>
+          <Transmission>
+            <Data xsi:type="TransmissionDataVIFType">
+              <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+              <Model>Generic 40t Long Haul Truck Gearbox</Model>
+              <MainCertificationMethod>Standard values</MainCertificationMethod>
+              <Date>2017-01-11T11:00:00Z</Date>
+              <AppVersion>3.0.1</AppVersion>
+              <TransmissionType>AMT</TransmissionType>
+              <Gears xsi:type="TransmissionGearsVIFType">
+                <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="TorqueConverterDataVIFType">
+              <Manufacturer>Some Manufacturer</Manufacturer>
+              <Model>Some Model</Model>
+              <CertificationMethod>Standard values</CertificationMethod>
+              <Date>2017-02-15T11:00:00Z</Date>
+              <AppVersion>TC CalcApp 123</AppVersion>
+            </Data>
+          </TorqueConverter>
+          <Retarder>
+            <Data xsi:type="RetarderDataVIFType">
+              <Manufacturer>Generic Vendor</Manufacturer>
+              <Model>RET-generic</Model>
+              <CertificationMethod>Standard values</CertificationMethod>
+              <Date>2018-02-02T13:38:22.424664Z</Date>
+              <AppVersion>VectoCore</AppVersion>
+              <RetarderRatio>1.000</RetarderRatio>
+            </Data>
+          </Retarder>
+          <Axlegear>
+            <Data xsi:type="AxlegearDataVIFType">
+              <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+              <Model>Generic 40t Long Haul Truck AxleGear</Model>
+              <CertificationMethod>Standard values</CertificationMethod>
+              <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="AxleWheelsDataVIFType">
+              <Axles>
+                <vif:Axle axleNumber="1" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleDataDeclarationType">
                   <AxleType>VehicleNonDriven</AxleType>
                   <TwinTyres>false</TwinTyres>
                   <Steered>true</Steered>
@@ -157,7 +176,7 @@
                       <FzISO>31300</FzISO>
                     </Data>
                     <Signature>
-                      <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+                      <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#" />
@@ -167,8 +186,8 @@
                       </di:Reference>
                     </Signature>
                   </Tyre>
-                </vif0.1:Axle>
-                <vif0.1:Axle axleNumber="2" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+                </vif:Axle>
+                <vif:Axle axleNumber="2" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleDataDeclarationType">
                   <AxleType>VehicleDriven</AxleType>
                   <TwinTyres>true</TwinTyres>
                   <Steered>false</Steered>
@@ -184,7 +203,7 @@
                       <FzISO>31300</FzISO>
                     </Data>
                     <Signature>
-                      <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+                      <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#" />
@@ -194,8 +213,8 @@
                       </di:Reference>
                     </Signature>
                   </Tyre>
-                </vif0.1:Axle>
-                <vif0.1:Axle axleNumber="3" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+                </vif:Axle>
+                <vif:Axle axleNumber="3" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleDataDeclarationType">
                   <AxleType>VehicleNonDriven</AxleType>
                   <TwinTyres>false</TwinTyres>
                   <Steered>false</Steered>
@@ -211,7 +230,7 @@
                       <FzISO>31300</FzISO>
                     </Data>
                     <Signature>
-                      <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+                      <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#" />
@@ -221,405 +240,361 @@
                       </di:Reference>
                     </Signature>
                   </Tyre>
-                </vif0.1:Axle>
-              </vif0.1:Axles>
-            </vif0.1:Data>
-          </vif0.1:AxleWheels>
-          <vif0.1:Auxiliaries>
-            <vif0.1:Data xsi:type="AuxiliaryDataPIFType">
-              <vif0.1:Fan>
-                <vif0.1:Technology>Hydraulic driven - Constant displacement pump</vif0.1:Technology>
-              </vif0.1:Fan>
-              <vif0.1:SteeringPump>
-                <vif0.1:Technology axleNumber="1">Variable displacement elec. controlled</vif0.1:Technology>
-              </vif0.1:SteeringPump>
-              <vif0.1:ElectricSystem>
-                <vif0.1:AlternatorTechnology>conventional</vif0.1:AlternatorTechnology>
-                <vif0.1:SupplyFromHEVPossible>false</vif0.1:SupplyFromHEVPossible>
-              </vif0.1:ElectricSystem>
-              <vif0.1:PneumaticSystem>
-                <vif0.1:SizeOfAirSupply>Large Supply 2-stage</vif0.1:SizeOfAirSupply>
-                <vif0.1:CompressorDrive>mechanically</vif0.1:CompressorDrive>
-                <vif0.1:Clutch>none</vif0.1:Clutch>
-                <vif0.1:CompressorRatio>1.000</vif0.1:CompressorRatio>
-                <vif0.1:SmartCompressionSystem>true</vif0.1:SmartCompressionSystem>
-                <vif0.1:SmartRegenerationSystem>false</vif0.1:SmartRegenerationSystem>
-                <vif0.1:AirsuspensionControl>electronically</vif0.1:AirsuspensionControl>
-                <vif0.1:PneumaticSCRReagentDosing>true</vif0.1:PneumaticSCRReagentDosing>
-              </vif0.1:PneumaticSystem>
-              <vif0.1:HVAC>
-                <vif0.1:AdjustableCoolantThermostat>true</vif0.1:AdjustableCoolantThermostat>
-                <vif0.1:EngineWasteGasHeatExchanger>true</vif0.1:EngineWasteGasHeatExchanger>
-              </vif0.1:HVAC>
-            </vif0.1:Data>
-          </vif0.1:Auxiliaries>
-        </vif0.1:Components>
-      </vif0.1:Vehicle>
-      <vif0.1:InputDataSignature>
+                </vif:Axle>
+              </Axles>
+            </Data>
+          </AxleWheels>
+          <Auxiliaries>
+            <Data xsi:type="AUX_Conventional_PrimaryBusType">
+              <Fan>
+                <Technology>Hydraulic driven - Constant displacement pump</Technology>
+              </Fan>
+              <SteeringPump>
+                <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+              </SteeringPump>
+              <ElectricSystem>
+                <AlternatorTechnology>conventional</AlternatorTechnology>
+                <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>
+      </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:DigestValue>nwNpDEVsjmdbjpch83CzRGDsDcoVGfkj5lN8S0Fr9BA=</di:DigestValue>
         </di:Reference>
-      </vif0.1:InputDataSignature>
-      <vif0.1:ManufacturerRecordSignature>
-        <di:Reference URI="#RESULT-7a8d7d4a9dbf4eb895f1">
+      </InputDataSignature>
+      <ManufacturerRecordSignature>
+        <di:Reference URI="#MRF-8fa06ae4c28f4b1daf88">
           <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>+PTOULR+qwZkYaGik0otzNDA8i3Gy4tvXQeORxqNXG0=</di:DigestValue>
+          <di:DigestValue>TOsDWqb5uXQa6cj3mmy//nujXWZaEkmsRbKeVy3glxI=</di:DigestValue>
         </di:Reference>
-      </vif0.1:ManufacturerRecordSignature>
-      <vif0.1:Results>
-        <vif0.1:Status>success</vif0.1:Status>
-        <vif0.1:Result status="success">
-          <vif0.1:VehicleGroup>P33SD</vif0.1:VehicleGroup>
-          <vif0.1:Mission>Heavy Urban</vif0.1:Mission>
-          <vif0.1:SimulationParameters>
-            <vif0.1:TotalVehicleMass unit="kg">15527.52</vif0.1:TotalVehicleMass>
-            <vif0.1:Payload unit="kg">1352.52</vif0.1:Payload>
-            <vif0.1:PassengerCount>19.89</vif0.1:PassengerCount>
-            <vif0.1:FuelMode>single fuel mode</vif0.1:FuelMode>
-          </vif0.1:SimulationParameters>
-          <vif0.1:Fuel type="Diesel CI">
-            <vif0.1:EnergyConsumption unit="MJ/km">21.22359</vif0.1:EnergyConsumption>
-          </vif0.1:Fuel>
-          <vif0.1:CO2 unit="g/km">1555.73</vif0.1:CO2>
-        </vif0.1:Result>
-        <vif0.1:Result status="success">
-          <vif0.1:VehicleGroup>P33SD</vif0.1:VehicleGroup>
-          <vif0.1:Mission>Heavy Urban</vif0.1:Mission>
-          <vif0.1:SimulationParameters>
-            <vif0.1:TotalVehicleMass unit="kg">20937.60</vif0.1:TotalVehicleMass>
-            <vif0.1:Payload unit="kg">6762.60</vif0.1:Payload>
-            <vif0.1:PassengerCount>99.45</vif0.1:PassengerCount>
-            <vif0.1:FuelMode>single fuel mode</vif0.1:FuelMode>
-          </vif0.1:SimulationParameters>
-          <vif0.1:Fuel type="Diesel CI">
-            <vif0.1:EnergyConsumption unit="MJ/km">25.40945</vif0.1:EnergyConsumption>
-          </vif0.1:Fuel>
-          <vif0.1:CO2 unit="g/km">1862.57</vif0.1:CO2>
-        </vif0.1:Result>
-        <vif0.1:Result status="success">
-          <vif0.1:VehicleGroup>P33SD</vif0.1:VehicleGroup>
-          <vif0.1:Mission>Urban</vif0.1:Mission>
-          <vif0.1:SimulationParameters>
-            <vif0.1:TotalVehicleMass unit="kg">15527.52</vif0.1:TotalVehicleMass>
-            <vif0.1:Payload unit="kg">1352.52</vif0.1:Payload>
-            <vif0.1:PassengerCount>19.89</vif0.1:PassengerCount>
-            <vif0.1:FuelMode>single fuel mode</vif0.1:FuelMode>
-          </vif0.1:SimulationParameters>
-          <vif0.1:Fuel type="Diesel CI">
-            <vif0.1:EnergyConsumption unit="MJ/km">16.74101</vif0.1:EnergyConsumption>
-          </vif0.1:Fuel>
-          <vif0.1:CO2 unit="g/km">1227.15</vif0.1:CO2>
-        </vif0.1:Result>
-        <vif0.1:Result status="success">
-          <vif0.1:VehicleGroup>P33SD</vif0.1:VehicleGroup>
-          <vif0.1:Mission>Urban</vif0.1:Mission>
-          <vif0.1:SimulationParameters>
-            <vif0.1:TotalVehicleMass unit="kg">20937.60</vif0.1:TotalVehicleMass>
-            <vif0.1:Payload unit="kg">6762.60</vif0.1:Payload>
-            <vif0.1:PassengerCount>99.45</vif0.1:PassengerCount>
-            <vif0.1:FuelMode>single fuel mode</vif0.1:FuelMode>
-          </vif0.1:SimulationParameters>
-          <vif0.1:Fuel type="Diesel CI">
-            <vif0.1:EnergyConsumption unit="MJ/km">20.24221</vif0.1:EnergyConsumption>
-          </vif0.1:Fuel>
-          <vif0.1:CO2 unit="g/km">1483.80</vif0.1:CO2>
-        </vif0.1:Result>
-        <vif0.1:Result status="success">
-          <vif0.1:VehicleGroup>P33SD</vif0.1:VehicleGroup>
-          <vif0.1:Mission>Suburban</vif0.1:Mission>
-          <vif0.1:SimulationParameters>
-            <vif0.1:TotalVehicleMass unit="kg">15527.52</vif0.1:TotalVehicleMass>
-            <vif0.1:Payload unit="kg">1352.52</vif0.1:Payload>
-            <vif0.1:PassengerCount>19.89</vif0.1:PassengerCount>
-            <vif0.1:FuelMode>single fuel mode</vif0.1:FuelMode>
-          </vif0.1:SimulationParameters>
-          <vif0.1:Fuel type="Diesel CI">
-            <vif0.1:EnergyConsumption unit="MJ/km">14.34578</vif0.1:EnergyConsumption>
-          </vif0.1:Fuel>
-          <vif0.1:CO2 unit="g/km">1051.58</vif0.1:CO2>
-        </vif0.1:Result>
-        <vif0.1:Result status="success">
-          <vif0.1:VehicleGroup>P33SD</vif0.1:VehicleGroup>
-          <vif0.1:Mission>Suburban</vif0.1:Mission>
-          <vif0.1:SimulationParameters>
-            <vif0.1:TotalVehicleMass unit="kg">20937.60</vif0.1:TotalVehicleMass>
-            <vif0.1:Payload unit="kg">6762.60</vif0.1:Payload>
-            <vif0.1:PassengerCount>99.45</vif0.1:PassengerCount>
-            <vif0.1:FuelMode>single fuel mode</vif0.1:FuelMode>
-          </vif0.1:SimulationParameters>
-          <vif0.1:Fuel type="Diesel CI">
-            <vif0.1:EnergyConsumption unit="MJ/km">17.60016</vif0.1:EnergyConsumption>
-          </vif0.1:Fuel>
-          <vif0.1:CO2 unit="g/km">1290.13</vif0.1:CO2>
-        </vif0.1:Result>
-        <vif0.1:Result status="success">
-          <vif0.1:VehicleGroup>P33SD</vif0.1:VehicleGroup>
-          <vif0.1:Mission>Interurban</vif0.1:Mission>
-          <vif0.1:SimulationParameters>
-            <vif0.1:TotalVehicleMass unit="kg">15469.51</vif0.1:TotalVehicleMass>
-            <vif0.1:Payload unit="kg">1294.51</vif0.1:Payload>
-            <vif0.1:PassengerCount>18.23</vif0.1:PassengerCount>
-            <vif0.1:FuelMode>single fuel mode</vif0.1:FuelMode>
-          </vif0.1:SimulationParameters>
-          <vif0.1:Fuel type="Diesel CI">
-            <vif0.1:EnergyConsumption unit="MJ/km">11.82313</vif0.1:EnergyConsumption>
-          </vif0.1:Fuel>
-          <vif0.1:CO2 unit="g/km">866.66</vif0.1:CO2>
-        </vif0.1:Result>
-        <vif0.1:Result status="success">
-          <vif0.1:VehicleGroup>P33SD</vif0.1:VehicleGroup>
-          <vif0.1:Mission>Interurban</vif0.1:Mission>
-          <vif0.1:SimulationParameters>
-            <vif0.1:TotalVehicleMass unit="kg">18411.57</vif0.1:TotalVehicleMass>
-            <vif0.1:Payload unit="kg">4236.57</vif0.1:Payload>
-            <vif0.1:PassengerCount>59.67</vif0.1:PassengerCount>
-            <vif0.1:FuelMode>single fuel mode</vif0.1:FuelMode>
-          </vif0.1:SimulationParameters>
-          <vif0.1:Fuel type="Diesel CI">
-            <vif0.1:EnergyConsumption unit="MJ/km">13.24283</vif0.1:EnergyConsumption>
-          </vif0.1:Fuel>
-          <vif0.1:CO2 unit="g/km">970.73</vif0.1:CO2>
-        </vif0.1:Result>
-        <vif0.1:Result status="success">
-          <vif0.1:VehicleGroup>P33DD</vif0.1:VehicleGroup>
-          <vif0.1:Mission>Heavy Urban</vif0.1:Mission>
-          <vif0.1:SimulationParameters>
-            <vif0.1:TotalVehicleMass unit="kg">16303.29</vif0.1:TotalVehicleMass>
-            <vif0.1:Payload unit="kg">1578.29</vif0.1:Payload>
-            <vif0.1:PassengerCount>23.21</vif0.1:PassengerCount>
-            <vif0.1:FuelMode>single fuel mode</vif0.1:FuelMode>
-          </vif0.1:SimulationParameters>
-          <vif0.1:Fuel type="Diesel CI">
-            <vif0.1:EnergyConsumption unit="MJ/km">22.72091</vif0.1:EnergyConsumption>
-          </vif0.1:Fuel>
-          <vif0.1:CO2 unit="g/km">1665.49</vif0.1:CO2>
-        </vif0.1:Result>
-        <vif0.1:Result status="success">
-          <vif0.1:VehicleGroup>P33DD</vif0.1:VehicleGroup>
-          <vif0.1:Mission>Heavy Urban</vif0.1:Mission>
-          <vif0.1:SimulationParameters>
-            <vif0.1:TotalVehicleMass unit="kg">22616.43</vif0.1:TotalVehicleMass>
-            <vif0.1:Payload unit="kg">7891.43</vif0.1:Payload>
-            <vif0.1:PassengerCount>116.05</vif0.1:PassengerCount>
-            <vif0.1:FuelMode>single fuel mode</vif0.1:FuelMode>
-          </vif0.1:SimulationParameters>
-          <vif0.1:Fuel type="Diesel CI">
-            <vif0.1:EnergyConsumption unit="MJ/km">27.95930</vif0.1:EnergyConsumption>
-          </vif0.1:Fuel>
-          <vif0.1:CO2 unit="g/km">2049.48</vif0.1:CO2>
-        </vif0.1:Result>
-        <vif0.1:Result status="success">
-          <vif0.1:VehicleGroup>P33DD</vif0.1:VehicleGroup>
-          <vif0.1:Mission>Urban</vif0.1:Mission>
-          <vif0.1:SimulationParameters>
-            <vif0.1:TotalVehicleMass unit="kg">16303.29</vif0.1:TotalVehicleMass>
-            <vif0.1:Payload unit="kg">1578.29</vif0.1:Payload>
-            <vif0.1:PassengerCount>23.21</vif0.1:PassengerCount>
-            <vif0.1:FuelMode>single fuel mode</vif0.1:FuelMode>
-          </vif0.1:SimulationParameters>
-          <vif0.1:Fuel type="Diesel CI">
-            <vif0.1:EnergyConsumption unit="MJ/km">17.90756</vif0.1:EnergyConsumption>
-          </vif0.1:Fuel>
-          <vif0.1:CO2 unit="g/km">1312.66</vif0.1:CO2>
-        </vif0.1:Result>
-        <vif0.1:Result status="success">
-          <vif0.1:VehicleGroup>P33DD</vif0.1:VehicleGroup>
-          <vif0.1:Mission>Urban</vif0.1:Mission>
-          <vif0.1:SimulationParameters>
-            <vif0.1:TotalVehicleMass unit="kg">22616.43</vif0.1:TotalVehicleMass>
-            <vif0.1:Payload unit="kg">7891.43</vif0.1:Payload>
-            <vif0.1:PassengerCount>116.05</vif0.1:PassengerCount>
-            <vif0.1:FuelMode>single fuel mode</vif0.1:FuelMode>
-          </vif0.1:SimulationParameters>
-          <vif0.1:Fuel type="Diesel CI">
-            <vif0.1:EnergyConsumption unit="MJ/km">22.23796</vif0.1:EnergyConsumption>
-          </vif0.1:Fuel>
-          <vif0.1:CO2 unit="g/km">1630.09</vif0.1:CO2>
-        </vif0.1:Result>
-        <vif0.1:Result status="success">
-          <vif0.1:VehicleGroup>P33DD</vif0.1:VehicleGroup>
-          <vif0.1:Mission>Suburban</vif0.1:Mission>
-          <vif0.1:SimulationParameters>
-            <vif0.1:TotalVehicleMass unit="kg">16303.29</vif0.1:TotalVehicleMass>
-            <vif0.1:Payload unit="kg">1578.29</vif0.1:Payload>
-            <vif0.1:PassengerCount>23.21</vif0.1:PassengerCount>
-            <vif0.1:FuelMode>single fuel mode</vif0.1:FuelMode>
-          </vif0.1:SimulationParameters>
-          <vif0.1:Fuel type="Diesel CI">
-            <vif0.1:EnergyConsumption unit="MJ/km">15.28035</vif0.1:EnergyConsumption>
-          </vif0.1:Fuel>
-          <vif0.1:CO2 unit="g/km">1120.08</vif0.1:CO2>
-        </vif0.1:Result>
-        <vif0.1:Result status="success">
-          <vif0.1:VehicleGroup>P33DD</vif0.1:VehicleGroup>
-          <vif0.1:Mission>Suburban</vif0.1:Mission>
-          <vif0.1:SimulationParameters>
-            <vif0.1:TotalVehicleMass unit="kg">22616.43</vif0.1:TotalVehicleMass>
-            <vif0.1:Payload unit="kg">7891.43</vif0.1:Payload>
-            <vif0.1:PassengerCount>116.05</vif0.1:PassengerCount>
-            <vif0.1:FuelMode>single fuel mode</vif0.1:FuelMode>
-          </vif0.1:SimulationParameters>
-          <vif0.1:Fuel type="Diesel CI">
-            <vif0.1:EnergyConsumption unit="MJ/km">19.26201</vif0.1:EnergyConsumption>
-          </vif0.1:Fuel>
-          <vif0.1:CO2 unit="g/km">1411.95</vif0.1:CO2>
-        </vif0.1:Result>
-        <vif0.1:Result status="success">
-          <vif0.1:VehicleGroup>P34SD</vif0.1:VehicleGroup>
-          <vif0.1:Mission>Interurban</vif0.1:Mission>
-          <vif0.1:SimulationParameters>
-            <vif0.1:TotalVehicleMass unit="kg">16467.68</vif0.1:TotalVehicleMass>
-            <vif0.1:Payload unit="kg">1254.68</vif0.1:Payload>
-            <vif0.1:PassengerCount>17.67</vif0.1:PassengerCount>
-            <vif0.1:FuelMode>single fuel mode</vif0.1:FuelMode>
-          </vif0.1:SimulationParameters>
-          <vif0.1:Fuel type="Diesel CI">
-            <vif0.1:EnergyConsumption unit="MJ/km">11.93701</vif0.1:EnergyConsumption>
-          </vif0.1:Fuel>
-          <vif0.1:CO2 unit="g/km">875.01</vif0.1:CO2>
-        </vif0.1:Result>
-        <vif0.1:Result status="success">
-          <vif0.1:VehicleGroup>P34SD</vif0.1:VehicleGroup>
-          <vif0.1:Mission>Interurban</vif0.1:Mission>
-          <vif0.1:SimulationParameters>
-            <vif0.1:TotalVehicleMass unit="kg">19319.21</vif0.1:TotalVehicleMass>
-            <vif0.1:Payload unit="kg">4106.21</vif0.1:Payload>
-            <vif0.1:PassengerCount>57.83</vif0.1:PassengerCount>
-            <vif0.1:FuelMode>single fuel mode</vif0.1:FuelMode>
-          </vif0.1:SimulationParameters>
-          <vif0.1:Fuel type="Diesel CI">
-            <vif0.1:EnergyConsumption unit="MJ/km">13.32341</vif0.1:EnergyConsumption>
-          </vif0.1:Fuel>
-          <vif0.1:CO2 unit="g/km">976.63</vif0.1:CO2>
-        </vif0.1:Result>
-        <vif0.1:Result status="success">
-          <vif0.1:VehicleGroup>P34SD</vif0.1:VehicleGroup>
-          <vif0.1:Mission>Coach</vif0.1:Mission>
-          <vif0.1:SimulationParameters>
-            <vif0.1:TotalVehicleMass unit="kg">16490.49</vif0.1:TotalVehicleMass>
-            <vif0.1:Payload unit="kg">1277.49</vif0.1:Payload>
-            <vif0.1:PassengerCount>17.99</vif0.1:PassengerCount>
-            <vif0.1:FuelMode>single fuel mode</vif0.1:FuelMode>
-          </vif0.1:SimulationParameters>
-          <vif0.1:Fuel type="Diesel CI">
-            <vif0.1:EnergyConsumption unit="MJ/km">8.71847</vif0.1:EnergyConsumption>
-          </vif0.1:Fuel>
-          <vif0.1:CO2 unit="g/km">639.08</vif0.1:CO2>
-        </vif0.1:Result>
-        <vif0.1:Result status="success">
-          <vif0.1:VehicleGroup>P34SD</vif0.1:VehicleGroup>
-          <vif0.1:Mission>Coach</vif0.1:Mission>
-          <vif0.1:SimulationParameters>
-            <vif0.1:TotalVehicleMass unit="kg">18406.72</vif0.1:TotalVehicleMass>
-            <vif0.1:Payload unit="kg">3193.72</vif0.1:Payload>
-            <vif0.1:PassengerCount>44.98</vif0.1:PassengerCount>
-            <vif0.1:FuelMode>single fuel mode</vif0.1:FuelMode>
-          </vif0.1:SimulationParameters>
-          <vif0.1:Fuel type="Diesel CI">
-            <vif0.1:EnergyConsumption unit="MJ/km">9.20255</vif0.1:EnergyConsumption>
-          </vif0.1:Fuel>
-          <vif0.1:CO2 unit="g/km">674.57</vif0.1:CO2>
-        </vif0.1:Result>
-        <vif0.1:Result status="success">
-          <vif0.1:VehicleGroup>P34DD</vif0.1:VehicleGroup>
-          <vif0.1:Mission>Interurban</vif0.1:Mission>
-          <vif0.1:SimulationParameters>
-            <vif0.1:TotalVehicleMass unit="kg">19588.08</vif0.1:TotalVehicleMass>
-            <vif0.1:Payload unit="kg">1738.08</vif0.1:Payload>
-            <vif0.1:PassengerCount>24.48</vif0.1:PassengerCount>
-            <vif0.1:FuelMode>single fuel mode</vif0.1:FuelMode>
-          </vif0.1:SimulationParameters>
-          <vif0.1:Fuel type="Diesel CI">
-            <vif0.1:EnergyConsumption unit="MJ/km">13.58335</vif0.1:EnergyConsumption>
-          </vif0.1:Fuel>
-          <vif0.1:CO2 unit="g/km">995.69</vif0.1:CO2>
-        </vif0.1:Result>
-        <vif0.1:Result status="success">
-          <vif0.1:VehicleGroup>P34DD</vif0.1:VehicleGroup>
-          <vif0.1:Mission>Interurban</vif0.1:Mission>
-          <vif0.1:SimulationParameters>
-            <vif0.1:TotalVehicleMass unit="kg">23643.60</vif0.1:TotalVehicleMass>
-            <vif0.1:Payload unit="kg">5793.60</vif0.1:Payload>
-            <vif0.1:PassengerCount>81.60</vif0.1:PassengerCount>
-            <vif0.1:FuelMode>single fuel mode</vif0.1:FuelMode>
-          </vif0.1:SimulationParameters>
-          <vif0.1:Fuel type="Diesel CI">
-            <vif0.1:EnergyConsumption unit="MJ/km">15.56740</vif0.1:EnergyConsumption>
-          </vif0.1:Fuel>
-          <vif0.1:CO2 unit="g/km">1141.12</vif0.1:CO2>
-        </vif0.1:Result>
-        <vif0.1:Result status="success">
-          <vif0.1:VehicleGroup>P34DD</vif0.1:VehicleGroup>
-          <vif0.1:Mission>Coach</vif0.1:Mission>
-          <vif0.1:SimulationParameters>
-            <vif0.1:TotalVehicleMass unit="kg">19703.95</vif0.1:TotalVehicleMass>
-            <vif0.1:Payload unit="kg">1853.95</vif0.1:Payload>
-            <vif0.1:PassengerCount>26.11</vif0.1:PassengerCount>
-            <vif0.1:FuelMode>single fuel mode</vif0.1:FuelMode>
-          </vif0.1:SimulationParameters>
-          <vif0.1:Fuel type="Diesel CI">
-            <vif0.1:EnergyConsumption unit="MJ/km">9.82937</vif0.1:EnergyConsumption>
-          </vif0.1:Fuel>
-          <vif0.1:CO2 unit="g/km">720.51</vif0.1:CO2>
-        </vif0.1:Result>
-        <vif0.1:Result status="success">
-          <vif0.1:VehicleGroup>P34DD</vif0.1:VehicleGroup>
-          <vif0.1:Mission>Coach</vif0.1:Mission>
-          <vif0.1:SimulationParameters>
-            <vif0.1:TotalVehicleMass unit="kg">22484.88</vif0.1:TotalVehicleMass>
-            <vif0.1:Payload unit="kg">4634.88</vif0.1:Payload>
-            <vif0.1:PassengerCount>65.28</vif0.1:PassengerCount>
-            <vif0.1:FuelMode>single fuel mode</vif0.1:FuelMode>
-          </vif0.1:SimulationParameters>
-          <vif0.1:Fuel type="Diesel CI">
-            <vif0.1:EnergyConsumption unit="MJ/km">10.56728</vif0.1:EnergyConsumption>
-          </vif0.1:Fuel>
-          <vif0.1:CO2 unit="g/km">774.60</vif0.1:CO2>
-        </vif0.1:Result>
-      </vif0.1:Results>
-      <vif0.1:ApplicationInformation>
-        <vif0.1:SimulationToolVersion>0.6.2.2058-DEV !!NOT FOR CERTIFICATION!!</vif0.1:SimulationToolVersion>
-        <vif0.1:Date>2020-08-20T12:17:31.4151388Z</vif0.1:Date>
-      </vif0.1:ApplicationInformation>
-    </vif0.1:Data>
-    <vif0.1:Signature>
-      <di:Reference URI="#PIF-7f30aafa027a41a1864b">
+      </ManufacturerRecordSignature>
+      <Results>
+        <Status>success</Status>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">15528</TotalVehicleMass>
+            <Payload unit="kg">1353</Payload>
+            <PassengerCount>19.89</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">21.19</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">20938</TotalVehicleMass>
+            <Payload unit="kg">6763</Payload>
+            <PassengerCount>99.45</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">25.39</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">15528</TotalVehicleMass>
+            <Payload unit="kg">1353</Payload>
+            <PassengerCount>19.89</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">16.67</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">20938</TotalVehicleMass>
+            <Payload unit="kg">6763</Payload>
+            <PassengerCount>99.45</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">20.12</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">15528</TotalVehicleMass>
+            <Payload unit="kg">1353</Payload>
+            <PassengerCount>19.89</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">13.99</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">20938</TotalVehicleMass>
+            <Payload unit="kg">6763</Payload>
+            <PassengerCount>99.45</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">17.05</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">15470</TotalVehicleMass>
+            <Payload unit="kg">1295</Payload>
+            <PassengerCount>18.23</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">11.60</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P33SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18412</TotalVehicleMass>
+            <Payload unit="kg">4237</Payload>
+            <PassengerCount>59.67</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">12.95</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16303</TotalVehicleMass>
+            <Payload unit="kg">1578</Payload>
+            <PassengerCount>23.21</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">22.75</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">22616</TotalVehicleMass>
+            <Payload unit="kg">7891</Payload>
+            <PassengerCount>116.05</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">27.90</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16303</TotalVehicleMass>
+            <Payload unit="kg">1578</Payload>
+            <PassengerCount>23.21</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">17.89</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">22616</TotalVehicleMass>
+            <Payload unit="kg">7891</Payload>
+            <PassengerCount>116.05</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">22.14</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16303</TotalVehicleMass>
+            <Payload unit="kg">1578</Payload>
+            <PassengerCount>23.21</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">14.95</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P33DD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">22616</TotalVehicleMass>
+            <Payload unit="kg">7891</Payload>
+            <PassengerCount>116.05</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">18.88</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16468</TotalVehicleMass>
+            <Payload unit="kg">1255</Payload>
+            <PassengerCount>17.67</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">11.65</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">19319</TotalVehicleMass>
+            <Payload unit="kg">4106</Payload>
+            <PassengerCount>57.83</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">12.97</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16490</TotalVehicleMass>
+            <Payload unit="kg">1277</Payload>
+            <PassengerCount>17.99</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">8.866</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P34SD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18407</TotalVehicleMass>
+            <Payload unit="kg">3194</Payload>
+            <PassengerCount>44.98</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">9.356</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">19588</TotalVehicleMass>
+            <Payload unit="kg">1738</Payload>
+            <PassengerCount>24.48</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">13.23</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">23644</TotalVehicleMass>
+            <Payload unit="kg">5794</Payload>
+            <PassengerCount>81.60</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">15.11</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">19704</TotalVehicleMass>
+            <Payload unit="kg">1854</Payload>
+            <PassengerCount>26.11</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">9.972</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P34DD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">22485</TotalVehicleMass>
+            <Payload unit="kg">4635</Payload>
+            <PassengerCount>65.28</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">10.66</EnergyConsumption>
+          </Fuel>
+        </Result>
+      </Results>
+      <ApplicationInformation>
+        <SimulationToolVersion>4.0.0.3115-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+        <Date>2023-07-13T12:38:36.5343139Z</Date>
+      </ApplicationInformation>
+    </Data>
+    <Signature>
+      <di:Reference URI="#VIF_P-ae9e4e5438ad452990c0">
         <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>a3ai89pd92w4O1za7mc+ut712QqNJqAfX0FeeZdfrFk=</di:DigestValue>
+        <di:DigestValue>Vjm3IEOnUsiTRPgyqmYgJjhfSfwGTm46Wm7mgGEwz68=</di:DigestValue>
       </di:Reference>
-    </vif0.1:Signature>
-  </vif0.1:PrimaryVehicle>
-  <vif0.1:ManufacturingStep stepCount="2">
-    <vif0.1:Data xsi:type="BusManufacturingStepDataType" id="MST-607e449d2b0e45228b69">
-      <vif0.1:HashPreviousStep>
-        <di:Reference URI="#PIF-7f30aafa027a41a1864b">
+    </Signature>
+  </PrimaryVehicle>
+  <ManufacturingStep stepCount="2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <Data xsi:type="BusManufacturingStepDataType" id="MST-e6fedbe0406746d6ac7c">
+      <HashPreviousStep>
+        <di:Reference URI="#VIF_P-ae9e4e5438ad452990c0">
           <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>a3ai89pd92w4O1za7mc+ut712QqNJqAfX0FeeZdfrFk=</di:DigestValue>
+          <di:DigestValue>Vjm3IEOnUsiTRPgyqmYgJjhfSfwGTm46Wm7mgGEwz68=</di:DigestValue>
         </di:Reference>
-      </vif0.1:HashPreviousStep>
-      <vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="VEH-684dbf252718426b9fde" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
+      </HashPreviousStep>
+      <vif:Vehicle id="VEH-9150f98770f84b9c8f78" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4">
         <Manufacturer>Some Manufacturer</Manufacturer>
         <ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
         <VIN>VEH-1234567890</VIN>
-        <Date>2021-06-07T22:00:00Z</Date>
-        <Model>SomeModel</Model>
+        <Date>2023-07-12T22:00:00Z</Date>
+        <Model>Sample Bus Model</Model>
         <LegislativeCategory>M3</LegislativeCategory>
         <CorrectedActualMass>19400</CorrectedActualMass>
         <TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
@@ -637,7 +612,14 @@
         <EntranceHeight>300</EntranceHeight>
         <DoorDriveTechnology>pneumatic</DoorDriveTechnology>
         <VehicleDeclarationType>final</VehicleDeclarationType>
-        <Components  xsi:type="Components_Conventional_CompletedBusType">
+        <VehicleTypeApprovalNumber>1234</VehicleTypeApprovalNumber>
+        <ADAS xsi:type="ADAS_Conventional_Type">
+          <EngineStopStart>true</EngineStopStart>
+          <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+          <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+          <PredictiveCruiseControl>none</PredictiveCruiseControl>
+        </ADAS>
+        <Components xsi:type="Components_Conventional_CompletedBusType">
           <Auxiliaries>
             <Data xsi:type="AUX_Conventional_CompletedBusType">
               <ElectricSystem>
@@ -651,14 +633,14 @@
               </ElectricSystem>
               <HVAC>
                 <SystemConfiguration>6</SystemConfiguration>
-				<HeatPumpTypeDriverCompartment>
-					<Cooling>none</Cooling>
-					<Heating>none</Heating>
-				</HeatPumpTypeDriverCompartment>                
-				<HeatPumpTypePassengerCompartment>
-					<Cooling>non R-744 2-stage</Cooling>
-					<Heating>none</Heating>
-				</HeatPumpTypePassengerCompartment>
+                <HeatPumpTypeDriverCompartment>
+                  <Cooling>none</Cooling>
+                  <Heating>none</Heating>
+                </HeatPumpTypeDriverCompartment>
+                <HeatPumpTypePassengerCompartment>
+                  <Cooling>non R-744 2-stage</Cooling>
+                  <Heating>none</Heating>
+                </HeatPumpTypePassengerCompartment>
                 <AuxiliaryHeaterPower>30000</AuxiliaryHeaterPower>
                 <DoubleGlazing>true</DoubleGlazing>
                 <AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
@@ -667,21 +649,21 @@
             </Data>
           </Auxiliaries>
         </Components>
-      </vif0.1:Vehicle>
-      <vif0.1:ApplicationInformation>
-        <vif0.1:SimulationToolVersion>0.7.3.2247-DEV</vif0.1:SimulationToolVersion>
-        <vif0.1:Date>2021-06-08T19:23:22.0886281Z</vif0.1:Date>
-      </vif0.1:ApplicationInformation>
-    </vif0.1:Data>
-    <vif0.1:Signature>
-      <di:Reference URI="#MST-607e449d2b0e45228b69">
+      </vif:Vehicle>
+      <ApplicationInformation>
+        <SimulationToolVersion>4.0.0.3115-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+        <Date>2023-07-13T12:40:21.3995174Z</Date>
+      </ApplicationInformation>
+    </Data>
+    <Signature>
+      <di:Reference URI="#MST-e6fedbe0406746d6ac7c">
         <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>D1pKqglxP9ST/vCUSHkr8y4L7miQhPPPywLTCCOIPZk=</di:DigestValue>
+        <di:DigestValue>7/vdN3T4NwqcZ/q3kkW3qWIJGcxNtVUeSkv/YhrI2sA=</di:DigestValue>
       </di:Reference>
-    </vif0.1:Signature>
-  </vif0.1:ManufacturingStep>
-</vif0.1:VectoOutputMultistep>
\ No newline at end of file
+    </Signature>
+  </ManufacturingStep>
+</VectoOutputMultistep>
\ No newline at end of file
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
deleted file mode 100644
index 29bd41e9cc..0000000000
--- a/Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.VIF.xml	
+++ /dev/null
@@ -1,605 +0,0 @@
-<?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.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">
-				<ManufacturerPrimaryVehicle>Generic Bus Manufacturer</ManufacturerPrimaryVehicle>
-				<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
-				<Model>Generic Model</Model>
-				<VIN>VEH-1234567890_SmartPS</VIN>
-				<Date>2017-02-15T11:00:00Z</Date>
-				<LegislativeCategory>M3</LegislativeCategory>
-				<ChassisConfiguration>Bus</ChassisConfiguration>
-				<AxleConfiguration>6x2</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>
-				<ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
-					<adas:EngineStopStart>false</adas:EngineStopStart>
-					<adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
-					<adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
-					<adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
-				</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>
-								<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>
-								<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>
-							<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>
-					<Axlegear>
-						<Data xsi:type="AxlegearDataPIFType">
-							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
-							<Model>Generic 40t Long Haul Truck AxleGear</Model>
-							<CertificationMethod>Standard values</CertificationMethod>
-							<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>
-								<vif0.1:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
-									<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" 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>
-										</Signature>
-									</Tyre>
-								</vif0.1:Axle>
-								<vif0.1:Axle axleNumber="2" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
-									<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" 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>
-										</Signature>
-									</Tyre>
-								</vif0.1:Axle>
-								<vif0.1:Axle axleNumber="3" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
-									<AxleType>VehicleNonDriven</AxleType>
-									<TwinTyres>false</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.0055</RRCDeclared>
-											<FzISO>31300</FzISO>
-										</Data>
-										<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>
-										</Signature>
-									</Tyre>
-								</vif0.1: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>conventional</AlternatorTechnology>
-								<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>
-			</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-7a8d7d4a9dbf4eb895f1">
-					<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>+PTOULR+qwZkYaGik0otzNDA8i3Gy4tvXQeORxqNXG0=</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>0.6.2.2058-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
-				<Date>2020-08-20T12:17:31.4151388Z</Date>
-			</ApplicationInformation>
-		</Data>
-		<Signature>
-			<di:Reference URI="#PIF-7f30aafa027a41a1864b">
-				<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>a3ai89pd92w4O1za7mc+ut712QqNJqAfX0FeeZdfrFk=</di:DigestValue>
-			</di:Reference>
-		</Signature>
-	</PrimaryVehicle>
-</VectoOutputMultistep>
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 0a63f48d8f..7dda7c92ab 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.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="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:DEV:v2.3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.10="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>
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 bb8e36d247..f69befaa53 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	
@@ -3318,6 +3318,7 @@
 					</Fan>
 					<SteeringPump>
 						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+						<Technology axleNumber="2">Variable displacement elec. controlled</Technology>
 					</SteeringPump>
 					<ElectricSystem>
 						<AlternatorTechnology>smart</AlternatorTechnology>
diff --git a/VectoCore/VectoCoreTest/Integration/GenericVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/GenericVehicleTest.cs
index 1089d65d04..7f8e4868e0 100644
--- a/VectoCore/VectoCoreTest/Integration/GenericVehicleTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/GenericVehicleTest.cs
@@ -43,7 +43,7 @@ namespace TUGraz.VectoCore.Tests.Integration
 		private static HashSet<string> _ignoredFiles = new HashSet<string>()
 		{
 			@"Engineering Mode\GenericVehicleE2\BEV_ENG_PTO_invalid.vecto", //INVALID Input file 
-			@"Declaration Mode\CompletedBus 31b2\airdrag.xml" //no job
+			//@"Declaration Mode\CompletedBus 31b2\airdrag.xml" //no job
         };
 
 		[OneTimeSetUp]
@@ -231,6 +231,11 @@ namespace TUGraz.VectoCore.Tests.Integration
 					return true;
 				}
 
+				if (xmlDoc.DocumentElement.NamespaceURI == "urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0") {
+					reason = $"Ignoring {xmlDoc.DocumentElement.NamespaceURI}";
+					return true;
+				}
+
 				switch (documentType.Value) {
 					case XmlDocumentType.DeclarationJobData:
 					case XmlDocumentType.MultistepOutputData:
-- 
GitLab