From 8fa913b4e82080c6f85b67da88f5d0485d34e1c3 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Tue, 25 Apr 2023 14:21:21 +0200
Subject: [PATCH] adding testfiles for completed bus

---
 .../Conventional_completedBus_1.xml           |   87 ++
 .../Conventional_completedBus_2.xml           |   87 ++
 ...onal_completedBus_2_TypeApprovalNumber.xml |   88 ++
 .../CompletedBus/HEV_completedBus_1.xml       |   87 ++
 .../CompletedBus/HEV_completedBus_2.xml       |   87 ++
 .../CompletedBus/IEPC_completedBus_1.xml      |   85 ++
 .../CompletedBus/IEPC_completedBus_2.xml      |   85 ++
 .../CompletedBus/PEV_completedBus_1.xml       |   85 ++
 .../CompletedBus/PEV_completedBus_2.xml       |   85 ++
 .../VIF/PEV_primaryBus_AMT_E2.RSLT_VIF.xml    |  744 ++++++++++++
 .../PrimaryCityBus_IEPC-S_Base.RSLT_VIF.xml   | 1027 +++++++++++++++++
 .../VIF/PrimaryCityBus_IEPC_Base.RSLT_VIF.xml |  621 ++++++++++
 ...PrimaryCityBus_P1_HEV_Base_AT.RSLT_VIF.xml |  707 ++++++++++++
 .../VIF/PrimaryCoach_E2_Base_AMT.RSLT_VIF.xml |  587 ++++++++++
 .../PrimaryCoach_P2_HEV_AMT_OVC.RSLT_VIF.xml  |  960 +++++++++++++++
 .../PrimaryCoach_P2_HEV_Base_AMT.RSLT_VIF.xml |  740 ++++++++++++
 .../VIF/PrimaryCoach_S2_Base_AMT.RSLT_VIF.xml |  993 ++++++++++++++++
 .../exempted_primary_heavyBus.RSLT_VIF.xml    |   60 +
 ...ary_heavyBus group41_nonSmart.RSLT_VIF.xml |  531 +++++++++
 19 files changed, 7746 insertions(+)
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/Conventional_completedBus_1.xml
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/Conventional_completedBus_2.xml
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/Conventional_completedBus_2_TypeApprovalNumber.xml
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/HEV_completedBus_1.xml
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/HEV_completedBus_2.xml
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/IEPC_completedBus_1.xml
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/IEPC_completedBus_2.xml
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/PEV_completedBus_1.xml
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/PEV_completedBus_2.xml
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PEV_primaryBus_AMT_E2.RSLT_VIF.xml
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCityBus_IEPC-S_Base.RSLT_VIF.xml
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCityBus_IEPC_Base.RSLT_VIF.xml
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCityBus_P1_HEV_Base_AT.RSLT_VIF.xml
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCoach_E2_Base_AMT.RSLT_VIF.xml
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCoach_P2_HEV_AMT_OVC.RSLT_VIF.xml
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCoach_P2_HEV_Base_AMT.RSLT_VIF.xml
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCoach_S2_Base_AMT.RSLT_VIF.xml
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/exempted_primary_heavyBus.RSLT_VIF.xml
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/primary_heavyBus group41_nonSmart.RSLT_VIF.xml

diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/Conventional_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/Conventional_completedBus_1.xml
new file mode 100644
index 0000000000..750c6d33d6
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/Conventional_completedBus_1.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
+		<Manufacturer>Some Manufacturer</Manufacturer>
+		<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+		<VIN>VEH-1234567890</VIN>
+		<Date>2021-06-30T22:00:00Z</Date>
+		<Model>Sample Bus Model</Model>
+		<LegislativeCategory>M3</LegislativeCategory>
+		<CorrectedActualMass>500</CorrectedActualMass>
+		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
+		<ClassBus>II+III</ClassBus>
+		<NgTankSystem>Compressed</NgTankSystem><!-- optional -->
+		<NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
+		<NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
+		<NumberPassengerSeatsUpperDeck>11</NumberPassengerSeatsUpperDeck>
+		<NumberPassengersStandingUpperDeck>2</NumberPassengersStandingUpperDeck>
+		<BodyworkCode>CB</BodyworkCode>
+		<LowEntry>false</LowEntry>
+		<HeightIntegratedBody>2500</HeightIntegratedBody>
+		<VehicleLength>9500</VehicleLength>
+		<VehicleWidth>2500</VehicleWidth>
+		<EntranceHeight>2000</EntranceHeight>
+		<DoorDriveTechnology>electric</DoorDriveTechnology>
+		<VehicleDeclarationType>interim</VehicleDeclarationType>
+		<ADAS xsi:type="ADAS_Conventional_Type">
+			<EngineStopStart>true</EngineStopStart>
+			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
+			<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
+		</ADAS>
+		<Components xsi:type="Components_Conventional_CompletedBusType">
+			<AirDrag>
+				<v2.0:Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType">
+					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
+					<v2.0:Model>Generic Model</v2.0:Model>
+					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
+					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
+					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
+					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
+					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
+					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
+				</v2.0:Data>
+				<v2.0:Signature>
+					<di:Reference URI="#CabinX23h">
+						<di:Transforms>
+							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+						</di:Transforms>
+						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+					</di:Reference>
+				</v2.0:Signature>
+			</AirDrag>
+			<Auxiliaries>
+				<Data xsi:type="AUX_Conventional_CompletedBusType">
+					<ElectricSystem>
+						<LEDLights>
+							<Interiorlights>false</Interiorlights>
+							<Dayrunninglights>true</Dayrunninglights>
+							<Positionlights>true</Positionlights>
+							<Brakelights>true</Brakelights>
+							<Headlights>false</Headlights>
+						</LEDLights>
+					</ElectricSystem>
+					<HVAC>
+						<SystemConfiguration>0</SystemConfiguration>
+						<HeatPumpTypeDriverCompartment>
+							<Cooling>non R-744 2-stage</Cooling>
+							<Heating>none</Heating>
+						</HeatPumpTypeDriverCompartment>
+						<HeatPumpTypePassengerCompartment>
+							<Cooling>non R-744 3-stage</Cooling>
+							<Heating>none</Heating>
+						</HeatPumpTypePassengerCompartment>
+						<AuxiliaryHeaterPower>50000</AuxiliaryHeaterPower>
+						<DoubleGlazing>false</DoubleGlazing>
+						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
+					</HVAC>
+				</Data>
+			</Auxiliaries>
+		</Components>
+	</v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/Conventional_completedBus_2.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/Conventional_completedBus_2.xml
new file mode 100644
index 0000000000..fc9535845d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/Conventional_completedBus_2.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
+		<Manufacturer>Some Manufacturer</Manufacturer>
+		<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+		<VIN>VEH-1234567890</VIN>
+		<Date>2021-06-30T22:00:00Z</Date>
+		<Model>Sample Bus Model</Model>
+		<LegislativeCategory>M3</LegislativeCategory>
+		<CorrectedActualMass>500</CorrectedActualMass>
+		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
+		<ClassBus>II+III</ClassBus>
+		<NgTankSystem>Compressed</NgTankSystem><!-- optional -->
+		<NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
+		<NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
+		<NumberPassengerSeatsUpperDeck>11</NumberPassengerSeatsUpperDeck>
+		<NumberPassengersStandingUpperDeck>2</NumberPassengersStandingUpperDeck>
+		<BodyworkCode>CB</BodyworkCode>
+		<LowEntry>false</LowEntry>
+		<HeightIntegratedBody>2500</HeightIntegratedBody>
+		<VehicleLength>9500</VehicleLength>
+		<VehicleWidth>2500</VehicleWidth>
+		<EntranceHeight>2000</EntranceHeight>
+		<DoorDriveTechnology>electric</DoorDriveTechnology>
+		<VehicleDeclarationType>final</VehicleDeclarationType>
+		<ADAS xsi:type="ADAS_Conventional_Type">
+			<EngineStopStart>true</EngineStopStart>
+			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
+			<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
+		</ADAS>
+		<Components xsi:type="Components_Conventional_CompletedBusType">
+			<AirDrag>
+				<v2.0:Data id="CabinX23h" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
+					<v2.0:Model>Generic Model</v2.0:Model>
+					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
+					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
+					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
+					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
+					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
+					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
+				</v2.0:Data>
+				<v2.0:Signature>
+					<di:Reference URI="#CabinX23h">
+						<di:Transforms>
+							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+						</di:Transforms>
+						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+					</di:Reference>
+				</v2.0:Signature>
+			</AirDrag>
+			<Auxiliaries>
+				<Data xsi:type="AUX_Conventional_CompletedBusType">
+					<ElectricSystem>
+						<LEDLights>
+							<Interiorlights>false</Interiorlights>
+							<Dayrunninglights>true</Dayrunninglights>
+							<Positionlights>true</Positionlights>
+							<Brakelights>true</Brakelights>
+							<Headlights>false</Headlights>
+						</LEDLights>
+					</ElectricSystem>
+					<HVAC>
+						<SystemConfiguration>6</SystemConfiguration>
+						<HeatPumpTypeDriverCompartment>
+							<Cooling>none</Cooling>
+							<Heating>none</Heating>
+						</HeatPumpTypeDriverCompartment>
+						<HeatPumpTypePassengerCompartment>
+							<Cooling>non R-744 3-stage</Cooling>
+							<Heating>none</Heating>
+						</HeatPumpTypePassengerCompartment>
+						<AuxiliaryHeaterPower>50000</AuxiliaryHeaterPower>
+						<DoubleGlazing>false</DoubleGlazing>
+						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+						<SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
+					</HVAC>
+				</Data>
+			</Auxiliaries>
+		</Components>
+	</v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/Conventional_completedBus_2_TypeApprovalNumber.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/Conventional_completedBus_2_TypeApprovalNumber.xml
new file mode 100644
index 0000000000..32136f7d90
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/Conventional_completedBus_2_TypeApprovalNumber.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
+		<Manufacturer>Some Manufacturer</Manufacturer>
+		<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+		<VIN>VEH-1234567890</VIN>
+		<Date>2021-06-30T22:00:00Z</Date>
+		<Model>Sample Bus Model</Model>
+		<LegislativeCategory>M3</LegislativeCategory>
+		<CorrectedActualMass>500</CorrectedActualMass>
+		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
+		<ClassBus>II+III</ClassBus>
+		<NgTankSystem>Compressed</NgTankSystem><!-- optional -->
+		<NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
+		<NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
+		<NumberPassengerSeatsUpperDeck>11</NumberPassengerSeatsUpperDeck>
+		<NumberPassengersStandingUpperDeck>2</NumberPassengersStandingUpperDeck>
+		<BodyworkCode>CB</BodyworkCode>
+		<LowEntry>false</LowEntry>
+		<HeightIntegratedBody>2500</HeightIntegratedBody>
+		<VehicleLength>9500</VehicleLength>
+		<VehicleWidth>2500</VehicleWidth>
+		<EntranceHeight>2000</EntranceHeight>
+		<DoorDriveTechnology>electric</DoorDriveTechnology>
+		<VehicleDeclarationType>final</VehicleDeclarationType>
+		<VehicleTypeApprovalNumber>fdsa</VehicleTypeApprovalNumber>
+		<ADAS xsi:type="ADAS_Conventional_Type">
+			<EngineStopStart>true</EngineStopStart>
+			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
+			<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
+		</ADAS>
+		<Components xsi:type="Components_Conventional_CompletedBusType">
+			<AirDrag>
+				<v2.0:Data id="CabinX23h" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
+					<v2.0:Model>Generic Model</v2.0:Model>
+					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
+					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
+					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
+					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
+					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
+					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
+				</v2.0:Data>
+				<v2.0:Signature>
+					<di:Reference URI="#CabinX23h">
+						<di:Transforms>
+							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+						</di:Transforms>
+						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+					</di:Reference>
+				</v2.0:Signature>
+			</AirDrag>
+			<Auxiliaries>
+				<Data xsi:type="AUX_Conventional_CompletedBusType">
+					<ElectricSystem>
+						<LEDLights>
+							<Interiorlights>false</Interiorlights>
+							<Dayrunninglights>true</Dayrunninglights>
+							<Positionlights>true</Positionlights>
+							<Brakelights>true</Brakelights>
+							<Headlights>false</Headlights>
+						</LEDLights>
+					</ElectricSystem>
+					<HVAC>
+						<SystemConfiguration>6</SystemConfiguration>
+						<HeatPumpTypeDriverCompartment>
+							<Cooling>none</Cooling>
+							<Heating>none</Heating>
+						</HeatPumpTypeDriverCompartment>
+						<HeatPumpTypePassengerCompartment>
+							<Cooling>non R-744 3-stage</Cooling>
+							<Heating>none</Heating>
+						</HeatPumpTypePassengerCompartment>
+						<AuxiliaryHeaterPower>50000</AuxiliaryHeaterPower>
+						<DoubleGlazing>false</DoubleGlazing>
+						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+						<SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
+					</HVAC>
+				</Data>
+			</Auxiliaries>
+		</Components>
+	</v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/HEV_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/HEV_completedBus_1.xml
new file mode 100644
index 0000000000..0a7032c6a0
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/HEV_completedBus_1.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_HEV_CompletedBusDeclarationType">
+		<Manufacturer>Some Manufacturer</Manufacturer>
+		<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+		<VIN>VEH-1234567890</VIN>
+		<Date>2021-06-30T22:00:00Z</Date>
+		<Model>Sample Bus Model</Model>
+		<LegislativeCategory>M3</LegislativeCategory>
+		<CorrectedActualMass>500</CorrectedActualMass>
+		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
+		<ClassBus>II+III</ClassBus>
+		<NgTankSystem>Compressed</NgTankSystem><!-- optional -->
+		<NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
+		<NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
+		<NumberPassengerSeatsUpperDeck>11</NumberPassengerSeatsUpperDeck>
+		<NumberPassengersStandingUpperDeck>2</NumberPassengersStandingUpperDeck>
+		<BodyworkCode>CB</BodyworkCode>
+		<LowEntry>false</LowEntry>
+		<HeightIntegratedBody>2500</HeightIntegratedBody>
+		<VehicleLength>9500</VehicleLength>
+		<VehicleWidth>2500</VehicleWidth>
+		<EntranceHeight>2000</EntranceHeight>
+		<DoorDriveTechnology>electric</DoorDriveTechnology>
+		<VehicleDeclarationType>interim</VehicleDeclarationType>
+		<ADAS xsi:type="ADAS_HEV_Type">
+			<EngineStopStart>true</EngineStopStart>
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
+		</ADAS>
+		<Components xsi:type="Components_xEV_CompletedBusType">
+			<AirDrag>
+				<v2.0:Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType">
+					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
+					<v2.0:Model>Generic Model</v2.0:Model>
+					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
+					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
+					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
+					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
+					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
+					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
+				</v2.0:Data>
+				<v2.0:Signature>
+					<di:Reference URI="#CabinX23h">
+						<di:Transforms>
+							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+						</di:Transforms>
+						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+					</di:Reference>
+				</v2.0:Signature>
+			</AirDrag>
+			<Auxiliaries>
+				<Data xsi:type="AUX_xEV_CompletedBusType">
+					<ElectricSystem>
+						<LEDLights>
+							<Interiorlights>false</Interiorlights>
+							<Dayrunninglights>true</Dayrunninglights>
+							<Positionlights>true</Positionlights>
+							<Brakelights>true</Brakelights>
+							<Headlights>false</Headlights>
+						</LEDLights>
+					</ElectricSystem>
+					<HVAC>
+						<SystemConfiguration>0</SystemConfiguration>
+						<HeatPumpTypeDriverCompartment>
+							<Cooling>non R-744 2-stage</Cooling>
+							<Heating>none</Heating>
+						</HeatPumpTypeDriverCompartment>
+						<HeatPumpTypePassengerCompartment>
+							<Cooling>non R-744 3-stage</Cooling>
+							<Heating>none</Heating>
+						</HeatPumpTypePassengerCompartment>
+						<AuxiliaryHeaterPower>50000</AuxiliaryHeaterPower>
+						<DoubleGlazing>false</DoubleGlazing>
+						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
+						<WaterElectricHeater>false</WaterElectricHeater>
+						<AirElectricHeater>false</AirElectricHeater>
+						<OtherHeatingTechnology>false</OtherHeatingTechnology>
+					</HVAC>
+				</Data>
+			</Auxiliaries>
+		</Components>
+	</v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/HEV_completedBus_2.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/HEV_completedBus_2.xml
new file mode 100644
index 0000000000..b5e6567fc0
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/HEV_completedBus_2.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_HEV_CompletedBusDeclarationType">
+		<Manufacturer>Some Manufacturer</Manufacturer>
+		<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+		<VIN>VEH-1234567890</VIN>
+		<Date>2021-06-30T22:00:00Z</Date>
+		<Model>Sample Bus Model</Model>
+		<LegislativeCategory>M3</LegislativeCategory>
+		<CorrectedActualMass>500</CorrectedActualMass>
+		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
+		<ClassBus>II+III</ClassBus>
+		<NgTankSystem>Compressed</NgTankSystem><!-- optional -->
+		<NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
+		<NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
+		<NumberPassengerSeatsUpperDeck>11</NumberPassengerSeatsUpperDeck>
+		<NumberPassengersStandingUpperDeck>2</NumberPassengersStandingUpperDeck>
+		<BodyworkCode>CB</BodyworkCode>
+		<LowEntry>false</LowEntry>
+		<HeightIntegratedBody>2500</HeightIntegratedBody>
+		<VehicleLength>9500</VehicleLength>
+		<VehicleWidth>2500</VehicleWidth>
+		<EntranceHeight>2000</EntranceHeight>
+		<DoorDriveTechnology>electric</DoorDriveTechnology>
+		<VehicleDeclarationType>final</VehicleDeclarationType>
+		<ADAS xsi:type="ADAS_HEV_Type">
+			<EngineStopStart>true</EngineStopStart>
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
+		</ADAS>
+		<Components xsi:type="Components_xEV_CompletedBusType">
+			<AirDrag>
+				<v2.0:Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType">
+					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
+					<v2.0:Model>Generic Model</v2.0:Model>
+					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
+					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
+					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
+					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
+					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
+					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
+				</v2.0:Data>
+				<v2.0:Signature>
+					<di:Reference URI="#CabinX23h">
+						<di:Transforms>
+							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+						</di:Transforms>
+						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+					</di:Reference>
+				</v2.0:Signature>
+			</AirDrag>
+			<Auxiliaries>
+				<Data xsi:type="AUX_xEV_CompletedBusType">
+					<ElectricSystem>
+						<LEDLights>
+							<Interiorlights>false</Interiorlights>
+							<Dayrunninglights>true</Dayrunninglights>
+							<Positionlights>true</Positionlights>
+							<Brakelights>true</Brakelights>
+							<Headlights>false</Headlights>
+						</LEDLights>
+					</ElectricSystem>
+					<HVAC>
+						<SystemConfiguration>6</SystemConfiguration>
+						<HeatPumpTypeDriverCompartment>
+							<Cooling>none</Cooling>
+							<Heating>none</Heating>
+						</HeatPumpTypeDriverCompartment>
+						<HeatPumpTypePassengerCompartment>
+							<Cooling>non R-744 3-stage</Cooling>
+							<Heating>none</Heating>
+						</HeatPumpTypePassengerCompartment>
+						<AuxiliaryHeaterPower>50000</AuxiliaryHeaterPower>
+						<DoubleGlazing>false</DoubleGlazing>
+						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+						<SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
+						<WaterElectricHeater>false</WaterElectricHeater>
+						<AirElectricHeater>false</AirElectricHeater>
+						<OtherHeatingTechnology>false</OtherHeatingTechnology>
+					</HVAC>
+				</Data>
+			</Auxiliaries>
+		</Components>
+	</v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/IEPC_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/IEPC_completedBus_1.xml
new file mode 100644
index 0000000000..d5fa73aefb
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/IEPC_completedBus_1.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_IEPC_CompletedBusDeclarationType">
+		<Manufacturer>Some Manufacturer</Manufacturer>
+		<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+		<VIN>VEH-1234567890</VIN>
+		<Date>2021-06-30T22:00:00Z</Date>
+		<Model>Sample Bus Model</Model>
+		<LegislativeCategory>M3</LegislativeCategory>
+		<CorrectedActualMass>500</CorrectedActualMass>
+		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
+		<ClassBus>II+III</ClassBus>
+		<NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
+		<NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
+		<NumberPassengerSeatsUpperDeck>11</NumberPassengerSeatsUpperDeck>
+		<NumberPassengersStandingUpperDeck>2</NumberPassengersStandingUpperDeck>
+		<BodyworkCode>CB</BodyworkCode>
+		<LowEntry>false</LowEntry>
+		<HeightIntegratedBody>2500</HeightIntegratedBody>
+		<VehicleLength>9500</VehicleLength>
+		<VehicleWidth>2500</VehicleWidth>
+		<EntranceHeight>2000</EntranceHeight>
+		<DoorDriveTechnology>electric</DoorDriveTechnology>
+		<VehicleDeclarationType>interim</VehicleDeclarationType>
+		<ADAS xsi:type="ADAS_IEPC_Type">
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
+		</ADAS>
+		<Components xsi:type="Components_xEV_CompletedBusType">
+			<AirDrag>
+				<v2.0:Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType">
+					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
+					<v2.0:Model>Generic Model</v2.0:Model>
+					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
+					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
+					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
+					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
+					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
+					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
+				</v2.0:Data>
+				<v2.0:Signature>
+					<di:Reference URI="#CabinX23h">
+						<di:Transforms>
+							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+						</di:Transforms>
+						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+					</di:Reference>
+				</v2.0:Signature>
+			</AirDrag>
+			<Auxiliaries>
+				<Data xsi:type="AUX_xEV_CompletedBusType">
+					<ElectricSystem>
+						<LEDLights>
+							<Interiorlights>false</Interiorlights>
+							<Dayrunninglights>true</Dayrunninglights>
+							<Positionlights>true</Positionlights>
+							<Brakelights>true</Brakelights>
+							<Headlights>false</Headlights>
+						</LEDLights>
+					</ElectricSystem>
+					<HVAC>
+						<SystemConfiguration>0</SystemConfiguration>
+						<HeatPumpTypeDriverCompartment>
+							<Cooling>non R-744 2-stage</Cooling>
+							<Heating>none</Heating>
+						</HeatPumpTypeDriverCompartment>
+						<HeatPumpTypePassengerCompartment>
+							<Cooling>non R-744 3-stage</Cooling>
+							<Heating>none</Heating>
+						</HeatPumpTypePassengerCompartment>
+						<AuxiliaryHeaterPower>50000</AuxiliaryHeaterPower>
+						<DoubleGlazing>false</DoubleGlazing>
+						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
+						<WaterElectricHeater>false</WaterElectricHeater>
+						<AirElectricHeater>false</AirElectricHeater>
+						<OtherHeatingTechnology>false</OtherHeatingTechnology>
+					</HVAC>
+				</Data>
+			</Auxiliaries>
+		</Components>
+	</v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/IEPC_completedBus_2.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/IEPC_completedBus_2.xml
new file mode 100644
index 0000000000..81adab90ec
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/IEPC_completedBus_2.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_IEPC_CompletedBusDeclarationType">
+		<Manufacturer>Some Manufacturer</Manufacturer>
+		<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+		<VIN>VEH-1234567890</VIN>
+		<Date>2021-06-30T22:00:00Z</Date>
+		<Model>Sample Bus Model</Model>
+		<LegislativeCategory>M3</LegislativeCategory>
+		<CorrectedActualMass>500</CorrectedActualMass>
+		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
+		<ClassBus>II+III</ClassBus>
+		<NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
+		<NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
+		<NumberPassengerSeatsUpperDeck>11</NumberPassengerSeatsUpperDeck>
+		<NumberPassengersStandingUpperDeck>2</NumberPassengersStandingUpperDeck>
+		<BodyworkCode>CB</BodyworkCode>
+		<LowEntry>false</LowEntry>
+		<HeightIntegratedBody>2500</HeightIntegratedBody>
+		<VehicleLength>9500</VehicleLength>
+		<VehicleWidth>2500</VehicleWidth>
+		<EntranceHeight>2000</EntranceHeight>
+		<DoorDriveTechnology>electric</DoorDriveTechnology>
+		<VehicleDeclarationType>final</VehicleDeclarationType>
+		<ADAS xsi:type="ADAS_IEPC_Type">
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
+		</ADAS>
+		<Components xsi:type="Components_xEV_CompletedBusType">
+			<AirDrag>
+				<v2.0:Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType">
+					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
+					<v2.0:Model>Generic Model</v2.0:Model>
+					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
+					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
+					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
+					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
+					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
+					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
+				</v2.0:Data>
+				<v2.0:Signature>
+					<di:Reference URI="#CabinX23h">
+						<di:Transforms>
+							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+						</di:Transforms>
+						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+					</di:Reference>
+				</v2.0:Signature>
+			</AirDrag>
+			<Auxiliaries>
+				<Data xsi:type="AUX_xEV_CompletedBusType">
+					<ElectricSystem>
+						<LEDLights>
+							<Interiorlights>false</Interiorlights>
+							<Dayrunninglights>true</Dayrunninglights>
+							<Positionlights>true</Positionlights>
+							<Brakelights>true</Brakelights>
+							<Headlights>false</Headlights>
+						</LEDLights>
+					</ElectricSystem>
+					<HVAC>
+						<SystemConfiguration>6</SystemConfiguration>
+						<HeatPumpTypeDriverCompartment>
+							<Cooling>none</Cooling>
+							<Heating>none</Heating>
+						</HeatPumpTypeDriverCompartment>
+						<HeatPumpTypePassengerCompartment>
+							<Cooling>non R-744 3-stage</Cooling>
+							<Heating>none</Heating>
+						</HeatPumpTypePassengerCompartment>
+						<AuxiliaryHeaterPower>50000</AuxiliaryHeaterPower>
+						<DoubleGlazing>false</DoubleGlazing>
+						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+						<SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
+						<WaterElectricHeater>false</WaterElectricHeater>
+						<AirElectricHeater>false</AirElectricHeater>
+						<OtherHeatingTechnology>false</OtherHeatingTechnology>
+					</HVAC>
+				</Data>
+			</Auxiliaries>
+		</Components>
+	</v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/PEV_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/PEV_completedBus_1.xml
new file mode 100644
index 0000000000..f1246dde0c
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/PEV_completedBus_1.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_PEV_CompletedBusDeclarationType">
+		<Manufacturer>Some Manufacturer</Manufacturer>
+		<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+		<VIN>VEH-1234567890</VIN>
+		<Date>2021-06-30T22:00:00Z</Date>
+		<Model>Sample Bus Model</Model>
+		<LegislativeCategory>M3</LegislativeCategory>
+		<CorrectedActualMass>500</CorrectedActualMass>
+		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
+		<ClassBus>II+III</ClassBus>
+		<NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
+		<NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
+		<NumberPassengerSeatsUpperDeck>11</NumberPassengerSeatsUpperDeck>
+		<NumberPassengersStandingUpperDeck>2</NumberPassengersStandingUpperDeck>
+		<BodyworkCode>CB</BodyworkCode>
+		<LowEntry>false</LowEntry>
+		<HeightIntegratedBody>2500</HeightIntegratedBody>
+		<VehicleLength>9500</VehicleLength>
+		<VehicleWidth>2500</VehicleWidth>
+		<EntranceHeight>2000</EntranceHeight>
+		<DoorDriveTechnology>electric</DoorDriveTechnology>
+		<VehicleDeclarationType>interim</VehicleDeclarationType>
+		<ADAS xsi:type="ADAS_PEV_Type">
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
+		</ADAS>
+		<Components xsi:type="Components_xEV_CompletedBusType">
+			<AirDrag>
+				<v2.0:Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType">
+					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
+					<v2.0:Model>Generic Model</v2.0:Model>
+					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
+					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
+					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
+					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
+					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
+					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
+				</v2.0:Data>
+				<v2.0:Signature>
+					<di:Reference URI="#CabinX23h">
+						<di:Transforms>
+							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+						</di:Transforms>
+						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+					</di:Reference>
+				</v2.0:Signature>
+			</AirDrag>
+			<Auxiliaries>
+				<Data xsi:type="AUX_xEV_CompletedBusType">
+					<ElectricSystem>
+						<LEDLights>
+							<Interiorlights>false</Interiorlights>
+							<Dayrunninglights>true</Dayrunninglights>
+							<Positionlights>true</Positionlights>
+							<Brakelights>true</Brakelights>
+							<Headlights>false</Headlights>
+						</LEDLights>
+					</ElectricSystem>
+					<HVAC>
+						<SystemConfiguration>0</SystemConfiguration>
+						<HeatPumpTypeDriverCompartment>
+							<Cooling>non R-744 2-stage</Cooling>
+							<Heating>none</Heating>
+						</HeatPumpTypeDriverCompartment>
+						<HeatPumpTypePassengerCompartment>
+							<Cooling>non R-744 3-stage</Cooling>
+							<Heating>none</Heating>
+						</HeatPumpTypePassengerCompartment>
+						<AuxiliaryHeaterPower>50000</AuxiliaryHeaterPower>
+						<DoubleGlazing>false</DoubleGlazing>
+						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
+						<WaterElectricHeater>false</WaterElectricHeater>
+						<AirElectricHeater>false</AirElectricHeater>
+						<OtherHeatingTechnology>false</OtherHeatingTechnology>
+					</HVAC>
+				</Data>
+			</Auxiliaries>
+		</Components>
+	</v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/PEV_completedBus_2.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/PEV_completedBus_2.xml
new file mode 100644
index 0000000000..84f826ee52
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/PEV_completedBus_2.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
+	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_PEV_CompletedBusDeclarationType">
+		<Manufacturer>Some Manufacturer</Manufacturer>
+		<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+		<VIN>VEH-1234567890</VIN>
+		<Date>2021-06-30T22:00:00Z</Date>
+		<Model>Sample Bus Model</Model>
+		<LegislativeCategory>M3</LegislativeCategory>
+		<CorrectedActualMass>500</CorrectedActualMass>
+		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
+		<ClassBus>II+III</ClassBus>
+		<NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
+		<NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
+		<NumberPassengerSeatsUpperDeck>11</NumberPassengerSeatsUpperDeck>
+		<NumberPassengersStandingUpperDeck>2</NumberPassengersStandingUpperDeck>
+		<BodyworkCode>CB</BodyworkCode>
+		<LowEntry>false</LowEntry>
+		<HeightIntegratedBody>2500</HeightIntegratedBody>
+		<VehicleLength>9500</VehicleLength>
+		<VehicleWidth>2500</VehicleWidth>
+		<EntranceHeight>2000</EntranceHeight>
+		<DoorDriveTechnology>electric</DoorDriveTechnology>
+		<VehicleDeclarationType>final</VehicleDeclarationType>
+		<ADAS xsi:type="ADAS_PEV_Type">
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
+		</ADAS>
+		<Components xsi:type="Components_xEV_CompletedBusType">
+			<AirDrag>
+				<v2.0:Data id="CabinX23h" xsi:type="v2.0:AirDragDataDeclarationType">
+					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
+					<v2.0:Model>Generic Model</v2.0:Model>
+					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
+					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
+					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
+					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
+					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
+					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
+				</v2.0:Data>
+				<v2.0:Signature>
+					<di:Reference URI="#CabinX23h">
+						<di:Transforms>
+							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+						</di:Transforms>
+						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<di:DigestValue>NroIsfnT7+1zYG5CTHxpclh0ZaRZvGyrfFPmWdKbFbg=</di:DigestValue>
+					</di:Reference>
+				</v2.0:Signature>
+			</AirDrag>
+			<Auxiliaries>
+				<Data xsi:type="AUX_xEV_CompletedBusType">
+					<ElectricSystem>
+						<LEDLights>
+							<Interiorlights>false</Interiorlights>
+							<Dayrunninglights>true</Dayrunninglights>
+							<Positionlights>true</Positionlights>
+							<Brakelights>true</Brakelights>
+							<Headlights>false</Headlights>
+						</LEDLights>
+					</ElectricSystem>
+					<HVAC>
+						<SystemConfiguration>6</SystemConfiguration>
+						<HeatPumpTypeDriverCompartment>
+							<Cooling>none</Cooling>
+							<Heating>none</Heating>
+						</HeatPumpTypeDriverCompartment>
+						<HeatPumpTypePassengerCompartment>
+							<Cooling>non R-744 3-stage</Cooling>
+							<Heating>none</Heating>
+						</HeatPumpTypePassengerCompartment>
+						<AuxiliaryHeaterPower>50000</AuxiliaryHeaterPower>
+						<DoubleGlazing>false</DoubleGlazing>
+						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+						<SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
+						<WaterElectricHeater>false</WaterElectricHeater>
+						<AirElectricHeater>false</AirElectricHeater>
+						<OtherHeatingTechnology>false</OtherHeatingTechnology>
+					</HVAC>
+				</Data>
+			</Auxiliaries>
+		</Components>
+	</v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PEV_primaryBus_AMT_E2.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PEV_primaryBus_AMT_E2.RSLT_VIF.xml
new file mode 100644
index 0000000000..be10cdafa5
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PEV_primaryBus_AMT_E2.RSLT_VIF.xml
@@ -0,0 +1,744 @@
+<?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-c15b1005764d4741ae98" xsi:type="PrimaryVehicleDataType">
+      <Vehicle xsi:type="PEV_Ex_VehicleVIFType">
+        <Manufacturer>TU Graz</Manufacturer>
+        <ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
+        <Model>PEV Heavy Lorry E2</Model>
+        <VIN>123467890</VIN>
+        <Date>2017-01-01T00:00:00Z</Date>
+        <LegislativeCategory>M3</LegislativeCategory>
+        <ChassisConfiguration>Bus</ChassisConfiguration>
+        <AxleConfiguration>4x2</AxleConfiguration>
+        <Articulated>false</Articulated>
+        <TechnicalPermissibleMaximumLadenMass>28000</TechnicalPermissibleMaximumLadenMass>
+        <RetarderType>None</RetarderType>
+        <AngledriveType>None</AngledriveType>
+        <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+        <ArchitectureID>E2</ArchitectureID>
+        <OvcHev>true</OvcHev>
+        <vif:ADAS xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:type="ADAS_PEV_Type">
+          <PredictiveCruiseControl>none</PredictiveCruiseControl>
+        </vif:ADAS>
+        <Components xsi:type="Vehicle_PEV-E2_ComponentsVIFType">
+          <ElectricMachine>
+            <PowertrainPosition>2</PowertrainPosition>
+            <Count>2</Count>
+            <ElectricMachineSystem>
+              <Data xsi:type="ElectricMachineSystemDataDeclarationType">
+                <Manufacturer>a</Manufacturer>
+                <Model>a</Model>
+                <CertificationMethod>Measured</CertificationMethod>
+                <CertificationNumber>token</CertificationNumber>
+                <Date>2017-01-01T00:00:00Z</Date>
+                <AppVersion>aaaaa</AppVersion>
+                <ElectricMachineType>ASM</ElectricMachineType>
+                <R85RatedPower>350000</R85RatedPower>
+                <RotationalInertia>0.23</RotationalInertia>
+                <DcDcConverterIncluded>true</DcDcConverterIncluded>
+                <IHPCType>None</IHPCType>
+                <VoltageLevel>
+                  <Voltage>600</Voltage>
+                  <ContinuousTorque>350.00</ContinuousTorque>
+                  <TestSpeedContinuousTorque>2400.00</TestSpeedContinuousTorque>
+                  <OverloadTorque>470.00</OverloadTorque>
+                  <TestSpeedOverloadTorque>2500.00</TestSpeedOverloadTorque>
+                  <OverloadDuration>120.00</OverloadDuration>
+                  <MaxTorqueCurve>
+                    <Entry outShaftSpeed="0.00" maxTorque="485.00" minTorque="-485.00" />
+                    <Entry outShaftSpeed="2461.16" maxTorque="485.00" minTorque="-485.00" />
+                    <Entry outShaftSpeed="2452.14" maxTorque="485.00" minTorque="-485.00" />
+                    <Entry outShaftSpeed="2466.86" maxTorque="483.88" minTorque="-483.88" />
+                    <Entry outShaftSpeed="2481.59" maxTorque="481.01" minTorque="-481.01" />
+                    <Entry outShaftSpeed="2496.32" maxTorque="478.17" minTorque="-478.17" />
+                    <Entry outShaftSpeed="2503.68" maxTorque="476.77" minTorque="-476.77" />
+                    <Entry outShaftSpeed="2577.32" maxTorque="463.14" minTorque="-463.14" />
+                    <Entry outShaftSpeed="2650.96" maxTorque="450.27" minTorque="-450.27" />
+                    <Entry outShaftSpeed="2724.59" maxTorque="438.10" minTorque="-438.10" />
+                    <Entry outShaftSpeed="2798.23" maxTorque="426.58" minTorque="-426.58" />
+                    <Entry outShaftSpeed="2871.87" maxTorque="415.64" minTorque="-415.64" />
+                    <Entry outShaftSpeed="2945.51" maxTorque="405.25" minTorque="-405.25" />
+                    <Entry outShaftSpeed="3019.15" maxTorque="395.36" minTorque="-395.36" />
+                    <Entry outShaftSpeed="3092.78" maxTorque="385.95" minTorque="-385.95" />
+                    <Entry outShaftSpeed="3166.42" maxTorque="376.98" minTorque="-376.98" />
+                    <Entry outShaftSpeed="3240.06" maxTorque="368.41" minTorque="-368.41" />
+                    <Entry outShaftSpeed="3313.70" maxTorque="360.22" minTorque="-360.22" />
+                    <Entry outShaftSpeed="3387.33" maxTorque="352.39" minTorque="-352.39" />
+                    <Entry outShaftSpeed="3460.97" maxTorque="344.90" minTorque="-344.90" />
+                    <Entry outShaftSpeed="3534.61" maxTorque="337.71" minTorque="-337.71" />
+                    <Entry outShaftSpeed="3608.25" maxTorque="330.82" minTorque="-330.82" />
+                    <Entry outShaftSpeed="3681.89" maxTorque="324.20" minTorque="-324.20" />
+                    <Entry outShaftSpeed="3755.52" maxTorque="317.84" minTorque="-317.84" />
+                    <Entry outShaftSpeed="3829.16" maxTorque="311.73" minTorque="-311.73" />
+                    <Entry outShaftSpeed="3902.80" maxTorque="305.85" minTorque="-305.85" />
+                    <Entry outShaftSpeed="3976.44" maxTorque="300.18" minTorque="-300.18" />
+                    <Entry outShaftSpeed="4050.07" maxTorque="294.72" minTorque="-294.72" />
+                    <Entry outShaftSpeed="4123.71" maxTorque="289.46" minTorque="-289.46" />
+                    <Entry outShaftSpeed="4197.35" maxTorque="284.38" minTorque="-284.38" />
+                    <Entry outShaftSpeed="4270.99" maxTorque="279.48" minTorque="-279.48" />
+                    <Entry outShaftSpeed="4344.62" maxTorque="274.74" minTorque="-274.74" />
+                    <Entry outShaftSpeed="4418.26" maxTorque="270.17" minTorque="-270.17" />
+                    <Entry outShaftSpeed="4491.90" maxTorque="265.73" minTorque="-265.73" />
+                    <Entry outShaftSpeed="4565.54" maxTorque="261.45" minTorque="-261.45" />
+                    <Entry outShaftSpeed="4639.18" maxTorque="257.30" minTorque="-257.30" />
+                    <Entry outShaftSpeed="4712.81" maxTorque="253.28" minTorque="-253.28" />
+                    <Entry outShaftSpeed="4786.45" maxTorque="249.39" minTorque="-249.39" />
+                    <Entry outShaftSpeed="4860.09" maxTorque="245.60" minTorque="-245.60" />
+                    <Entry outShaftSpeed="4933.73" maxTorque="241.94" minTorque="-241.94" />
+                    <Entry outShaftSpeed="5007.36" maxTorque="238.38" minTorque="-238.38" />
+                    <Entry outShaftSpeed="5081.00" maxTorque="234.92" minTorque="-234.92" />
+                    <Entry outShaftSpeed="5154.64" maxTorque="231.58" minTorque="-231.58" />
+                    <Entry outShaftSpeed="5228.28" maxTorque="228.31" minTorque="-228.31" />
+                    <Entry outShaftSpeed="5301.91" maxTorque="225.14" minTorque="-225.14" />
+                    <Entry outShaftSpeed="5375.55" maxTorque="222.06" minTorque="-222.06" />
+                    <Entry outShaftSpeed="5449.19" maxTorque="219.05" minTorque="-219.05" />
+                    <Entry outShaftSpeed="5522.83" maxTorque="216.13" minTorque="-216.13" />
+                    <Entry outShaftSpeed="5596.47" maxTorque="213.29" minTorque="-213.29" />
+                    <Entry outShaftSpeed="5670.10" maxTorque="210.51" minTorque="-210.51" />
+                    <Entry outShaftSpeed="5743.74" maxTorque="207.82" minTorque="-207.82" />
+                    <Entry outShaftSpeed="5817.38" maxTorque="205.19" minTorque="-205.19" />
+                    <Entry outShaftSpeed="5891.02" maxTorque="202.62" minTorque="-202.62" />
+                    <Entry outShaftSpeed="5964.65" maxTorque="200.12" minTorque="-200.12" />
+                    <Entry outShaftSpeed="6038.29" maxTorque="197.69" minTorque="-197.69" />
+                    <Entry outShaftSpeed="6111.93" maxTorque="195.30" minTorque="-195.30" />
+                    <Entry outShaftSpeed="6185.57" maxTorque="192.97" minTorque="-192.97" />
+                    <Entry outShaftSpeed="6259.20" maxTorque="190.70" minTorque="-190.70" />
+                    <Entry outShaftSpeed="6332.84" maxTorque="188.48" minTorque="-188.48" />
+                    <Entry outShaftSpeed="6406.48" maxTorque="186.32" minTorque="-186.32" />
+                    <Entry outShaftSpeed="6480.12" maxTorque="184.20" minTorque="-184.20" />
+                    <Entry outShaftSpeed="6553.76" maxTorque="182.13" minTorque="-182.13" />
+                    <Entry outShaftSpeed="6627.39" maxTorque="180.10" minTorque="-180.10" />
+                    <Entry outShaftSpeed="6701.03" maxTorque="178.13" minTorque="-178.13" />
+                    <Entry outShaftSpeed="6774.67" maxTorque="176.20" minTorque="-176.20" />
+                    <Entry outShaftSpeed="6848.31" maxTorque="174.30" minTorque="-174.30" />
+                    <Entry outShaftSpeed="6921.94" maxTorque="172.44" minTorque="-172.44" />
+                    <Entry outShaftSpeed="6995.58" maxTorque="170.64" minTorque="-170.64" />
+                    <Entry outShaftSpeed="7069.22" maxTorque="168.85" minTorque="-168.85" />
+                    <Entry outShaftSpeed="7142.86" maxTorque="167.11" minTorque="-167.11" />
+                    <Entry outShaftSpeed="7216.49" maxTorque="165.41" minTorque="-165.41" />
+                    <Entry outShaftSpeed="7290.13" maxTorque="163.74" minTorque="-163.74" />
+                    <Entry outShaftSpeed="7363.77" maxTorque="162.10" minTorque="-162.10" />
+                  </MaxTorqueCurve>
+                </VoltageLevel>
+                <VoltageLevel>
+                  <Voltage>600</Voltage>
+                  <ContinuousTorque>350.00</ContinuousTorque>
+                  <TestSpeedContinuousTorque>2400.00</TestSpeedContinuousTorque>
+                  <OverloadTorque>470.00</OverloadTorque>
+                  <TestSpeedOverloadTorque>2500.00</TestSpeedOverloadTorque>
+                  <OverloadDuration>120.00</OverloadDuration>
+                  <MaxTorqueCurve>
+                    <Entry outShaftSpeed="0.00" maxTorque="485.00" minTorque="-485.00" />
+                    <Entry outShaftSpeed="2461.16" maxTorque="485.00" minTorque="-485.00" />
+                    <Entry outShaftSpeed="2452.14" maxTorque="485.00" minTorque="-485.00" />
+                    <Entry outShaftSpeed="2466.86" maxTorque="483.88" minTorque="-483.88" />
+                    <Entry outShaftSpeed="2481.59" maxTorque="481.01" minTorque="-481.01" />
+                    <Entry outShaftSpeed="2496.32" maxTorque="478.17" minTorque="-478.17" />
+                    <Entry outShaftSpeed="2503.68" maxTorque="476.77" minTorque="-476.77" />
+                    <Entry outShaftSpeed="2577.32" maxTorque="463.14" minTorque="-463.14" />
+                    <Entry outShaftSpeed="2650.96" maxTorque="450.27" minTorque="-450.27" />
+                    <Entry outShaftSpeed="2724.59" maxTorque="438.10" minTorque="-438.10" />
+                    <Entry outShaftSpeed="2798.23" maxTorque="426.58" minTorque="-426.58" />
+                    <Entry outShaftSpeed="2871.87" maxTorque="415.64" minTorque="-415.64" />
+                    <Entry outShaftSpeed="2945.51" maxTorque="405.25" minTorque="-405.25" />
+                    <Entry outShaftSpeed="3019.15" maxTorque="395.36" minTorque="-395.36" />
+                    <Entry outShaftSpeed="3092.78" maxTorque="385.95" minTorque="-385.95" />
+                    <Entry outShaftSpeed="3166.42" maxTorque="376.98" minTorque="-376.98" />
+                    <Entry outShaftSpeed="3240.06" maxTorque="368.41" minTorque="-368.41" />
+                    <Entry outShaftSpeed="3313.70" maxTorque="360.22" minTorque="-360.22" />
+                    <Entry outShaftSpeed="3387.33" maxTorque="352.39" minTorque="-352.39" />
+                    <Entry outShaftSpeed="3460.97" maxTorque="344.90" minTorque="-344.90" />
+                    <Entry outShaftSpeed="3534.61" maxTorque="337.71" minTorque="-337.71" />
+                    <Entry outShaftSpeed="3608.25" maxTorque="330.82" minTorque="-330.82" />
+                    <Entry outShaftSpeed="3681.89" maxTorque="324.20" minTorque="-324.20" />
+                    <Entry outShaftSpeed="3755.52" maxTorque="317.84" minTorque="-317.84" />
+                    <Entry outShaftSpeed="3829.16" maxTorque="311.73" minTorque="-311.73" />
+                    <Entry outShaftSpeed="3902.80" maxTorque="305.85" minTorque="-305.85" />
+                    <Entry outShaftSpeed="3976.44" maxTorque="300.18" minTorque="-300.18" />
+                    <Entry outShaftSpeed="4050.07" maxTorque="294.72" minTorque="-294.72" />
+                    <Entry outShaftSpeed="4123.71" maxTorque="289.46" minTorque="-289.46" />
+                    <Entry outShaftSpeed="4197.35" maxTorque="284.38" minTorque="-284.38" />
+                    <Entry outShaftSpeed="4270.99" maxTorque="279.48" minTorque="-279.48" />
+                    <Entry outShaftSpeed="4344.62" maxTorque="274.74" minTorque="-274.74" />
+                    <Entry outShaftSpeed="4418.26" maxTorque="270.17" minTorque="-270.17" />
+                    <Entry outShaftSpeed="4491.90" maxTorque="265.73" minTorque="-265.73" />
+                    <Entry outShaftSpeed="4565.54" maxTorque="261.45" minTorque="-261.45" />
+                    <Entry outShaftSpeed="4639.18" maxTorque="257.30" minTorque="-257.30" />
+                    <Entry outShaftSpeed="4712.81" maxTorque="253.28" minTorque="-253.28" />
+                    <Entry outShaftSpeed="4786.45" maxTorque="249.39" minTorque="-249.39" />
+                    <Entry outShaftSpeed="4860.09" maxTorque="245.60" minTorque="-245.60" />
+                    <Entry outShaftSpeed="4933.73" maxTorque="241.94" minTorque="-241.94" />
+                    <Entry outShaftSpeed="5007.36" maxTorque="238.38" minTorque="-238.38" />
+                    <Entry outShaftSpeed="5081.00" maxTorque="234.92" minTorque="-234.92" />
+                    <Entry outShaftSpeed="5154.64" maxTorque="231.58" minTorque="-231.58" />
+                    <Entry outShaftSpeed="5228.28" maxTorque="228.31" minTorque="-228.31" />
+                    <Entry outShaftSpeed="5301.91" maxTorque="225.14" minTorque="-225.14" />
+                    <Entry outShaftSpeed="5375.55" maxTorque="222.06" minTorque="-222.06" />
+                    <Entry outShaftSpeed="5449.19" maxTorque="219.05" minTorque="-219.05" />
+                    <Entry outShaftSpeed="5522.83" maxTorque="216.13" minTorque="-216.13" />
+                    <Entry outShaftSpeed="5596.47" maxTorque="213.29" minTorque="-213.29" />
+                    <Entry outShaftSpeed="5670.10" maxTorque="210.51" minTorque="-210.51" />
+                    <Entry outShaftSpeed="5743.74" maxTorque="207.82" minTorque="-207.82" />
+                    <Entry outShaftSpeed="5817.38" maxTorque="205.19" minTorque="-205.19" />
+                    <Entry outShaftSpeed="5891.02" maxTorque="202.62" minTorque="-202.62" />
+                    <Entry outShaftSpeed="5964.65" maxTorque="200.12" minTorque="-200.12" />
+                    <Entry outShaftSpeed="6038.29" maxTorque="197.69" minTorque="-197.69" />
+                    <Entry outShaftSpeed="6111.93" maxTorque="195.30" minTorque="-195.30" />
+                    <Entry outShaftSpeed="6185.57" maxTorque="192.97" minTorque="-192.97" />
+                    <Entry outShaftSpeed="6259.20" maxTorque="190.70" minTorque="-190.70" />
+                    <Entry outShaftSpeed="6332.84" maxTorque="188.48" minTorque="-188.48" />
+                    <Entry outShaftSpeed="6406.48" maxTorque="186.32" minTorque="-186.32" />
+                    <Entry outShaftSpeed="6480.12" maxTorque="184.20" minTorque="-184.20" />
+                    <Entry outShaftSpeed="6553.76" maxTorque="182.13" minTorque="-182.13" />
+                    <Entry outShaftSpeed="6627.39" maxTorque="180.10" minTorque="-180.10" />
+                    <Entry outShaftSpeed="6701.03" maxTorque="178.13" minTorque="-178.13" />
+                    <Entry outShaftSpeed="6774.67" maxTorque="176.20" minTorque="-176.20" />
+                    <Entry outShaftSpeed="6848.31" maxTorque="174.30" minTorque="-174.30" />
+                    <Entry outShaftSpeed="6921.94" maxTorque="172.44" minTorque="-172.44" />
+                    <Entry outShaftSpeed="6995.58" maxTorque="170.64" minTorque="-170.64" />
+                    <Entry outShaftSpeed="7069.22" maxTorque="168.85" minTorque="-168.85" />
+                    <Entry outShaftSpeed="7142.86" maxTorque="167.11" minTorque="-167.11" />
+                    <Entry outShaftSpeed="7216.49" maxTorque="165.41" minTorque="-165.41" />
+                    <Entry outShaftSpeed="7290.13" maxTorque="163.74" minTorque="-163.74" />
+                    <Entry outShaftSpeed="7363.77" maxTorque="162.10" minTorque="-162.10" />
+                  </MaxTorqueCurve>
+                </VoltageLevel>
+                <DragCurve>
+                  <Entry outShaftSpeed="0.00" dragTorque="10.00" />
+                  <Entry outShaftSpeed="7363.00" dragTorque="30.00" />
+                </DragCurve>
+                <Conditioning>
+                  <Entry coolantTempInlet="30" coolingPower="5000" />
+                </Conditioning>
+              </Data>
+            </ElectricMachineSystem>
+          </ElectricMachine>
+          <ElectricEnergyStorage>
+            <Battery>
+              <StringID>0</StringID>
+              <REESS>
+                <Data xsi:type="BatterySystemDataType">
+                  <Manufacturer>a</Manufacturer>
+                  <Model>a</Model>
+                  <CertificationMethod>Measured</CertificationMethod>
+                  <CertificationNumber>token</CertificationNumber>
+                  <Date>2017-01-01T00:00:00Z</Date>
+                  <AppVersion>aaaaa</AppVersion>
+                  <BatteryType>HPBS</BatteryType>
+                  <RatedCapacity>324.00</RatedCapacity>
+                  <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+                  <JunctionboxIncluded>true</JunctionboxIncluded>
+                  <TestingTemperature>20</TestingTemperature>
+                  <OCV>
+                    <Entry SoC="0" OCV="673.50" />
+                    <Entry SoC="100" OCV="750.20" />
+                  </OCV>
+                  <CurrentLimits>
+                    <Entry SoC="0" maxChargingCurrent="500.00" maxDischargingCurrent="500.00" />
+                    <Entry SoC="100" maxChargingCurrent="500.00" maxDischargingCurrent="500.00" />
+                  </CurrentLimits>
+                </Data>
+              </REESS>
+            </Battery>
+            <Battery>
+              <StringID>1</StringID>
+              <REESS>
+                <Data xsi:type="BatterySystemDataType">
+                  <Manufacturer>a</Manufacturer>
+                  <Model>a</Model>
+                  <CertificationMethod>Measured</CertificationMethod>
+                  <CertificationNumber>token</CertificationNumber>
+                  <Date>2017-01-01T00:00:00Z</Date>
+                  <AppVersion>aaaaa</AppVersion>
+                  <BatteryType>HPBS</BatteryType>
+                  <RatedCapacity>324.00</RatedCapacity>
+                  <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+                  <JunctionboxIncluded>true</JunctionboxIncluded>
+                  <TestingTemperature>20</TestingTemperature>
+                  <OCV>
+                    <Entry SoC="0" OCV="673.50" />
+                    <Entry SoC="100" OCV="750.20" />
+                  </OCV>
+                  <CurrentLimits>
+                    <Entry SoC="0" maxChargingCurrent="500.00" maxDischargingCurrent="500.00" />
+                    <Entry SoC="100" maxChargingCurrent="500.00" maxDischargingCurrent="500.00" />
+                  </CurrentLimits>
+                </Data>
+              </REESS>
+            </Battery>
+          </ElectricEnergyStorage>
+          <Transmission>
+            <Data xsi:type="TransmissionDataVIFType">
+              <Manufacturer>N/A</Manufacturer>
+              <Model>tractor_12gear_example</Model>
+              <MainCertificationMethod>Standard values</MainCertificationMethod>
+              <Date>2022-09-16T12:47:03.1869453Z</Date>
+              <AppVersion>VectoCore</AppVersion>
+              <TransmissionType>AMT</TransmissionType>
+              <Gears xsi:type="TransmissionGearsVIFType">
+                <Gear number="1">
+                  <Ratio>14.930</Ratio>
+                  <MaxTorque>5000</MaxTorque>
+                  <MaxSpeed>2900</MaxSpeed>
+                </Gear>
+                <Gear number="2">
+                  <Ratio>11.640</Ratio>
+                  <MaxTorque>5000</MaxTorque>
+                  <MaxSpeed>2900</MaxSpeed>
+                </Gear>
+                <Gear number="3">
+                  <Ratio>9.020</Ratio>
+                  <MaxTorque>5000</MaxTorque>
+                  <MaxSpeed>2900</MaxSpeed>
+                </Gear>
+                <Gear number="4">
+                  <Ratio>7.040</Ratio>
+                  <MaxTorque>5000</MaxTorque>
+                  <MaxSpeed>2900</MaxSpeed>
+                </Gear>
+                <Gear number="5">
+                  <Ratio>5.640</Ratio>
+                  <MaxTorque>5000</MaxTorque>
+                  <MaxSpeed>2900</MaxSpeed>
+                </Gear>
+                <Gear number="6">
+                  <Ratio>4.400</Ratio>
+                  <MaxTorque>5000</MaxTorque>
+                  <MaxSpeed>2900</MaxSpeed>
+                </Gear>
+                <Gear number="7">
+                  <Ratio>3.390</Ratio>
+                  <MaxTorque>5000</MaxTorque>
+                  <MaxSpeed>2900</MaxSpeed>
+                </Gear>
+                <Gear number="8">
+                  <Ratio>2.650</Ratio>
+                  <MaxTorque>5000</MaxTorque>
+                  <MaxSpeed>2900</MaxSpeed>
+                </Gear>
+                <Gear number="9">
+                  <Ratio>2.050</Ratio>
+                  <MaxTorque>5000</MaxTorque>
+                  <MaxSpeed>2900</MaxSpeed>
+                </Gear>
+                <Gear number="10">
+                  <Ratio>1.600</Ratio>
+                  <MaxTorque>5000</MaxTorque>
+                  <MaxSpeed>2900</MaxSpeed>
+                </Gear>
+                <Gear number="11">
+                  <Ratio>1.280</Ratio>
+                  <MaxTorque>5000</MaxTorque>
+                  <MaxSpeed>2900</MaxSpeed>
+                </Gear>
+                <Gear number="12">
+                  <Ratio>1.000</Ratio>
+                  <MaxTorque>5000</MaxTorque>
+                  <MaxSpeed>2900</MaxSpeed>
+                </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>
+          <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>
+                  <Tyre>
+                    <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+                      <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+                      <Model>Generic Wheel</Model>
+                      <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+                      <Date>2017-01-11T14:00:00Z</Date>
+                      <AppVersion>Tyre Generation App 1.0</AppVersion>
+                      <Dimension>315/70 R22.5</Dimension>
+                      <RRCDeclared>0.0055</RRCDeclared>
+                      <FzISO>31300</FzISO>
+                    </Data>
+                    <Signature>
+                      <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+                        <di:Transforms>
+                          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                        </di:Transforms>
+                        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                        <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+                      </di:Reference>
+                    </Signature>
+                  </Tyre>
+                </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>
+                  <Tyre>
+                    <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+                      <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+                      <Model>Generic Wheel</Model>
+                      <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+                      <Date>2017-01-11T14:00:00Z</Date>
+                      <AppVersion>Tyre Generation App 1.0</AppVersion>
+                      <Dimension>315/70 R22.5</Dimension>
+                      <RRCDeclared>0.0063</RRCDeclared>
+                      <FzISO>31300</FzISO>
+                    </Data>
+                    <Signature>
+                      <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+                        <di:Transforms>
+                          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                        </di:Transforms>
+                        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                        <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+                      </di:Reference>
+                    </Signature>
+                  </Tyre>
+                </vif:Axle>
+              </Axles>
+            </Data>
+          </AxleWheels>
+          <Auxiliaries>
+            <Data xsi:type="AUX_PEV_PrimaryBusType">
+              <SteeringPump>
+                <Technology axleNumber="1">Electric driven pump</Technology>
+              </SteeringPump>
+              <PneumaticSystem>
+                <CompressorDrive>electrically</CompressorDrive>
+                <SmartRegenerationSystem>false</SmartRegenerationSystem>
+                <AirsuspensionControl>electronically</AirsuspensionControl>
+                <PneumaticSCRReagentDosing>false</PneumaticSCRReagentDosing>
+              </PneumaticSystem>
+              <HVAC>
+                <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+              </HVAC>
+            </Data>
+          </Auxiliaries>
+        </Components>
+      </Vehicle>
+      <InputDataSignature>
+        <di:Reference URI="#PEV_E2_PrimaryBus">
+          <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>pFMapJC+536c3vad9hTagUmxmIu3pSMmhap81TLAZnU=</di:DigestValue>
+        </di:Reference>
+      </InputDataSignature>
+      <ManufacturerRecordSignature>
+        <di:Reference URI="#MRF-715892a015674b92839f">
+          <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>fiO2I8jCgaiYJpDIpFp1iiieV6EHqbh37KVuGfpiiRc=</di:DigestValue>
+        </di:Reference>
+      </ManufacturerRecordSignature>
+      <Results>
+        <Status>success</Status>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">4.68</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">5.98</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">3.99</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">5.10</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">3.39</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">4.32</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13050</TotalVehicleMass>
+            <Payload unit="kg">1075</Payload>
+            <PassengerCount>15.15</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">3.17</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">15495</TotalVehicleMass>
+            <Payload unit="kg">3520</Payload>
+            <PassengerCount>49.57</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">3.56</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">5.04</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">6.67</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">4.31</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">5.66</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">3.69</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">4.73</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14225</TotalVehicleMass>
+            <Payload unit="kg">1075</Payload>
+            <PassengerCount>15.15</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">3.11</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16670</TotalVehicleMass>
+            <Payload unit="kg">3520</Payload>
+            <PassengerCount>49.57</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">3.52</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14245</TotalVehicleMass>
+            <Payload unit="kg">1095</Payload>
+            <PassengerCount>15.42</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">3.10</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">15887</TotalVehicleMass>
+            <Payload unit="kg">2737</Payload>
+            <PassengerCount>38.56</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">3.27</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14663</TotalVehicleMass>
+            <Payload unit="kg">1263</Payload>
+            <PassengerCount>17.79</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">3.27</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17609</TotalVehicleMass>
+            <Payload unit="kg">4209</Payload>
+            <PassengerCount>59.29</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">3.77</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14747</TotalVehicleMass>
+            <Payload unit="kg">1347</Payload>
+            <PassengerCount>18.97</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">3.33</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16768</TotalVehicleMass>
+            <Payload unit="kg">3368</Payload>
+            <PassengerCount>47.43</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">3.55</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+      </Results>
+      <ApplicationInformation>
+        <SimulationToolVersion>0.7.10.3035-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+        <Date>2023-04-24T10:13:08.3811968Z</Date>
+      </ApplicationInformation>
+    </Data>
+    <Signature>
+      <di:Reference URI="#VIF_P-c15b1005764d4741ae98">
+        <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>2345KDOjnWQUcdUs5nqnoozbDzwgAz1dqz+NtF6tNuY=</di:DigestValue>
+      </di:Reference>
+    </Signature>
+  </PrimaryVehicle>
+</VectoOutputMultistep>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCityBus_IEPC-S_Base.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCityBus_IEPC-S_Base.RSLT_VIF.xml
new file mode 100644
index 0000000000..70adebaa47
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCityBus_IEPC-S_Base.RSLT_VIF.xml
@@ -0,0 +1,1027 @@
+<?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-5da41b8e905c4c4b90cf" xsi:type="PrimaryVehicleDataType">
+      <Vehicle xsi:type="HEV-IEPC-S_VehicleVIFType">
+        <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+        <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
+        <Model>Generic Model</Model>
+        <VIN>VEH-1234567890</VIN>
+        <Date>2017-02-15T11:00:00Z</Date>
+        <LegislativeCategory>M3</LegislativeCategory>
+        <ChassisConfiguration>Bus</ChassisConfiguration>
+        <AxleConfiguration>4x2</AxleConfiguration>
+        <Articulated>false</Articulated>
+        <TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
+        <IdlingSpeed>1</IdlingSpeed>
+        <RetarderType>None</RetarderType>
+        <AngledriveType>None</AngledriveType>
+        <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+        <ArchitectureID>S-IEPC</ArchitectureID>
+        <OvcHev>true</OvcHev>
+        <vif:ADAS xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:type="ADAS_HEV_Type">
+          <EngineStopStart>true</EngineStopStart>
+          <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+        </vif:ADAS>
+        <Components xsi:type="Vehicle_HEV-IEPC-S_ComponentsVIFType">
+          <Engine>
+            <Data xsi:type="EngineDataVIFType">
+              <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+              <Model>Generic 40t Long Haul Truck Engine</Model>
+              <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+              <Date>2017-02-15T11:00:00Z</Date>
+              <AppVersion>VectoEngine x.y</AppVersion>
+              <Displacement>12700</Displacement>
+              <RatedSpeed>1800</RatedSpeed>
+              <RatedPower>325000</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="-125.56" />
+                  <Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-130.72" />
+                  <Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-135.85" />
+                  <Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-146.72" />
+                  <Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-156.83" />
+                  <Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-183.84" />
+                  <Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-207.31" />
+                  <Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-236.72" />
+                  <Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-248.49" />
+                  <Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-274.38" />
+                </FullLoadAndDragCurve>
+                <Fuels>
+                  <FuelType>Diesel CI</FuelType>
+                </Fuels>
+              </Mode>
+            </Data>
+          </Engine>
+          <ElectricMachineGEN>
+            <PowertrainPosition>GEN</PowertrainPosition>
+            <Count>1</Count>
+            <ElectricMachineSystem>
+              <Data xsi:type="ElectricMachineSystemDataDeclarationType">
+                <Manufacturer>a</Manufacturer>
+                <Model>a</Model>
+                <CertificationMethod>Measured</CertificationMethod>
+                <CertificationNumber>token</CertificationNumber>
+                <Date>2017-01-01T00:00:00Z</Date>
+                <AppVersion>aaaaa</AppVersion>
+                <ElectricMachineType>ASM</ElectricMachineType>
+                <R85RatedPower>200000</R85RatedPower>
+                <RotationalInertia>0.13</RotationalInertia>
+                <DcDcConverterIncluded>true</DcDcConverterIncluded>
+                <IHPCType>None</IHPCType>
+                <VoltageLevel>
+                  <Voltage>1</Voltage>
+                  <ContinuousTorque>798.00</ContinuousTorque>
+                  <TestSpeedContinuousTorque>1850.00</TestSpeedContinuousTorque>
+                  <OverloadTorque>1030.00</OverloadTorque>
+                  <TestSpeedOverloadTorque>1850.00</TestSpeedOverloadTorque>
+                  <OverloadDuration>120.00</OverloadDuration>
+                  <MaxTorqueCurve>
+                    <Entry outShaftSpeed="0.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="37.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="370.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="740.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="1110.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="1480.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="1850.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="2220.00" maxTorque="858.33" minTorque="-858.33" />
+                    <Entry outShaftSpeed="2590.00" maxTorque="735.71" minTorque="-735.71" />
+                  </MaxTorqueCurve>
+                </VoltageLevel>
+                <VoltageLevel>
+                  <Voltage>1000</Voltage>
+                  <ContinuousTorque>798.00</ContinuousTorque>
+                  <TestSpeedContinuousTorque>1850.00</TestSpeedContinuousTorque>
+                  <OverloadTorque>1030.00</OverloadTorque>
+                  <TestSpeedOverloadTorque>1850.00</TestSpeedOverloadTorque>
+                  <OverloadDuration>120.00</OverloadDuration>
+                  <MaxTorqueCurve>
+                    <Entry outShaftSpeed="0.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="37.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="370.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="740.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="1110.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="1480.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="1850.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="2220.00" maxTorque="858.33" minTorque="-858.33" />
+                    <Entry outShaftSpeed="2590.00" maxTorque="735.71" minTorque="-735.71" />
+                  </MaxTorqueCurve>
+                </VoltageLevel>
+                <DragCurve>
+                  <Entry outShaftSpeed="0.00" dragTorque="-1.89" />
+                  <Entry outShaftSpeed="37.00" dragTorque="-2.01" />
+                  <Entry outShaftSpeed="370.00" dragTorque="-3.02" />
+                  <Entry outShaftSpeed="740.00" dragTorque="-4.14" />
+                  <Entry outShaftSpeed="1110.00" dragTorque="-5.26" />
+                  <Entry outShaftSpeed="1480.00" dragTorque="-6.38" />
+                  <Entry outShaftSpeed="1850.00" dragTorque="-7.50" />
+                  <Entry outShaftSpeed="2220.00" dragTorque="-8.62" />
+                  <Entry outShaftSpeed="2590.00" dragTorque="-9.74" />
+                </DragCurve>
+                <Conditioning>
+                  <Entry coolantTempInlet="30" coolingPower="5000" />
+                </Conditioning>
+              </Data>
+            </ElectricMachineSystem>
+          </ElectricMachineGEN>
+          <ElectricEnergyStorage>
+            <Battery>
+              <StringID>0</StringID>
+              <REESS>
+                <Data xsi:type="BatterySystemDataType">
+                  <Manufacturer>a</Manufacturer>
+                  <Model>a</Model>
+                  <CertificationMethod>Measured</CertificationMethod>
+                  <CertificationNumber>token</CertificationNumber>
+                  <Date>2017-01-01T00:00:00Z</Date>
+                  <AppVersion>aaaaa</AppVersion>
+                  <BatteryType>HPBS</BatteryType>
+                  <RatedCapacity>72.00</RatedCapacity>
+                  <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+                  <JunctionboxIncluded>true</JunctionboxIncluded>
+                  <TestingTemperature>20</TestingTemperature>
+                  <OCV>
+                    <Entry SoC="0" OCV="718.42" />
+                    <Entry SoC="10" OCV="746.84" />
+                    <Entry SoC="20" OCV="763.14" />
+                    <Entry SoC="30" OCV="771.85" />
+                    <Entry SoC="40" OCV="776.26" />
+                    <Entry SoC="50" OCV="778.61" />
+                    <Entry SoC="60" OCV="780.43" />
+                    <Entry SoC="70" OCV="782.70" />
+                    <Entry SoC="80" OCV="786.19" />
+                    <Entry SoC="90" OCV="791.68" />
+                    <Entry SoC="100" OCV="800.21" />
+                  </OCV>
+                  <CurrentLimits>
+                    <Entry SoC="0" maxChargingCurrent="1620.00" maxDischargingCurrent="1620.00" />
+                    <Entry SoC="100" maxChargingCurrent="1620.00" maxDischargingCurrent="1620.00" />
+                  </CurrentLimits>
+                </Data>
+              </REESS>
+              <SOCmin>8</SOCmin>
+              <SOCmax>92</SOCmax>
+            </Battery>
+          </ElectricEnergyStorage>
+          <IEPC>
+            <Data xsi:type="IEPCDataDeclarationType">
+              <Manufacturer>a</Manufacturer>
+              <Model>a</Model>
+              <CertificationNumber>token</CertificationNumber>
+              <Date>2017-01-01T00:00:00Z</Date>
+              <AppVersion>aaaaa</AppVersion>
+              <ElectricMachineType>PSM</ElectricMachineType>
+              <CertificationMethod>Measured for complete component</CertificationMethod>
+              <R85RatedPower>325000</R85RatedPower>
+              <RotationalInertia>0.86</RotationalInertia>
+              <DifferentialIncluded>true</DifferentialIncluded>
+              <DesignTypeWheelMotor>false</DesignTypeWheelMotor>
+              <Gears xsi:type="IEPCGearsDeclarationType">
+                <Gear number="1">
+                  <Ratio>8.310</Ratio>
+                </Gear>
+                <Gear number="2">
+                  <Ratio>4.650</Ratio>
+                </Gear>
+                <Gear number="3">
+                  <Ratio>2.750</Ratio>
+                </Gear>
+              </Gears>
+              <VoltageLevel>
+                <Voltage>100</Voltage>
+                <ContinuousTorque>1000.00</ContinuousTorque>
+                <TestSpeedContinuousTorque>2069.00</TestSpeedContinuousTorque>
+                <OverloadTorque>1500.00</OverloadTorque>
+                <TestSpeedOverloadTorque>2069.00</TestSpeedOverloadTorque>
+                <OverloadDuration>120.00</OverloadDuration>
+                <MaxTorqueCurve>
+                  <v2.3:Entry outShaftSpeed="0.00" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="5.65" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="57.02" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="114.05" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="170.94" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="227.96" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="284.99" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="342.01" maxTorque="8363.52" minTorque="-8363.52" />
+                  <v2.3:Entry outShaftSpeed="399.04" maxTorque="7168.74" minTorque="-7168.74" />
+                  <v2.3:Entry outShaftSpeed="455.92" maxTorque="6272.64" minTorque="-6272.64" />
+                  <v2.3:Entry outShaftSpeed="512.95" maxTorque="5575.66" minTorque="-5575.66" />
+                  <v2.3:Entry outShaftSpeed="569.97" maxTorque="5018.11" minTorque="-5018.11" />
+                  <v2.3:Entry outShaftSpeed="627.00" maxTorque="4561.93" minTorque="-4561.93" />
+                  <v2.3:Entry outShaftSpeed="684.02" maxTorque="4181.76" minTorque="-4181.76" />
+                  <v2.3:Entry outShaftSpeed="740.91" maxTorque="3860.07" minTorque="-3860.07" />
+                  <v2.3:Entry outShaftSpeed="797.93" maxTorque="3584.34" minTorque="-3584.34" />
+                  <v2.3:Entry outShaftSpeed="854.96" maxTorque="3345.41" minTorque="-3345.41" />
+                  <v2.3:Entry outShaftSpeed="911.98" maxTorque="3136.32" minTorque="-3136.32" />
+                  <v2.3:Entry outShaftSpeed="969.01" maxTorque="2951.85" minTorque="-2951.85" />
+                  <v2.3:Entry outShaftSpeed="1025.90" maxTorque="2787.86" minTorque="-2787.86" />
+                  <v2.3:Entry outShaftSpeed="1082.92" maxTorque="2641.13" minTorque="-2641.13" />
+                  <v2.3:Entry outShaftSpeed="1139.94" maxTorque="2509.06" minTorque="-2509.06" />
+                </MaxTorqueCurve>
+              </VoltageLevel>
+              <VoltageLevel>
+                <Voltage>1000</Voltage>
+                <ContinuousTorque>1000.00</ContinuousTorque>
+                <TestSpeedContinuousTorque>2069.00</TestSpeedContinuousTorque>
+                <OverloadTorque>1500.00</OverloadTorque>
+                <TestSpeedOverloadTorque>2069.00</TestSpeedOverloadTorque>
+                <OverloadDuration>120.00</OverloadDuration>
+                <MaxTorqueCurve>
+                  <v2.3:Entry outShaftSpeed="0.00" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="5.65" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="57.02" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="114.05" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="170.94" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="227.96" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="284.99" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="342.01" maxTorque="8363.52" minTorque="-8363.52" />
+                  <v2.3:Entry outShaftSpeed="399.04" maxTorque="7168.74" minTorque="-7168.74" />
+                  <v2.3:Entry outShaftSpeed="455.92" maxTorque="6272.64" minTorque="-6272.64" />
+                  <v2.3:Entry outShaftSpeed="512.95" maxTorque="5575.66" minTorque="-5575.66" />
+                  <v2.3:Entry outShaftSpeed="569.97" maxTorque="5018.11" minTorque="-5018.11" />
+                  <v2.3:Entry outShaftSpeed="627.00" maxTorque="4561.93" minTorque="-4561.93" />
+                  <v2.3:Entry outShaftSpeed="684.02" maxTorque="4181.76" minTorque="-4181.76" />
+                  <v2.3:Entry outShaftSpeed="740.91" maxTorque="3860.07" minTorque="-3860.07" />
+                  <v2.3:Entry outShaftSpeed="797.93" maxTorque="3584.34" minTorque="-3584.34" />
+                  <v2.3:Entry outShaftSpeed="854.96" maxTorque="3345.41" minTorque="-3345.41" />
+                  <v2.3:Entry outShaftSpeed="911.98" maxTorque="3136.32" minTorque="-3136.32" />
+                  <v2.3:Entry outShaftSpeed="969.01" maxTorque="2951.85" minTorque="-2951.85" />
+                  <v2.3:Entry outShaftSpeed="1025.90" maxTorque="2787.86" minTorque="-2787.86" />
+                  <v2.3:Entry outShaftSpeed="1082.92" maxTorque="2641.13" minTorque="-2641.13" />
+                  <v2.3:Entry outShaftSpeed="1139.94" maxTorque="2509.06" minTorque="-2509.06" />
+                </MaxTorqueCurve>
+              </VoltageLevel>
+              <DragCurve gear="1">
+                <Entry outShaftSpeed="0.00" dragTorque="-68.32" />
+                <Entry outShaftSpeed="1.89" dragTorque="-70.46" />
+                <Entry outShaftSpeed="18.86" dragTorque="-90.46" />
+                <Entry outShaftSpeed="37.72" dragTorque="-112.60" />
+                <Entry outShaftSpeed="56.59" dragTorque="-134.73" />
+                <Entry outShaftSpeed="75.45" dragTorque="-157.11" />
+                <Entry outShaftSpeed="94.31" dragTorque="-179.25" />
+                <Entry outShaftSpeed="113.17" dragTorque="-201.39" />
+                <Entry outShaftSpeed="132.03" dragTorque="-223.53" />
+                <Entry outShaftSpeed="150.90" dragTorque="-245.66" />
+                <Entry outShaftSpeed="169.76" dragTorque="-268.04" />
+                <Entry outShaftSpeed="188.62" dragTorque="-290.18" />
+                <Entry outShaftSpeed="207.48" dragTorque="-312.32" />
+                <Entry outShaftSpeed="226.34" dragTorque="-334.46" />
+                <Entry outShaftSpeed="245.21" dragTorque="-356.59" />
+                <Entry outShaftSpeed="264.07" dragTorque="-378.97" />
+                <Entry outShaftSpeed="282.93" dragTorque="-401.11" />
+                <Entry outShaftSpeed="301.79" dragTorque="-423.25" />
+                <Entry outShaftSpeed="320.65" dragTorque="-445.39" />
+                <Entry outShaftSpeed="339.52" dragTorque="-467.52" />
+                <Entry outShaftSpeed="358.38" dragTorque="-489.90" />
+                <Entry outShaftSpeed="377.24" dragTorque="-512.04" />
+              </DragCurve>
+              <DragCurve gear="2">
+                <Entry outShaftSpeed="0.00" dragTorque="-38.23" />
+                <Entry outShaftSpeed="3.37" dragTorque="-39.43" />
+                <Entry outShaftSpeed="33.71" dragTorque="-50.62" />
+                <Entry outShaftSpeed="67.42" dragTorque="-63.01" />
+                <Entry outShaftSpeed="101.12" dragTorque="-75.39" />
+                <Entry outShaftSpeed="134.83" dragTorque="-87.91" />
+                <Entry outShaftSpeed="168.54" dragTorque="-100.30" />
+                <Entry outShaftSpeed="202.25" dragTorque="-112.69" />
+                <Entry outShaftSpeed="235.96" dragTorque="-125.08" />
+                <Entry outShaftSpeed="269.67" dragTorque="-137.47" />
+                <Entry outShaftSpeed="303.37" dragTorque="-149.99" />
+                <Entry outShaftSpeed="337.08" dragTorque="-162.37" />
+                <Entry outShaftSpeed="370.79" dragTorque="-174.76" />
+                <Entry outShaftSpeed="404.50" dragTorque="-187.15" />
+                <Entry outShaftSpeed="438.21" dragTorque="-199.54" />
+                <Entry outShaftSpeed="471.92" dragTorque="-212.06" />
+                <Entry outShaftSpeed="505.62" dragTorque="-224.45" />
+                <Entry outShaftSpeed="539.33" dragTorque="-236.84" />
+                <Entry outShaftSpeed="573.04" dragTorque="-249.22" />
+                <Entry outShaftSpeed="606.75" dragTorque="-261.61" />
+                <Entry outShaftSpeed="640.46" dragTorque="-274.13" />
+                <Entry outShaftSpeed="674.17" dragTorque="-286.52" />
+              </DragCurve>
+              <DragCurve gear="3">
+                <Entry outShaftSpeed="0.00" dragTorque="-22.61" />
+                <Entry outShaftSpeed="5.70" dragTorque="-23.32" />
+                <Entry outShaftSpeed="57.00" dragTorque="-29.93" />
+                <Entry outShaftSpeed="114.00" dragTorque="-37.26" />
+                <Entry outShaftSpeed="170.99" dragTorque="-44.59" />
+                <Entry outShaftSpeed="227.99" dragTorque="-51.99" />
+                <Entry outShaftSpeed="284.99" dragTorque="-59.32" />
+                <Entry outShaftSpeed="341.99" dragTorque="-66.64" />
+                <Entry outShaftSpeed="398.98" dragTorque="-73.97" />
+                <Entry outShaftSpeed="455.98" dragTorque="-81.30" />
+                <Entry outShaftSpeed="512.98" dragTorque="-88.70" />
+                <Entry outShaftSpeed="569.98" dragTorque="-96.03" />
+                <Entry outShaftSpeed="626.97" dragTorque="-103.35" />
+                <Entry outShaftSpeed="683.97" dragTorque="-110.68" />
+                <Entry outShaftSpeed="740.97" dragTorque="-118.01" />
+                <Entry outShaftSpeed="797.97" dragTorque="-125.41" />
+                <Entry outShaftSpeed="854.96" dragTorque="-132.74" />
+                <Entry outShaftSpeed="911.96" dragTorque="-140.06" />
+                <Entry outShaftSpeed="968.96" dragTorque="-147.39" />
+                <Entry outShaftSpeed="1025.96" dragTorque="-154.72" />
+                <Entry outShaftSpeed="1082.96" dragTorque="-162.12" />
+                <Entry outShaftSpeed="1139.95" dragTorque="-169.45" />
+              </DragCurve>
+              <Conditioning>
+                <Entry coolantTempInlet="30" coolingPower="5000" />
+              </Conditioning>
+            </Data>
+          </IEPC>
+          <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.640</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>
+                  <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>275/70 R22.5</Dimension>
+                      <RRCDeclared>0.0050</RRCDeclared>
+                      <FzISO>31300</FzISO>
+                    </Data>
+                    <Signature>
+                      <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+                        <di:Transforms>
+                          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                        </di:Transforms>
+                        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                        <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+                      </di:Reference>
+                    </Signature>
+                  </Tyre>
+                </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>
+                  <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>275/70 R22.5</Dimension>
+                      <RRCDeclared>0.0056</RRCDeclared>
+                      <FzISO>31300</FzISO>
+                    </Data>
+                    <Signature>
+                      <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+                        <di:Transforms>
+                          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                        </di:Transforms>
+                        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                        <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+                      </di:Reference>
+                    </Signature>
+                  </Tyre>
+                </vif:Axle>
+              </Axles>
+            </Data>
+          </AxleWheels>
+          <Auxiliaries>
+            <Data xsi:type="AUX_HEV-S_PrimaryBusType">
+              <Fan>
+                <Technology>Crankshaft mounted - Electronically controlled visco clutch</Technology>
+              </Fan>
+              <SteeringPump>
+                <Technology axleNumber="1">Electric driven pump</Technology>
+              </SteeringPump>
+              <ElectricSystem>
+                <AlternatorTechnology>conventional</AlternatorTechnology>
+                <SupplyFromHEVPossible>true</SupplyFromHEVPossible>
+              </ElectricSystem>
+              <PneumaticSystem>
+                <SizeOfAirSupply>not applicable</SizeOfAirSupply>
+                <CompressorDrive>electrically</CompressorDrive>
+                <Clutch>none</Clutch>
+                <CompressorRatio>0.000</CompressorRatio>
+                <SmartRegenerationSystem>true</SmartRegenerationSystem>
+                <AirsuspensionControl>electronically</AirsuspensionControl>
+                <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
+              </PneumaticSystem>
+              <HVAC>
+                <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+                <EngineWasteGasHeatExchanger>false</EngineWasteGasHeatExchanger>
+              </HVAC>
+            </Data>
+          </Auxiliaries>
+        </Components>
+      </Vehicle>
+      <InputDataSignature>
+        <di:Reference URI="#PrimaryCityBus_IEPC">
+          <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>9kBDp/u0zfebn5EevXDTRu3IOkaLdcVITRifL6Zqty0=</di:DigestValue>
+        </di:Reference>
+      </InputDataSignature>
+      <ManufacturerRecordSignature>
+        <di:Reference URI="#MRF-b4cf61f5e6524cef8cc0">
+          <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>aR2gR18rGQmTxe0E/7uH5Ef4bs80IK1fPZBTWPtB9y0=</di:DigestValue>
+        </di:Reference>
+      </ManufacturerRecordSignature>
+      <Results>
+        <Status>success</Status>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">1.26</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.68</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">9.34</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.892</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">4.50</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">11.4</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.816</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.17</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">7.64</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.608</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.85</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">9.46</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.451</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.93</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">6.88</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.359</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.48</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">8.33</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13050</TotalVehicleMass>
+            <Payload unit="kg">1075</Payload>
+            <PassengerCount>15.15</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.330</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.99</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">6.84</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">15495</TotalVehicleMass>
+            <Payload unit="kg">3520</Payload>
+            <PassengerCount>49.57</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.291</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.26</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">7.51</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">1.68</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.93</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">9.95</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.939</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">4.82</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">12.6</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">1.12</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.39</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">8.35</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.648</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">4.12</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">10.8</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.589</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.14</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">7.44</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.389</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.74</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">9.22</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14225</TotalVehicleMass>
+            <Payload unit="kg">1075</Payload>
+            <PassengerCount>15.15</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.277</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.86</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">6.57</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16670</TotalVehicleMass>
+            <Payload unit="kg">3520</Payload>
+            <PassengerCount>49.57</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.261</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.13</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">7.25</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14245</TotalVehicleMass>
+            <Payload unit="kg">1095</Payload>
+            <PassengerCount>15.42</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.135</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.20</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">6.92</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">15887</TotalVehicleMass>
+            <Payload unit="kg">2737</Payload>
+            <PassengerCount>38.56</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.135</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.34</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">7.29</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14663</TotalVehicleMass>
+            <Payload unit="kg">1263</Payload>
+            <PassengerCount>17.79</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.294</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.00</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">6.91</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17609</TotalVehicleMass>
+            <Payload unit="kg">4209</Payload>
+            <PassengerCount>59.29</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.262</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.32</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">7.73</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14747</TotalVehicleMass>
+            <Payload unit="kg">1347</Payload>
+            <PassengerCount>18.97</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.136</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.42</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">7.39</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16768</TotalVehicleMass>
+            <Payload unit="kg">3368</Payload>
+            <PassengerCount>47.43</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.135</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.58</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">7.83</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+      </Results>
+      <ApplicationInformation>
+        <SimulationToolVersion>0.7.10.3035-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+        <Date>2023-04-24T10:39:23.3723265Z</Date>
+      </ApplicationInformation>
+    </Data>
+    <Signature>
+      <di:Reference URI="#VIF_P-5da41b8e905c4c4b90cf">
+        <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>V9yn+izoa+yY6ZV21Ca1GxvIXD3lSFrfLdgqhYv4fsE=</di:DigestValue>
+      </di:Reference>
+    </Signature>
+  </PrimaryVehicle>
+</VectoOutputMultistep>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCityBus_IEPC_Base.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCityBus_IEPC_Base.RSLT_VIF.xml
new file mode 100644
index 0000000000..f2f9c458bb
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCityBus_IEPC_Base.RSLT_VIF.xml
@@ -0,0 +1,621 @@
+<?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-eed1f0ed412b4130bda1" xsi:type="PrimaryVehicleDataType">
+      <Vehicle xsi:type="IEPC_VehicleVIFType">
+        <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+        <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
+        <Model>Generic Model</Model>
+        <VIN>VEH-1234567890</VIN>
+        <Date>2017-02-15T11:00:00Z</Date>
+        <LegislativeCategory>M3</LegislativeCategory>
+        <ChassisConfiguration>Bus</ChassisConfiguration>
+        <AxleConfiguration>4x2</AxleConfiguration>
+        <Articulated>false</Articulated>
+        <TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
+        <RetarderType>None</RetarderType>
+        <AngledriveType>None</AngledriveType>
+        <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+        <ArchitectureID>E-IEPC</ArchitectureID>
+        <OvcHev>true</OvcHev>
+        <vif:ADAS xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:type="ADAS_IEPC_Type">
+          <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+        </vif:ADAS>
+        <Components xsi:type="Vehicle_PEV-IEPC_ComponentsVIFType">
+          <IEPC>
+            <Data xsi:type="IEPCDataDeclarationType">
+              <Manufacturer>a</Manufacturer>
+              <Model>a</Model>
+              <CertificationNumber>token</CertificationNumber>
+              <Date>2017-01-01T00:00:00Z</Date>
+              <AppVersion>aaaaa</AppVersion>
+              <ElectricMachineType>PSM</ElectricMachineType>
+              <CertificationMethod>Measured for complete component</CertificationMethod>
+              <R85RatedPower>325000</R85RatedPower>
+              <RotationalInertia>0.86</RotationalInertia>
+              <DifferentialIncluded>true</DifferentialIncluded>
+              <DesignTypeWheelMotor>false</DesignTypeWheelMotor>
+              <Gears xsi:type="IEPCGearsDeclarationType">
+                <Gear number="1">
+                  <Ratio>8.310</Ratio>
+                </Gear>
+                <Gear number="2">
+                  <Ratio>4.650</Ratio>
+                </Gear>
+                <Gear number="3">
+                  <Ratio>2.750</Ratio>
+                </Gear>
+              </Gears>
+              <VoltageLevel>
+                <Voltage>100</Voltage>
+                <ContinuousTorque>1000.00</ContinuousTorque>
+                <TestSpeedContinuousTorque>2069.00</TestSpeedContinuousTorque>
+                <OverloadTorque>1500.00</OverloadTorque>
+                <TestSpeedOverloadTorque>2069.00</TestSpeedOverloadTorque>
+                <OverloadDuration>120.00</OverloadDuration>
+                <MaxTorqueCurve>
+                  <v2.3:Entry outShaftSpeed="0.00" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="5.65" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="57.02" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="114.05" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="170.94" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="227.96" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="284.99" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="342.01" maxTorque="8363.52" minTorque="-8363.52" />
+                  <v2.3:Entry outShaftSpeed="399.04" maxTorque="7168.74" minTorque="-7168.74" />
+                  <v2.3:Entry outShaftSpeed="455.92" maxTorque="6272.64" minTorque="-6272.64" />
+                  <v2.3:Entry outShaftSpeed="512.95" maxTorque="5575.66" minTorque="-5575.66" />
+                  <v2.3:Entry outShaftSpeed="569.97" maxTorque="5018.11" minTorque="-5018.11" />
+                  <v2.3:Entry outShaftSpeed="627.00" maxTorque="4561.93" minTorque="-4561.93" />
+                  <v2.3:Entry outShaftSpeed="684.02" maxTorque="4181.76" minTorque="-4181.76" />
+                  <v2.3:Entry outShaftSpeed="740.91" maxTorque="3860.07" minTorque="-3860.07" />
+                  <v2.3:Entry outShaftSpeed="797.93" maxTorque="3584.34" minTorque="-3584.34" />
+                  <v2.3:Entry outShaftSpeed="854.96" maxTorque="3345.41" minTorque="-3345.41" />
+                  <v2.3:Entry outShaftSpeed="911.98" maxTorque="3136.32" minTorque="-3136.32" />
+                  <v2.3:Entry outShaftSpeed="969.01" maxTorque="2951.85" minTorque="-2951.85" />
+                  <v2.3:Entry outShaftSpeed="1025.90" maxTorque="2787.86" minTorque="-2787.86" />
+                  <v2.3:Entry outShaftSpeed="1082.92" maxTorque="2641.13" minTorque="-2641.13" />
+                  <v2.3:Entry outShaftSpeed="1139.94" maxTorque="2509.06" minTorque="-2509.06" />
+                </MaxTorqueCurve>
+              </VoltageLevel>
+              <VoltageLevel>
+                <Voltage>1000</Voltage>
+                <ContinuousTorque>1000.00</ContinuousTorque>
+                <TestSpeedContinuousTorque>2069.00</TestSpeedContinuousTorque>
+                <OverloadTorque>1500.00</OverloadTorque>
+                <TestSpeedOverloadTorque>2069.00</TestSpeedOverloadTorque>
+                <OverloadDuration>120.00</OverloadDuration>
+                <MaxTorqueCurve>
+                  <v2.3:Entry outShaftSpeed="0.00" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="5.65" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="57.02" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="114.05" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="170.94" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="227.96" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="284.99" maxTorque="10036.22" minTorque="-10036.22" />
+                  <v2.3:Entry outShaftSpeed="342.01" maxTorque="8363.52" minTorque="-8363.52" />
+                  <v2.3:Entry outShaftSpeed="399.04" maxTorque="7168.74" minTorque="-7168.74" />
+                  <v2.3:Entry outShaftSpeed="455.92" maxTorque="6272.64" minTorque="-6272.64" />
+                  <v2.3:Entry outShaftSpeed="512.95" maxTorque="5575.66" minTorque="-5575.66" />
+                  <v2.3:Entry outShaftSpeed="569.97" maxTorque="5018.11" minTorque="-5018.11" />
+                  <v2.3:Entry outShaftSpeed="627.00" maxTorque="4561.93" minTorque="-4561.93" />
+                  <v2.3:Entry outShaftSpeed="684.02" maxTorque="4181.76" minTorque="-4181.76" />
+                  <v2.3:Entry outShaftSpeed="740.91" maxTorque="3860.07" minTorque="-3860.07" />
+                  <v2.3:Entry outShaftSpeed="797.93" maxTorque="3584.34" minTorque="-3584.34" />
+                  <v2.3:Entry outShaftSpeed="854.96" maxTorque="3345.41" minTorque="-3345.41" />
+                  <v2.3:Entry outShaftSpeed="911.98" maxTorque="3136.32" minTorque="-3136.32" />
+                  <v2.3:Entry outShaftSpeed="969.01" maxTorque="2951.85" minTorque="-2951.85" />
+                  <v2.3:Entry outShaftSpeed="1025.90" maxTorque="2787.86" minTorque="-2787.86" />
+                  <v2.3:Entry outShaftSpeed="1082.92" maxTorque="2641.13" minTorque="-2641.13" />
+                  <v2.3:Entry outShaftSpeed="1139.94" maxTorque="2509.06" minTorque="-2509.06" />
+                </MaxTorqueCurve>
+              </VoltageLevel>
+              <DragCurve gear="1">
+                <Entry outShaftSpeed="0.00" dragTorque="-68.32" />
+                <Entry outShaftSpeed="1.89" dragTorque="-70.46" />
+                <Entry outShaftSpeed="18.86" dragTorque="-90.46" />
+                <Entry outShaftSpeed="37.72" dragTorque="-112.60" />
+                <Entry outShaftSpeed="56.59" dragTorque="-134.73" />
+                <Entry outShaftSpeed="75.45" dragTorque="-157.11" />
+                <Entry outShaftSpeed="94.31" dragTorque="-179.25" />
+                <Entry outShaftSpeed="113.17" dragTorque="-201.39" />
+                <Entry outShaftSpeed="132.03" dragTorque="-223.53" />
+                <Entry outShaftSpeed="150.90" dragTorque="-245.66" />
+                <Entry outShaftSpeed="169.76" dragTorque="-268.04" />
+                <Entry outShaftSpeed="188.62" dragTorque="-290.18" />
+                <Entry outShaftSpeed="207.48" dragTorque="-312.32" />
+                <Entry outShaftSpeed="226.34" dragTorque="-334.46" />
+                <Entry outShaftSpeed="245.21" dragTorque="-356.59" />
+                <Entry outShaftSpeed="264.07" dragTorque="-378.97" />
+                <Entry outShaftSpeed="282.93" dragTorque="-401.11" />
+                <Entry outShaftSpeed="301.79" dragTorque="-423.25" />
+                <Entry outShaftSpeed="320.65" dragTorque="-445.39" />
+                <Entry outShaftSpeed="339.52" dragTorque="-467.52" />
+                <Entry outShaftSpeed="358.38" dragTorque="-489.90" />
+                <Entry outShaftSpeed="377.24" dragTorque="-512.04" />
+              </DragCurve>
+              <DragCurve gear="2">
+                <Entry outShaftSpeed="0.00" dragTorque="-38.23" />
+                <Entry outShaftSpeed="3.37" dragTorque="-39.43" />
+                <Entry outShaftSpeed="33.71" dragTorque="-50.62" />
+                <Entry outShaftSpeed="67.42" dragTorque="-63.01" />
+                <Entry outShaftSpeed="101.12" dragTorque="-75.39" />
+                <Entry outShaftSpeed="134.83" dragTorque="-87.91" />
+                <Entry outShaftSpeed="168.54" dragTorque="-100.30" />
+                <Entry outShaftSpeed="202.25" dragTorque="-112.69" />
+                <Entry outShaftSpeed="235.96" dragTorque="-125.08" />
+                <Entry outShaftSpeed="269.67" dragTorque="-137.47" />
+                <Entry outShaftSpeed="303.37" dragTorque="-149.99" />
+                <Entry outShaftSpeed="337.08" dragTorque="-162.37" />
+                <Entry outShaftSpeed="370.79" dragTorque="-174.76" />
+                <Entry outShaftSpeed="404.50" dragTorque="-187.15" />
+                <Entry outShaftSpeed="438.21" dragTorque="-199.54" />
+                <Entry outShaftSpeed="471.92" dragTorque="-212.06" />
+                <Entry outShaftSpeed="505.62" dragTorque="-224.45" />
+                <Entry outShaftSpeed="539.33" dragTorque="-236.84" />
+                <Entry outShaftSpeed="573.04" dragTorque="-249.22" />
+                <Entry outShaftSpeed="606.75" dragTorque="-261.61" />
+                <Entry outShaftSpeed="640.46" dragTorque="-274.13" />
+                <Entry outShaftSpeed="674.17" dragTorque="-286.52" />
+              </DragCurve>
+              <DragCurve gear="3">
+                <Entry outShaftSpeed="0.00" dragTorque="-22.61" />
+                <Entry outShaftSpeed="5.70" dragTorque="-23.32" />
+                <Entry outShaftSpeed="57.00" dragTorque="-29.93" />
+                <Entry outShaftSpeed="114.00" dragTorque="-37.26" />
+                <Entry outShaftSpeed="170.99" dragTorque="-44.59" />
+                <Entry outShaftSpeed="227.99" dragTorque="-51.99" />
+                <Entry outShaftSpeed="284.99" dragTorque="-59.32" />
+                <Entry outShaftSpeed="341.99" dragTorque="-66.64" />
+                <Entry outShaftSpeed="398.98" dragTorque="-73.97" />
+                <Entry outShaftSpeed="455.98" dragTorque="-81.30" />
+                <Entry outShaftSpeed="512.98" dragTorque="-88.70" />
+                <Entry outShaftSpeed="569.98" dragTorque="-96.03" />
+                <Entry outShaftSpeed="626.97" dragTorque="-103.35" />
+                <Entry outShaftSpeed="683.97" dragTorque="-110.68" />
+                <Entry outShaftSpeed="740.97" dragTorque="-118.01" />
+                <Entry outShaftSpeed="797.97" dragTorque="-125.41" />
+                <Entry outShaftSpeed="854.96" dragTorque="-132.74" />
+                <Entry outShaftSpeed="911.96" dragTorque="-140.06" />
+                <Entry outShaftSpeed="968.96" dragTorque="-147.39" />
+                <Entry outShaftSpeed="1025.96" dragTorque="-154.72" />
+                <Entry outShaftSpeed="1082.96" dragTorque="-162.12" />
+                <Entry outShaftSpeed="1139.95" dragTorque="-169.45" />
+              </DragCurve>
+              <Conditioning>
+                <Entry coolantTempInlet="30" coolingPower="5000" />
+              </Conditioning>
+            </Data>
+          </IEPC>
+          <ElectricEnergyStorage>
+            <Battery>
+              <StringID>0</StringID>
+              <REESS>
+                <Data xsi:type="BatterySystemDataType">
+                  <Manufacturer>a</Manufacturer>
+                  <Model>a</Model>
+                  <CertificationMethod>Measured</CertificationMethod>
+                  <CertificationNumber>token</CertificationNumber>
+                  <Date>2017-01-01T00:00:00Z</Date>
+                  <AppVersion>aaaaa</AppVersion>
+                  <BatteryType>HPBS</BatteryType>
+                  <RatedCapacity>72.00</RatedCapacity>
+                  <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+                  <JunctionboxIncluded>true</JunctionboxIncluded>
+                  <TestingTemperature>20</TestingTemperature>
+                  <OCV>
+                    <Entry SoC="0" OCV="718.42" />
+                    <Entry SoC="10" OCV="746.84" />
+                    <Entry SoC="20" OCV="763.14" />
+                    <Entry SoC="30" OCV="771.85" />
+                    <Entry SoC="40" OCV="776.26" />
+                    <Entry SoC="50" OCV="778.61" />
+                    <Entry SoC="60" OCV="780.43" />
+                    <Entry SoC="70" OCV="782.70" />
+                    <Entry SoC="80" OCV="786.19" />
+                    <Entry SoC="90" OCV="791.68" />
+                    <Entry SoC="100" OCV="800.21" />
+                  </OCV>
+                  <CurrentLimits>
+                    <Entry SoC="0" maxChargingCurrent="1620.00" maxDischargingCurrent="1620.00" />
+                    <Entry SoC="100" maxChargingCurrent="1620.00" maxDischargingCurrent="1620.00" />
+                  </CurrentLimits>
+                </Data>
+              </REESS>
+              <SOCmin>8</SOCmin>
+              <SOCmax>92</SOCmax>
+            </Battery>
+          </ElectricEnergyStorage>
+          <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.640</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>
+                  <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>275/70 R22.5</Dimension>
+                      <RRCDeclared>0.0050</RRCDeclared>
+                      <FzISO>31300</FzISO>
+                    </Data>
+                    <Signature>
+                      <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+                        <di:Transforms>
+                          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                        </di:Transforms>
+                        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                        <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+                      </di:Reference>
+                    </Signature>
+                  </Tyre>
+                </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>
+                  <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>275/70 R22.5</Dimension>
+                      <RRCDeclared>0.0056</RRCDeclared>
+                      <FzISO>31300</FzISO>
+                    </Data>
+                    <Signature>
+                      <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+                        <di:Transforms>
+                          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                        </di:Transforms>
+                        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                        <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+                      </di:Reference>
+                    </Signature>
+                  </Tyre>
+                </vif:Axle>
+              </Axles>
+            </Data>
+          </AxleWheels>
+          <Auxiliaries>
+            <Data xsi:type="AUX_IEPC_PrimaryBusType">
+              <SteeringPump>
+                <Technology axleNumber="1">Electric driven pump</Technology>
+              </SteeringPump>
+              <PneumaticSystem>
+                <CompressorDrive>electrically</CompressorDrive>
+                <SmartRegenerationSystem>false</SmartRegenerationSystem>
+                <AirsuspensionControl>electronically</AirsuspensionControl>
+                <PneumaticSCRReagentDosing>false</PneumaticSCRReagentDosing>
+              </PneumaticSystem>
+              <HVAC>
+                <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+              </HVAC>
+            </Data>
+          </Auxiliaries>
+        </Components>
+      </Vehicle>
+      <InputDataSignature>
+        <di:Reference URI="#PrimaryCityBus_IEPC">
+          <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>WtM2yohjVN1IisUkImDqaHAW7EPlbtsc8TzHpZL55aQ=</di:DigestValue>
+        </di:Reference>
+      </InputDataSignature>
+      <ManufacturerRecordSignature>
+        <di:Reference URI="#MRF-e6cd327fb0064e6cbb31">
+          <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>oNq0DG3+l4iTvTSzDq4YzGS3gJ46QDV9PTYNUwOtE9E=</di:DigestValue>
+        </di:Reference>
+      </ManufacturerRecordSignature>
+      <Results>
+        <Status>success</Status>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">4.58</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">5.56</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">4.21</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">5.00</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">4.23</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">4.92</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13050</TotalVehicleMass>
+            <Payload unit="kg">1075</Payload>
+            <PassengerCount>15.15</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">4.84</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">15495</TotalVehicleMass>
+            <Payload unit="kg">3520</Payload>
+            <PassengerCount>49.57</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">5.19</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">4.91</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">6.17</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">4.50</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">5.50</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">4.49</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">5.34</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14225</TotalVehicleMass>
+            <Payload unit="kg">1075</Payload>
+            <PassengerCount>15.15</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">4.72</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16670</TotalVehicleMass>
+            <Payload unit="kg">3520</Payload>
+            <PassengerCount>49.57</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">5.09</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14245</TotalVehicleMass>
+            <Payload unit="kg">1095</Payload>
+            <PassengerCount>15.42</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">5.49</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">15887</TotalVehicleMass>
+            <Payload unit="kg">2737</Payload>
+            <PassengerCount>38.56</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">5.66</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14663</TotalVehicleMass>
+            <Payload unit="kg">1263</Payload>
+            <PassengerCount>17.79</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">4.89</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17609</TotalVehicleMass>
+            <Payload unit="kg">4209</Payload>
+            <PassengerCount>59.29</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">5.34</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14747</TotalVehicleMass>
+            <Payload unit="kg">1347</Payload>
+            <PassengerCount>18.97</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">5.69</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16768</TotalVehicleMass>
+            <Payload unit="kg">3368</Payload>
+            <PassengerCount>47.43</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">5.90</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+      </Results>
+      <ApplicationInformation>
+        <SimulationToolVersion>0.7.10.3035-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+        <Date>2023-04-24T09:35:08.2648886Z</Date>
+      </ApplicationInformation>
+    </Data>
+    <Signature>
+      <di:Reference URI="#VIF_P-eed1f0ed412b4130bda1">
+        <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>Ls7Ie+B5tox14f2JSdfAdLYKtpITD+IACaEiOVn/Etw=</di:DigestValue>
+      </di:Reference>
+    </Signature>
+  </PrimaryVehicle>
+</VectoOutputMultistep>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCityBus_P1_HEV_Base_AT.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCityBus_P1_HEV_Base_AT.RSLT_VIF.xml
new file mode 100644
index 0000000000..2da0c8208d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCityBus_P1_HEV_Base_AT.RSLT_VIF.xml
@@ -0,0 +1,707 @@
+<?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-a8d66db8c2e24967b163" xsi:type="PrimaryVehicleDataType">
+      <Vehicle xsi:type="HEV-Px_VehicleVIFType">
+        <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+        <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
+        <Model>Generic Model</Model>
+        <VIN>VEH-1234567890</VIN>
+        <Date>2017-02-15T11:00:00Z</Date>
+        <LegislativeCategory>M3</LegislativeCategory>
+        <ChassisConfiguration>Bus</ChassisConfiguration>
+        <AxleConfiguration>4x2</AxleConfiguration>
+        <Articulated>false</Articulated>
+        <TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
+        <IdlingSpeed>700</IdlingSpeed>
+        <RetarderType>None</RetarderType>
+        <AngledriveType>None</AngledriveType>
+        <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+        <ArchitectureID>P1</ArchitectureID>
+        <OvcHev>false</OvcHev>
+        <vif:ADAS xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:type="ADAS_HEV_Type">
+          <EngineStopStart>true</EngineStopStart>
+          <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+        </vif:ADAS>
+        <Components xsi:type="Vehicle_HEV-Px_ComponentsVIFType">
+          <Engine>
+            <Data xsi:type="EngineDataVIFType">
+              <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+              <Model>Generic 40t Long Haul Truck Engine</Model>
+              <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+              <Date>2017-02-15T11:00:00Z</Date>
+              <AppVersion>VectoEngine x.y</AppVersion>
+              <Displacement>7700</Displacement>
+              <RatedSpeed>2000</RatedSpeed>
+              <RatedPower>220000</RatedPower>
+              <MaxEngineTorque>1250</MaxEngineTorque>
+              <WHRType>
+                <MechanicalOutputICE>false</MechanicalOutputICE>
+                <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+                <ElectricalOutput>false</ElectricalOutput>
+              </WHRType>
+              <Mode>
+                <IdlingSpeed>700</IdlingSpeed>
+                <FullLoadAndDragCurve>
+                  <Entry engineSpeed="700.00" maxTorque="437.50" dragTorque="-78.56" />
+                  <Entry engineSpeed="1181.00" maxTorque="1250.00" dragTorque="-88.90" />
+                  <Entry engineSpeed="1545.00" maxTorque="1250.00" dragTorque="-107.92" />
+                  <Entry engineSpeed="2000.00" maxTorque="1050.42" dragTorque="-144.72" />
+                  <Entry engineSpeed="2494.00" maxTorque="0.00" dragTorque="-190.10" />
+                </FullLoadAndDragCurve>
+                <Fuels>
+                  <FuelType>Diesel CI</FuelType>
+                </Fuels>
+              </Mode>
+            </Data>
+          </Engine>
+          <ElectricMachine>
+            <PowertrainPosition>1</PowertrainPosition>
+            <Count>1</Count>
+            <ElectricMachineSystem>
+              <Data xsi:type="ElectricMachineSystemDataDeclarationType">
+                <Manufacturer>a</Manufacturer>
+                <Model>a</Model>
+                <CertificationMethod>Measured</CertificationMethod>
+                <CertificationNumber>token</CertificationNumber>
+                <Date>2017-01-01T00:00:00Z</Date>
+                <AppVersion>aaaaa</AppVersion>
+                <ElectricMachineType>ASM</ElectricMachineType>
+                <R85RatedPower>95000</R85RatedPower>
+                <RotationalInertia>0.37</RotationalInertia>
+                <DcDcConverterIncluded>true</DcDcConverterIncluded>
+                <IHPCType>None</IHPCType>
+                <VoltageLevel>
+                  <Voltage>100</Voltage>
+                  <ContinuousTorque>475.00</ContinuousTorque>
+                  <TestSpeedContinuousTorque>1273.00</TestSpeedContinuousTorque>
+                  <OverloadTorque>712.50</OverloadTorque>
+                  <TestSpeedOverloadTorque>1273.00</TestSpeedOverloadTorque>
+                  <OverloadDuration>60.00</OverloadDuration>
+                  <MaxTorqueCurve>
+                    <Entry outShaftSpeed="0.00" maxTorque="712.50" minTorque="-712.50" />
+                    <Entry outShaftSpeed="25.00" maxTorque="712.50" minTorque="-712.50" />
+                    <Entry outShaftSpeed="255.00" maxTorque="712.50" minTorque="-712.50" />
+                    <Entry outShaftSpeed="509.00" maxTorque="712.50" minTorque="-712.50" />
+                    <Entry outShaftSpeed="764.00" maxTorque="712.50" minTorque="-712.50" />
+                    <Entry outShaftSpeed="1019.00" maxTorque="712.50" minTorque="-712.50" />
+                    <Entry outShaftSpeed="1273.00" maxTorque="712.50" minTorque="-712.50" />
+                    <Entry outShaftSpeed="1528.00" maxTorque="593.75" minTorque="-593.75" />
+                    <Entry outShaftSpeed="1783.00" maxTorque="508.93" minTorque="-508.93" />
+                    <Entry outShaftSpeed="2037.00" maxTorque="445.31" minTorque="-445.31" />
+                    <Entry outShaftSpeed="2292.00" maxTorque="395.83" minTorque="-395.83" />
+                    <Entry outShaftSpeed="2546.00" maxTorque="356.25" minTorque="-356.25" />
+                    <Entry outShaftSpeed="2801.00" maxTorque="323.86" minTorque="-323.86" />
+                    <Entry outShaftSpeed="3056.00" maxTorque="296.88" minTorque="-296.88" />
+                    <Entry outShaftSpeed="3310.00" maxTorque="274.04" minTorque="-274.04" />
+                    <Entry outShaftSpeed="3565.00" maxTorque="254.46" minTorque="-254.46" />
+                    <Entry outShaftSpeed="3820.00" maxTorque="237.50" minTorque="-237.50" />
+                    <Entry outShaftSpeed="4074.00" maxTorque="222.66" minTorque="-222.66" />
+                    <Entry outShaftSpeed="4329.00" maxTorque="209.56" minTorque="-209.56" />
+                    <Entry outShaftSpeed="4584.00" maxTorque="197.92" minTorque="-197.92" />
+                    <Entry outShaftSpeed="4838.00" maxTorque="187.50" minTorque="-187.50" />
+                    <Entry outShaftSpeed="5093.00" maxTorque="178.13" minTorque="-178.13" />
+                  </MaxTorqueCurve>
+                </VoltageLevel>
+                <VoltageLevel>
+                  <Voltage>1000</Voltage>
+                  <ContinuousTorque>475.00</ContinuousTorque>
+                  <TestSpeedContinuousTorque>1273.00</TestSpeedContinuousTorque>
+                  <OverloadTorque>712.50</OverloadTorque>
+                  <TestSpeedOverloadTorque>1273.00</TestSpeedOverloadTorque>
+                  <OverloadDuration>60.00</OverloadDuration>
+                  <MaxTorqueCurve>
+                    <Entry outShaftSpeed="0.00" maxTorque="712.50" minTorque="-712.50" />
+                    <Entry outShaftSpeed="25.00" maxTorque="712.50" minTorque="-712.50" />
+                    <Entry outShaftSpeed="255.00" maxTorque="712.50" minTorque="-712.50" />
+                    <Entry outShaftSpeed="509.00" maxTorque="712.50" minTorque="-712.50" />
+                    <Entry outShaftSpeed="764.00" maxTorque="712.50" minTorque="-712.50" />
+                    <Entry outShaftSpeed="1019.00" maxTorque="712.50" minTorque="-712.50" />
+                    <Entry outShaftSpeed="1273.00" maxTorque="712.50" minTorque="-712.50" />
+                    <Entry outShaftSpeed="1528.00" maxTorque="593.75" minTorque="-593.75" />
+                    <Entry outShaftSpeed="1783.00" maxTorque="508.93" minTorque="-508.93" />
+                    <Entry outShaftSpeed="2037.00" maxTorque="445.31" minTorque="-445.31" />
+                    <Entry outShaftSpeed="2292.00" maxTorque="395.83" minTorque="-395.83" />
+                    <Entry outShaftSpeed="2546.00" maxTorque="356.25" minTorque="-356.25" />
+                    <Entry outShaftSpeed="2801.00" maxTorque="323.86" minTorque="-323.86" />
+                    <Entry outShaftSpeed="3056.00" maxTorque="296.88" minTorque="-296.88" />
+                    <Entry outShaftSpeed="3310.00" maxTorque="274.04" minTorque="-274.04" />
+                    <Entry outShaftSpeed="3565.00" maxTorque="254.46" minTorque="-254.46" />
+                    <Entry outShaftSpeed="3820.00" maxTorque="237.50" minTorque="-237.50" />
+                    <Entry outShaftSpeed="4074.00" maxTorque="222.66" minTorque="-222.66" />
+                    <Entry outShaftSpeed="4329.00" maxTorque="209.56" minTorque="-209.56" />
+                    <Entry outShaftSpeed="4584.00" maxTorque="197.92" minTorque="-197.92" />
+                    <Entry outShaftSpeed="4838.00" maxTorque="187.50" minTorque="-187.50" />
+                    <Entry outShaftSpeed="5093.00" maxTorque="178.13" minTorque="-178.13" />
+                  </MaxTorqueCurve>
+                </VoltageLevel>
+                <DragCurve>
+                  <Entry outShaftSpeed="0.00" dragTorque="-2.96" />
+                  <Entry outShaftSpeed="25.46" dragTorque="-3.09" />
+                  <Entry outShaftSpeed="254.65" dragTorque="-4.18" />
+                  <Entry outShaftSpeed="509.30" dragTorque="-5.40" />
+                  <Entry outShaftSpeed="763.94" dragTorque="-6.62" />
+                  <Entry outShaftSpeed="1018.59" dragTorque="-7.84" />
+                  <Entry outShaftSpeed="1273.24" dragTorque="-9.06" />
+                  <Entry outShaftSpeed="1527.89" dragTorque="-10.28" />
+                  <Entry outShaftSpeed="1782.54" dragTorque="-11.50" />
+                  <Entry outShaftSpeed="2037.18" dragTorque="-12.72" />
+                  <Entry outShaftSpeed="2291.83" dragTorque="-13.94" />
+                  <Entry outShaftSpeed="2546.48" dragTorque="-15.16" />
+                  <Entry outShaftSpeed="2801.13" dragTorque="-16.38" />
+                  <Entry outShaftSpeed="3055.77" dragTorque="-17.60" />
+                  <Entry outShaftSpeed="3310.42" dragTorque="-18.81" />
+                  <Entry outShaftSpeed="3565.07" dragTorque="-20.03" />
+                  <Entry outShaftSpeed="3819.72" dragTorque="-21.25" />
+                  <Entry outShaftSpeed="4074.37" dragTorque="-22.47" />
+                  <Entry outShaftSpeed="4329.01" dragTorque="-23.69" />
+                  <Entry outShaftSpeed="4583.66" dragTorque="-24.91" />
+                  <Entry outShaftSpeed="4838.31" dragTorque="-26.13" />
+                  <Entry outShaftSpeed="5092.96" dragTorque="-27.35" />
+                </DragCurve>
+                <Conditioning>
+                  <Entry coolantTempInlet="30" coolingPower="5000" />
+                </Conditioning>
+              </Data>
+            </ElectricMachineSystem>
+          </ElectricMachine>
+          <ElectricEnergyStorage>
+            <Battery>
+              <StringID>0</StringID>
+              <REESS>
+                <Data xsi:type="BatterySystemDataType">
+                  <Manufacturer>a</Manufacturer>
+                  <Model>a</Model>
+                  <CertificationMethod>Measured</CertificationMethod>
+                  <CertificationNumber>token</CertificationNumber>
+                  <Date>2017-01-01T00:00:00Z</Date>
+                  <AppVersion>aaaaa</AppVersion>
+                  <BatteryType>HPBS</BatteryType>
+                  <RatedCapacity>14.30</RatedCapacity>
+                  <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+                  <JunctionboxIncluded>true</JunctionboxIncluded>
+                  <TestingTemperature>20</TestingTemperature>
+                  <OCV>
+                    <Entry SoC="0" OCV="628.60" />
+                    <Entry SoC="10" OCV="653.50" />
+                    <Entry SoC="20" OCV="667.70" />
+                    <Entry SoC="30" OCV="675.40" />
+                    <Entry SoC="40" OCV="679.20" />
+                    <Entry SoC="50" OCV="681.30" />
+                    <Entry SoC="60" OCV="682.90" />
+                    <Entry SoC="70" OCV="684.90" />
+                    <Entry SoC="80" OCV="687.90" />
+                    <Entry SoC="90" OCV="692.70" />
+                    <Entry SoC="100" OCV="700.20" />
+                  </OCV>
+                  <CurrentLimits>
+                    <Entry SoC="0" maxChargingCurrent="1620.00" maxDischargingCurrent="1620.00" />
+                    <Entry SoC="100" maxChargingCurrent="1620.00" maxDischargingCurrent="1620.00" />
+                  </CurrentLimits>
+                </Data>
+              </REESS>
+              <SOCmin>25</SOCmin>
+              <SOCmax>75</SOCmax>
+            </Battery>
+          </ElectricEnergyStorage>
+          <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>APT-P</TransmissionType>
+              <Gears xsi:type="TransmissionGearsVIFType">
+                <Gear number="1">
+                  <Ratio>1.361</Ratio>
+                </Gear>
+                <Gear number="2">
+                  <Ratio>1.000</Ratio>
+                </Gear>
+                <Gear number="3">
+                  <Ratio>0.735</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>
+          <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>5.810</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>
+                  <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>275/70 R22.5</Dimension>
+                      <RRCDeclared>0.0050</RRCDeclared>
+                      <FzISO>31300</FzISO>
+                    </Data>
+                    <Signature>
+                      <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+                        <di:Transforms>
+                          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                        </di:Transforms>
+                        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                        <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+                      </di:Reference>
+                    </Signature>
+                  </Tyre>
+                </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>
+                  <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>275/70 R22.5</Dimension>
+                      <RRCDeclared>0.0056</RRCDeclared>
+                      <FzISO>31300</FzISO>
+                    </Data>
+                    <Signature>
+                      <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+                        <di:Transforms>
+                          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                        </di:Transforms>
+                        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                        <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+                      </di:Reference>
+                    </Signature>
+                  </Tyre>
+                </vif:Axle>
+              </Axles>
+            </Data>
+          </AxleWheels>
+          <Auxiliaries>
+            <Data xsi:type="AUX_HEV-P_PrimaryBusType">
+              <Fan>
+                <Technology>Hydraulic driven - Constant displacement pump</Technology>
+              </Fan>
+              <SteeringPump>
+                <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+              </SteeringPump>
+              <ElectricSystem>
+                <AlternatorTechnology>conventional</AlternatorTechnology>
+                <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
+              </ElectricSystem>
+              <PneumaticSystem>
+                <SizeOfAirSupply>Medium Supply 1-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="#PrimaryCityBus_P1_HEV_AT">
+          <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>jZL1O+UeWV9tubAvxzOqnMSuWljAy30FJ8UP1dnP2n8=</di:DigestValue>
+        </di:Reference>
+      </InputDataSignature>
+      <ManufacturerRecordSignature>
+        <di:Reference URI="#MRF-06f93bcfdae34d4a8630">
+          <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>uUWHLNGislK0bixWuodIEsxIJi3Nq0VcHIiaFUFoFGU=</di:DigestValue>
+        </di:Reference>
+      </ManufacturerRecordSignature>
+      <Results>
+        <Status>success</Status>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">17.5</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">13.6</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">13.6</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">13.6</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">10.4</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">13.9</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13050</TotalVehicleMass>
+            <Payload unit="kg">1075</Payload>
+            <PassengerCount>15.15</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">13.9</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">15495</TotalVehicleMass>
+            <Payload unit="kg">3520</Payload>
+            <PassengerCount>49.57</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">13.9</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">18.8</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">18.8</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">14.6</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">14.6</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">11.1</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">15.2</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14225</TotalVehicleMass>
+            <Payload unit="kg">1075</Payload>
+            <PassengerCount>15.15</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">15.2</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16670</TotalVehicleMass>
+            <Payload unit="kg">3520</Payload>
+            <PassengerCount>49.57</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">15.2</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14245</TotalVehicleMass>
+            <Payload unit="kg">1095</Payload>
+            <PassengerCount>15.42</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">7.04</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">15887</TotalVehicleMass>
+            <Payload unit="kg">2737</Payload>
+            <PassengerCount>38.56</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">7.44</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14663</TotalVehicleMass>
+            <Payload unit="kg">1263</Payload>
+            <PassengerCount>17.79</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">7.44</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17609</TotalVehicleMass>
+            <Payload unit="kg">4209</Payload>
+            <PassengerCount>59.29</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">7.44</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14747</TotalVehicleMass>
+            <Payload unit="kg">1347</Payload>
+            <PassengerCount>18.97</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">7.42</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16768</TotalVehicleMass>
+            <Payload unit="kg">3368</Payload>
+            <PassengerCount>47.43</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">7.44</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+      </Results>
+      <ApplicationInformation>
+        <SimulationToolVersion>0.7.10.3035-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+        <Date>2023-04-24T12:31:10.7393331Z</Date>
+      </ApplicationInformation>
+    </Data>
+    <Signature>
+      <di:Reference URI="#VIF_P-a8d66db8c2e24967b163">
+        <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>VjPj5yBKc77/+KQnuQjBZp9g2RG7e8Wsqa9dnMmDWcM=</di:DigestValue>
+      </di:Reference>
+    </Signature>
+  </PrimaryVehicle>
+</VectoOutputMultistep>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCoach_E2_Base_AMT.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCoach_E2_Base_AMT.RSLT_VIF.xml
new file mode 100644
index 0000000000..00d71e449b
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCoach_E2_Base_AMT.RSLT_VIF.xml
@@ -0,0 +1,587 @@
+<?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-f6219114ce4248989b7f" xsi:type="PrimaryVehicleDataType">
+      <Vehicle xsi:type="PEV_Ex_VehicleVIFType">
+        <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+        <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
+        <Model>Generic Model</Model>
+        <VIN>VEH-1234567890</VIN>
+        <Date>2017-02-15T11:00:00Z</Date>
+        <LegislativeCategory>M3</LegislativeCategory>
+        <ChassisConfiguration>Bus</ChassisConfiguration>
+        <AxleConfiguration>4x2</AxleConfiguration>
+        <Articulated>false</Articulated>
+        <TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
+        <RetarderType>None</RetarderType>
+        <AngledriveType>None</AngledriveType>
+        <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+        <ArchitectureID>E2</ArchitectureID>
+        <OvcHev>true</OvcHev>
+        <vif:ADAS xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:type="ADAS_PEV_Type">
+          <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+        </vif:ADAS>
+        <Components xsi:type="Vehicle_PEV-E2_ComponentsVIFType">
+          <ElectricMachine>
+            <PowertrainPosition>2</PowertrainPosition>
+            <Count>2</Count>
+            <ElectricMachineSystem>
+              <Data xsi:type="ElectricMachineSystemDataDeclarationType">
+                <Manufacturer>a</Manufacturer>
+                <Model>a</Model>
+                <CertificationMethod>Measured</CertificationMethod>
+                <CertificationNumber>token</CertificationNumber>
+                <Date>2017-01-01T00:00:00Z</Date>
+                <AppVersion>aaaaa</AppVersion>
+                <ElectricMachineType>ASM</ElectricMachineType>
+                <R85RatedPower>162500</R85RatedPower>
+                <RotationalInertia>0.39</RotationalInertia>
+                <DcDcConverterIncluded>true</DcDcConverterIncluded>
+                <IHPCType>None</IHPCType>
+                <VoltageLevel>
+                  <Voltage>100</Voltage>
+                  <ContinuousTorque>500.00</ContinuousTorque>
+                  <TestSpeedContinuousTorque>2069.00</TestSpeedContinuousTorque>
+                  <OverloadTorque>750.00</OverloadTorque>
+                  <TestSpeedOverloadTorque>2069.00</TestSpeedOverloadTorque>
+                  <OverloadDuration>120.00</OverloadDuration>
+                  <MaxTorqueCurve>
+                    <Entry outShaftSpeed="0.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="41.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="414.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="828.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="1241.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="1655.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="2069.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="2483.00" maxTorque="625.00" minTorque="-625.00" />
+                    <Entry outShaftSpeed="2897.00" maxTorque="535.71" minTorque="-535.71" />
+                    <Entry outShaftSpeed="3310.00" maxTorque="468.75" minTorque="-468.75" />
+                    <Entry outShaftSpeed="3724.00" maxTorque="416.67" minTorque="-416.67" />
+                    <Entry outShaftSpeed="4138.00" maxTorque="375.00" minTorque="-375.00" />
+                    <Entry outShaftSpeed="4552.00" maxTorque="340.91" minTorque="-340.91" />
+                    <Entry outShaftSpeed="4966.00" maxTorque="312.50" minTorque="-312.50" />
+                    <Entry outShaftSpeed="5379.00" maxTorque="288.46" minTorque="-288.46" />
+                    <Entry outShaftSpeed="5793.00" maxTorque="267.86" minTorque="-267.86" />
+                    <Entry outShaftSpeed="6207.00" maxTorque="250.00" minTorque="-250.00" />
+                    <Entry outShaftSpeed="6621.00" maxTorque="234.38" minTorque="-234.38" />
+                    <Entry outShaftSpeed="7035.00" maxTorque="220.59" minTorque="-220.59" />
+                    <Entry outShaftSpeed="7448.00" maxTorque="208.33" minTorque="-208.33" />
+                    <Entry outShaftSpeed="7862.00" maxTorque="197.37" minTorque="-197.37" />
+                    <Entry outShaftSpeed="8276.00" maxTorque="187.50" minTorque="-187.50" />
+                  </MaxTorqueCurve>
+                </VoltageLevel>
+                <VoltageLevel>
+                  <Voltage>1000</Voltage>
+                  <ContinuousTorque>500.00</ContinuousTorque>
+                  <TestSpeedContinuousTorque>2069.00</TestSpeedContinuousTorque>
+                  <OverloadTorque>750.00</OverloadTorque>
+                  <TestSpeedOverloadTorque>2069.00</TestSpeedOverloadTorque>
+                  <OverloadDuration>120.00</OverloadDuration>
+                  <MaxTorqueCurve>
+                    <Entry outShaftSpeed="0.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="41.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="414.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="828.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="1241.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="1655.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="2069.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="2483.00" maxTorque="625.00" minTorque="-625.00" />
+                    <Entry outShaftSpeed="2897.00" maxTorque="535.71" minTorque="-535.71" />
+                    <Entry outShaftSpeed="3310.00" maxTorque="468.75" minTorque="-468.75" />
+                    <Entry outShaftSpeed="3724.00" maxTorque="416.67" minTorque="-416.67" />
+                    <Entry outShaftSpeed="4138.00" maxTorque="375.00" minTorque="-375.00" />
+                    <Entry outShaftSpeed="4552.00" maxTorque="340.91" minTorque="-340.91" />
+                    <Entry outShaftSpeed="4966.00" maxTorque="312.50" minTorque="-312.50" />
+                    <Entry outShaftSpeed="5379.00" maxTorque="288.46" minTorque="-288.46" />
+                    <Entry outShaftSpeed="5793.00" maxTorque="267.86" minTorque="-267.86" />
+                    <Entry outShaftSpeed="6207.00" maxTorque="250.00" minTorque="-250.00" />
+                    <Entry outShaftSpeed="6621.00" maxTorque="234.38" minTorque="-234.38" />
+                    <Entry outShaftSpeed="7035.00" maxTorque="220.59" minTorque="-220.59" />
+                    <Entry outShaftSpeed="7448.00" maxTorque="208.33" minTorque="-208.33" />
+                    <Entry outShaftSpeed="7862.00" maxTorque="197.37" minTorque="-197.37" />
+                    <Entry outShaftSpeed="8276.00" maxTorque="187.50" minTorque="-187.50" />
+                  </MaxTorqueCurve>
+                </VoltageLevel>
+                <DragCurve>
+                  <Entry outShaftSpeed="0.00" dragTorque="-1.77" />
+                  <Entry outShaftSpeed="41.38" dragTorque="-1.86" />
+                  <Entry outShaftSpeed="413.80" dragTorque="-2.72" />
+                  <Entry outShaftSpeed="827.61" dragTorque="-3.66" />
+                  <Entry outShaftSpeed="1241.41" dragTorque="-4.61" />
+                  <Entry outShaftSpeed="1655.21" dragTorque="-5.55" />
+                  <Entry outShaftSpeed="2069.01" dragTorque="-6.50" />
+                  <Entry outShaftSpeed="2482.82" dragTorque="-7.45" />
+                  <Entry outShaftSpeed="2896.62" dragTorque="-8.39" />
+                  <Entry outShaftSpeed="3310.42" dragTorque="-9.34" />
+                  <Entry outShaftSpeed="3724.23" dragTorque="-10.29" />
+                  <Entry outShaftSpeed="4138.03" dragTorque="-11.23" />
+                  <Entry outShaftSpeed="4551.83" dragTorque="-12.18" />
+                  <Entry outShaftSpeed="4965.63" dragTorque="-13.12" />
+                  <Entry outShaftSpeed="5379.44" dragTorque="-14.07" />
+                  <Entry outShaftSpeed="5793.24" dragTorque="-15.02" />
+                  <Entry outShaftSpeed="6207.04" dragTorque="-15.96" />
+                  <Entry outShaftSpeed="6620.85" dragTorque="-16.91" />
+                  <Entry outShaftSpeed="7034.65" dragTorque="-17.86" />
+                  <Entry outShaftSpeed="7448.45" dragTorque="-18.80" />
+                  <Entry outShaftSpeed="7862.25" dragTorque="-19.75" />
+                  <Entry outShaftSpeed="8276.06" dragTorque="-20.69" />
+                </DragCurve>
+                <Conditioning>
+                  <Entry coolantTempInlet="30" coolingPower="5000" />
+                </Conditioning>
+              </Data>
+            </ElectricMachineSystem>
+          </ElectricMachine>
+          <ElectricEnergyStorage>
+            <Battery>
+              <StringID>0</StringID>
+              <REESS>
+                <Data xsi:type="BatterySystemDataType">
+                  <Manufacturer>a</Manufacturer>
+                  <Model>a</Model>
+                  <CertificationMethod>Measured</CertificationMethod>
+                  <CertificationNumber>token</CertificationNumber>
+                  <Date>2017-01-01T00:00:00Z</Date>
+                  <AppVersion>aaaaa</AppVersion>
+                  <BatteryType>HPBS</BatteryType>
+                  <RatedCapacity>631.15</RatedCapacity>
+                  <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+                  <JunctionboxIncluded>true</JunctionboxIncluded>
+                  <TestingTemperature>20</TestingTemperature>
+                  <OCV>
+                    <Entry SoC="0" OCV="718.42" />
+                    <Entry SoC="10" OCV="746.84" />
+                    <Entry SoC="20" OCV="763.14" />
+                    <Entry SoC="30" OCV="771.85" />
+                    <Entry SoC="40" OCV="776.26" />
+                    <Entry SoC="50" OCV="778.61" />
+                    <Entry SoC="60" OCV="780.43" />
+                    <Entry SoC="70" OCV="782.70" />
+                    <Entry SoC="80" OCV="786.19" />
+                    <Entry SoC="90" OCV="791.68" />
+                    <Entry SoC="100" OCV="800.21" />
+                  </OCV>
+                  <CurrentLimits>
+                    <Entry SoC="0" maxChargingCurrent="1620.00" maxDischargingCurrent="1620.00" />
+                    <Entry SoC="100" maxChargingCurrent="1620.00" maxDischargingCurrent="1620.00" />
+                  </CurrentLimits>
+                </Data>
+              </REESS>
+              <SOCmin>8</SOCmin>
+              <SOCmax>92</SOCmax>
+            </Battery>
+          </ElectricEnergyStorage>
+          <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>8.310</Ratio>
+                </Gear>
+                <Gear number="2">
+                  <Ratio>4.650</Ratio>
+                </Gear>
+                <Gear number="3">
+                  <Ratio>2.750</Ratio>
+                </Gear>
+              </Gears>
+            </Data>
+          </Transmission>
+          <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.640</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>
+                  <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>275/70 R22.5</Dimension>
+                      <RRCDeclared>0.0050</RRCDeclared>
+                      <FzISO>31300</FzISO>
+                    </Data>
+                    <Signature>
+                      <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+                        <di:Transforms>
+                          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                        </di:Transforms>
+                        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                        <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+                      </di:Reference>
+                    </Signature>
+                  </Tyre>
+                </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>
+                  <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>275/70 R22.5</Dimension>
+                      <RRCDeclared>0.0056</RRCDeclared>
+                      <FzISO>31300</FzISO>
+                    </Data>
+                    <Signature>
+                      <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+                        <di:Transforms>
+                          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                        </di:Transforms>
+                        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                        <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+                      </di:Reference>
+                    </Signature>
+                  </Tyre>
+                </vif:Axle>
+              </Axles>
+            </Data>
+          </AxleWheels>
+          <Auxiliaries>
+            <Data xsi:type="AUX_PEV_PrimaryBusType">
+              <SteeringPump>
+                <Technology axleNumber="1">Full electric steering gear</Technology>
+              </SteeringPump>
+              <PneumaticSystem>
+                <CompressorDrive>electrically</CompressorDrive>
+                <SmartRegenerationSystem>false</SmartRegenerationSystem>
+                <AirsuspensionControl>electronically</AirsuspensionControl>
+                <PneumaticSCRReagentDosing>false</PneumaticSCRReagentDosing>
+              </PneumaticSystem>
+              <HVAC>
+                <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+              </HVAC>
+            </Data>
+          </Auxiliaries>
+        </Components>
+      </Vehicle>
+      <InputDataSignature>
+        <di:Reference URI="#PrimaryCoach_E2_AMT">
+          <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>V7bpHXmYJ9tC53hwxqNI2JxhRU8dxs9jjaDPPgAnD/Q=</di:DigestValue>
+        </di:Reference>
+      </InputDataSignature>
+      <ManufacturerRecordSignature>
+        <di:Reference URI="#MRF-2bb718dfc16d40b09935">
+          <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>qKgoXyGquFtXcLfE7GXuLls2o/mKZORkhSixuZZrvzA=</di:DigestValue>
+        </di:Reference>
+      </ManufacturerRecordSignature>
+      <Results>
+        <Status>success</Status>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">3.34</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">4.28</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">2.80</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">3.55</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">2.48</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">3.05</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13050</TotalVehicleMass>
+            <Payload unit="kg">1075</Payload>
+            <PassengerCount>15.15</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">2.55</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">15495</TotalVehicleMass>
+            <Payload unit="kg">3520</Payload>
+            <PassengerCount>49.57</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">2.81</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">3.66</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">4.89</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">3.07</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">4.03</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">2.73</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">3.44</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14225</TotalVehicleMass>
+            <Payload unit="kg">1075</Payload>
+            <PassengerCount>15.15</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">2.43</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16670</TotalVehicleMass>
+            <Payload unit="kg">3520</Payload>
+            <PassengerCount>49.57</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">2.69</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14245</TotalVehicleMass>
+            <Payload unit="kg">1095</Payload>
+            <PassengerCount>15.42</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">2.83</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">15887</TotalVehicleMass>
+            <Payload unit="kg">2737</Payload>
+            <PassengerCount>38.56</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">2.96</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14663</TotalVehicleMass>
+            <Payload unit="kg">1263</Payload>
+            <PassengerCount>17.79</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">2.57</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17609</TotalVehicleMass>
+            <Payload unit="kg">4209</Payload>
+            <PassengerCount>59.29</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">2.90</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14747</TotalVehicleMass>
+            <Payload unit="kg">1347</Payload>
+            <PassengerCount>18.97</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">3.05</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16768</TotalVehicleMass>
+            <Payload unit="kg">3368</Payload>
+            <PassengerCount>47.43</PassengerCount>
+          </SimulationParameters>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">3.21</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+      </Results>
+      <ApplicationInformation>
+        <SimulationToolVersion>0.7.10.3035-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+        <Date>2023-04-24T09:21:30.3710114Z</Date>
+      </ApplicationInformation>
+    </Data>
+    <Signature>
+      <di:Reference URI="#VIF_P-f6219114ce4248989b7f">
+        <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>7v1p5/klgnSB9suLk9UKiE0PGJN8ZrlzZV6la+vXHQU=</di:DigestValue>
+      </di:Reference>
+    </Signature>
+  </PrimaryVehicle>
+</VectoOutputMultistep>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCoach_P2_HEV_AMT_OVC.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCoach_P2_HEV_AMT_OVC.RSLT_VIF.xml
new file mode 100644
index 0000000000..27c5248250
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCoach_P2_HEV_AMT_OVC.RSLT_VIF.xml
@@ -0,0 +1,960 @@
+<?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-01da759aeb8e4c91821b" xsi:type="PrimaryVehicleDataType">
+      <Vehicle xsi:type="HEV-Px_VehicleVIFType">
+        <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+        <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
+        <Model>Generic Model</Model>
+        <VIN>VEH-1234567890</VIN>
+        <Date>2017-02-15T11:00:00Z</Date>
+        <LegislativeCategory>M3</LegislativeCategory>
+        <ChassisConfiguration>Bus</ChassisConfiguration>
+        <AxleConfiguration>4x2</AxleConfiguration>
+        <Articulated>false</Articulated>
+        <TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
+        <IdlingSpeed>600</IdlingSpeed>
+        <RetarderType>Transmission Output Retarder</RetarderType>
+        <RetarderRatio>1.000</RetarderRatio>
+        <AngledriveType>None</AngledriveType>
+        <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+        <ArchitectureID>P2</ArchitectureID>
+        <OvcHev>true</OvcHev>
+        <vif:ADAS xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:type="ADAS_HEV_Type">
+          <EngineStopStart>true</EngineStopStart>
+          <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+        </vif:ADAS>
+        <Components xsi:type="Vehicle_HEV-Px_ComponentsVIFType">
+          <Engine>
+            <Data xsi:type="EngineDataVIFType">
+              <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+              <Model>Generic 40t Long Haul Truck Engine</Model>
+              <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+              <Date>2017-02-15T11:00:00Z</Date>
+              <AppVersion>VectoEngine x.y</AppVersion>
+              <Displacement>12700</Displacement>
+              <RatedSpeed>1800</RatedSpeed>
+              <RatedPower>325000</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="-103.81" />
+                  <Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-107.58" />
+                  <Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-112.62" />
+                  <Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-121.16" />
+                  <Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-130.83" />
+                  <Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-151.96" />
+                  <Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-171.39" />
+                  <Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-195.77" />
+                  <Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-208.71" />
+                </FullLoadAndDragCurve>
+                <Fuels>
+                  <FuelType>Diesel CI</FuelType>
+                </Fuels>
+              </Mode>
+            </Data>
+          </Engine>
+          <ElectricMachine>
+            <PowertrainPosition>2</PowertrainPosition>
+            <Count>1</Count>
+            <ElectricMachineSystem>
+              <Data xsi:type="ElectricMachineSystemDataDeclarationType">
+                <Manufacturer>a</Manufacturer>
+                <Model>a</Model>
+                <CertificationMethod>Measured</CertificationMethod>
+                <CertificationNumber>token</CertificationNumber>
+                <Date>2017-01-01T00:00:00Z</Date>
+                <AppVersion>aaaaa</AppVersion>
+                <ElectricMachineType>ASM</ElectricMachineType>
+                <R85RatedPower>140000</R85RatedPower>
+                <RotationalInertia>0.58</RotationalInertia>
+                <DcDcConverterIncluded>true</DcDcConverterIncluded>
+                <IHPCType>None</IHPCType>
+                <VoltageLevel>
+                  <Voltage>100</Voltage>
+                  <ContinuousTorque>700.00</ContinuousTorque>
+                  <TestSpeedContinuousTorque>1273.00</TestSpeedContinuousTorque>
+                  <OverloadTorque>1050.00</OverloadTorque>
+                  <TestSpeedOverloadTorque>1273.00</TestSpeedOverloadTorque>
+                  <OverloadDuration>120.00</OverloadDuration>
+                  <MaxTorqueCurve>
+                    <Entry outShaftSpeed="0.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="25.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="255.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="509.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="764.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="1019.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="1273.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="1528.00" maxTorque="875.00" minTorque="-875.00" />
+                    <Entry outShaftSpeed="1783.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="2037.00" maxTorque="656.25" minTorque="-656.25" />
+                    <Entry outShaftSpeed="2292.00" maxTorque="583.33" minTorque="-583.33" />
+                    <Entry outShaftSpeed="2546.00" maxTorque="525.00" minTorque="-525.00" />
+                    <Entry outShaftSpeed="2801.00" maxTorque="477.27" minTorque="-477.27" />
+                    <Entry outShaftSpeed="3056.00" maxTorque="437.50" minTorque="-437.50" />
+                    <Entry outShaftSpeed="3310.00" maxTorque="403.85" minTorque="-403.85" />
+                    <Entry outShaftSpeed="3565.00" maxTorque="375.00" minTorque="-375.00" />
+                    <Entry outShaftSpeed="3820.00" maxTorque="350.00" minTorque="-350.00" />
+                    <Entry outShaftSpeed="4074.00" maxTorque="328.13" minTorque="-328.13" />
+                    <Entry outShaftSpeed="4329.00" maxTorque="308.82" minTorque="-308.82" />
+                    <Entry outShaftSpeed="4584.00" maxTorque="291.67" minTorque="-291.67" />
+                    <Entry outShaftSpeed="4838.00" maxTorque="276.32" minTorque="-276.32" />
+                    <Entry outShaftSpeed="5093.00" maxTorque="262.50" minTorque="-262.50" />
+                  </MaxTorqueCurve>
+                </VoltageLevel>
+                <VoltageLevel>
+                  <Voltage>1000</Voltage>
+                  <ContinuousTorque>700.00</ContinuousTorque>
+                  <TestSpeedContinuousTorque>1273.00</TestSpeedContinuousTorque>
+                  <OverloadTorque>1050.00</OverloadTorque>
+                  <TestSpeedOverloadTorque>1273.00</TestSpeedOverloadTorque>
+                  <OverloadDuration>120.00</OverloadDuration>
+                  <MaxTorqueCurve>
+                    <Entry outShaftSpeed="0.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="25.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="255.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="509.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="764.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="1019.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="1273.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="1528.00" maxTorque="875.00" minTorque="-875.00" />
+                    <Entry outShaftSpeed="1783.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="2037.00" maxTorque="656.25" minTorque="-656.25" />
+                    <Entry outShaftSpeed="2292.00" maxTorque="583.33" minTorque="-583.33" />
+                    <Entry outShaftSpeed="2546.00" maxTorque="525.00" minTorque="-525.00" />
+                    <Entry outShaftSpeed="2801.00" maxTorque="477.27" minTorque="-477.27" />
+                    <Entry outShaftSpeed="3056.00" maxTorque="437.50" minTorque="-437.50" />
+                    <Entry outShaftSpeed="3310.00" maxTorque="403.85" minTorque="-403.85" />
+                    <Entry outShaftSpeed="3565.00" maxTorque="375.00" minTorque="-375.00" />
+                    <Entry outShaftSpeed="3820.00" maxTorque="350.00" minTorque="-350.00" />
+                    <Entry outShaftSpeed="4074.00" maxTorque="328.13" minTorque="-328.13" />
+                    <Entry outShaftSpeed="4329.00" maxTorque="308.82" minTorque="-308.82" />
+                    <Entry outShaftSpeed="4584.00" maxTorque="291.67" minTorque="-291.67" />
+                    <Entry outShaftSpeed="4838.00" maxTorque="276.32" minTorque="-276.32" />
+                    <Entry outShaftSpeed="5093.00" maxTorque="262.50" minTorque="-262.50" />
+                  </MaxTorqueCurve>
+                </VoltageLevel>
+                <DragCurve>
+                  <Entry outShaftSpeed="0.00" dragTorque="-4.37" />
+                  <Entry outShaftSpeed="25.46" dragTorque="-4.55" />
+                  <Entry outShaftSpeed="254.65" dragTorque="-6.16" />
+                  <Entry outShaftSpeed="509.30" dragTorque="-7.96" />
+                  <Entry outShaftSpeed="763.94" dragTorque="-9.76" />
+                  <Entry outShaftSpeed="1018.59" dragTorque="-11.55" />
+                  <Entry outShaftSpeed="1273.24" dragTorque="-13.35" />
+                  <Entry outShaftSpeed="1527.89" dragTorque="-15.15" />
+                  <Entry outShaftSpeed="1782.54" dragTorque="-16.95" />
+                  <Entry outShaftSpeed="2037.18" dragTorque="-18.74" />
+                  <Entry outShaftSpeed="2291.83" dragTorque="-20.54" />
+                  <Entry outShaftSpeed="2546.48" dragTorque="-22.34" />
+                  <Entry outShaftSpeed="2801.13" dragTorque="-24.13" />
+                  <Entry outShaftSpeed="3055.77" dragTorque="-25.93" />
+                  <Entry outShaftSpeed="3310.42" dragTorque="-27.73" />
+                  <Entry outShaftSpeed="3565.07" dragTorque="-29.52" />
+                  <Entry outShaftSpeed="3819.72" dragTorque="-31.32" />
+                  <Entry outShaftSpeed="4074.37" dragTorque="-33.12" />
+                  <Entry outShaftSpeed="4329.01" dragTorque="-34.91" />
+                  <Entry outShaftSpeed="4583.66" dragTorque="-36.71" />
+                  <Entry outShaftSpeed="4838.31" dragTorque="-38.51" />
+                  <Entry outShaftSpeed="5092.96" dragTorque="-40.31" />
+                </DragCurve>
+                <Conditioning>
+                  <Entry coolantTempInlet="30" coolingPower="5000" />
+                </Conditioning>
+              </Data>
+            </ElectricMachineSystem>
+          </ElectricMachine>
+          <ElectricEnergyStorage>
+            <Battery>
+              <StringID>0</StringID>
+              <REESS>
+                <Data xsi:type="BatterySystemDataType">
+                  <Manufacturer>a</Manufacturer>
+                  <Model>a</Model>
+                  <CertificationMethod>Measured</CertificationMethod>
+                  <CertificationNumber>token</CertificationNumber>
+                  <Date>2017-01-01T00:00:00Z</Date>
+                  <AppVersion>aaaaa</AppVersion>
+                  <BatteryType>HPBS</BatteryType>
+                  <RatedCapacity>14.30</RatedCapacity>
+                  <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+                  <JunctionboxIncluded>true</JunctionboxIncluded>
+                  <TestingTemperature>20</TestingTemperature>
+                  <OCV>
+                    <Entry SoC="0" OCV="628.60" />
+                    <Entry SoC="10" OCV="653.50" />
+                    <Entry SoC="20" OCV="667.70" />
+                    <Entry SoC="30" OCV="675.40" />
+                    <Entry SoC="40" OCV="679.20" />
+                    <Entry SoC="50" OCV="681.30" />
+                    <Entry SoC="60" OCV="682.90" />
+                    <Entry SoC="70" OCV="684.90" />
+                    <Entry SoC="80" OCV="687.90" />
+                    <Entry SoC="90" OCV="692.70" />
+                    <Entry SoC="100" OCV="700.20" />
+                  </OCV>
+                  <CurrentLimits>
+                    <Entry SoC="0" maxChargingCurrent="1620.00" maxDischargingCurrent="1620.00" />
+                    <Entry SoC="100" maxChargingCurrent="1620.00" maxDischargingCurrent="1620.00" />
+                  </CurrentLimits>
+                </Data>
+              </REESS>
+              <SOCmin>25</SOCmin>
+              <SOCmax>75</SOCmax>
+            </Battery>
+          </ElectricEnergyStorage>
+          <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>12.330</Ratio>
+                </Gear>
+                <Gear number="2">
+                  <Ratio>9.590</Ratio>
+                </Gear>
+                <Gear number="3">
+                  <Ratio>7.440</Ratio>
+                </Gear>
+                <Gear number="4">
+                  <Ratio>5.780</Ratio>
+                </Gear>
+                <Gear number="5">
+                  <Ratio>4.570</Ratio>
+                </Gear>
+                <Gear number="6">
+                  <Ratio>3.550</Ratio>
+                </Gear>
+                <Gear number="7">
+                  <Ratio>2.700</Ratio>
+                </Gear>
+                <Gear number="8">
+                  <Ratio>2.100</Ratio>
+                </Gear>
+                <Gear number="9">
+                  <Ratio>1.630</Ratio>
+                </Gear>
+                <Gear number="10">
+                  <Ratio>1.270</Ratio>
+                </Gear>
+                <Gear number="11">
+                  <Ratio>1.000</Ratio>
+                </Gear>
+                <Gear number="12">
+                  <Ratio>0.780</Ratio>
+                </Gear>
+              </Gears>
+            </Data>
+          </Transmission>
+          <Retarder>
+            <Data xsi:type="RetarderDataVIFType">
+              <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+              <Model>Generic Retarder</Model>
+              <CertificationMethod>Standard values</CertificationMethod>
+              <Date>2017-01-11T11:00:00Z</Date>
+              <AppVersion>3.0.1</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.700</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>
+                  <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>275/70 R22.5</Dimension>
+                      <RRCDeclared>0.0050</RRCDeclared>
+                      <FzISO>31300</FzISO>
+                    </Data>
+                    <Signature>
+                      <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+                        <di:Transforms>
+                          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                        </di:Transforms>
+                        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                        <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+                      </di:Reference>
+                    </Signature>
+                  </Tyre>
+                </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>
+                  <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>275/70 R22.5</Dimension>
+                      <RRCDeclared>0.0056</RRCDeclared>
+                      <FzISO>31300</FzISO>
+                    </Data>
+                    <Signature>
+                      <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+                        <di:Transforms>
+                          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                        </di:Transforms>
+                        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                        <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+                      </di:Reference>
+                    </Signature>
+                  </Tyre>
+                </vif:Axle>
+              </Axles>
+            </Data>
+          </AxleWheels>
+          <Auxiliaries>
+            <Data xsi:type="AUX_HEV-P_PrimaryBusType">
+              <Fan>
+                <Technology>Hydraulic driven - Constant displacement pump</Technology>
+              </Fan>
+              <SteeringPump>
+                <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+              </SteeringPump>
+              <ElectricSystem>
+                <AlternatorTechnology>conventional</AlternatorTechnology>
+                <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="#PrimaryCoach_P2_HEV_AMT">
+          <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>Xq2VZnmdj0vGHi77X2G9Q8hvy4TTUsnYD9R2ccl5Foo=</di:DigestValue>
+        </di:Reference>
+      </InputDataSignature>
+      <ManufacturerRecordSignature>
+        <di:Reference URI="#MRF-4aef23829c5a4d0dbe28">
+          <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>Jvye4SIoCgY2mn6b6QUbJsRWPwTW0vhkVyLiup4PqwI=</di:DigestValue>
+        </di:Reference>
+      </ManufacturerRecordSignature>
+      <Results>
+        <Status>success</Status>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">4.61</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.23</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">11.2</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">6.20</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.78</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">13.5</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">3.41</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.88</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">9.24</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">4.84</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.39</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">11.3</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">2.73</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.78</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">7.74</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">4.47</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.90</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">9.60</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13050</TotalVehicleMass>
+            <Payload unit="kg">1075</Payload>
+            <PassengerCount>15.15</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">4.47</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.90</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">9.60</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">15495</TotalVehicleMass>
+            <Payload unit="kg">3520</Payload>
+            <PassengerCount>49.57</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">4.47</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.90</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">9.60</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">5.49</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.40</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">12.4</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">4.47</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.90</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">9.60</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">4.09</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.06</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">10.1</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">5.71</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.56</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">12.5</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">3.26</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.92</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">8.50</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">5.17</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.01</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">10.4</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14225</TotalVehicleMass>
+            <Payload unit="kg">1075</Payload>
+            <PassengerCount>15.15</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">5.17</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.01</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">10.4</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16670</TotalVehicleMass>
+            <Payload unit="kg">3520</Payload>
+            <PassengerCount>49.57</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">5.17</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.01</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">10.4</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14245</TotalVehicleMass>
+            <Payload unit="kg">1095</Payload>
+            <PassengerCount>15.42</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">1.70</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.29</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">6.15</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">15887</TotalVehicleMass>
+            <Payload unit="kg">2737</Payload>
+            <PassengerCount>38.56</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">2.00</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.33</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">6.49</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14663</TotalVehicleMass>
+            <Payload unit="kg">1263</Payload>
+            <PassengerCount>17.79</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">5.17</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.01</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">10.4</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17609</TotalVehicleMass>
+            <Payload unit="kg">4209</Payload>
+            <PassengerCount>59.29</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">5.17</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.01</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">10.4</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14747</TotalVehicleMass>
+            <Payload unit="kg">1347</Payload>
+            <PassengerCount>18.97</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">1.89</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.45</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">6.58</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16768</TotalVehicleMass>
+            <Payload unit="kg">3368</Payload>
+            <PassengerCount>47.43</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">2.27</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.46</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">7.00</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+      </Results>
+      <ApplicationInformation>
+        <SimulationToolVersion>0.7.10.3035-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+        <Date>2023-04-24T12:37:56.8894302Z</Date>
+      </ApplicationInformation>
+    </Data>
+    <Signature>
+      <di:Reference URI="#VIF_P-01da759aeb8e4c91821b">
+        <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>/Pn7/bTAwJO3nqyFaPoC8sLf8IyMgYZ7mMF4BSLr59M=</di:DigestValue>
+      </di:Reference>
+    </Signature>
+  </PrimaryVehicle>
+</VectoOutputMultistep>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCoach_P2_HEV_Base_AMT.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCoach_P2_HEV_Base_AMT.RSLT_VIF.xml
new file mode 100644
index 0000000000..c133629faf
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCoach_P2_HEV_Base_AMT.RSLT_VIF.xml
@@ -0,0 +1,740 @@
+<?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-69807c2b36c94e5e8e42" xsi:type="PrimaryVehicleDataType">
+      <Vehicle xsi:type="HEV-Px_VehicleVIFType">
+        <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+        <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
+        <Model>Generic Model</Model>
+        <VIN>VEH-1234567890</VIN>
+        <Date>2017-02-15T11:00:00Z</Date>
+        <LegislativeCategory>M3</LegislativeCategory>
+        <ChassisConfiguration>Bus</ChassisConfiguration>
+        <AxleConfiguration>4x2</AxleConfiguration>
+        <Articulated>false</Articulated>
+        <TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
+        <IdlingSpeed>600</IdlingSpeed>
+        <RetarderType>Transmission Output Retarder</RetarderType>
+        <RetarderRatio>1.000</RetarderRatio>
+        <AngledriveType>None</AngledriveType>
+        <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+        <ArchitectureID>P2</ArchitectureID>
+        <OvcHev>false</OvcHev>
+        <vif:ADAS xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:type="ADAS_HEV_Type">
+          <EngineStopStart>true</EngineStopStart>
+          <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+        </vif:ADAS>
+        <Components xsi:type="Vehicle_HEV-Px_ComponentsVIFType">
+          <Engine>
+            <Data xsi:type="EngineDataVIFType">
+              <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+              <Model>Generic 40t Long Haul Truck Engine</Model>
+              <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+              <Date>2017-02-15T11:00:00Z</Date>
+              <AppVersion>VectoEngine x.y</AppVersion>
+              <Displacement>12700</Displacement>
+              <RatedSpeed>1800</RatedSpeed>
+              <RatedPower>325000</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="-103.81" />
+                  <Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-107.58" />
+                  <Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-112.62" />
+                  <Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-121.16" />
+                  <Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-130.83" />
+                  <Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-151.96" />
+                  <Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-171.39" />
+                  <Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-195.77" />
+                  <Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-208.71" />
+                </FullLoadAndDragCurve>
+                <Fuels>
+                  <FuelType>Diesel CI</FuelType>
+                </Fuels>
+              </Mode>
+            </Data>
+          </Engine>
+          <ElectricMachine>
+            <PowertrainPosition>2</PowertrainPosition>
+            <Count>1</Count>
+            <ElectricMachineSystem>
+              <Data xsi:type="ElectricMachineSystemDataDeclarationType">
+                <Manufacturer>a</Manufacturer>
+                <Model>a</Model>
+                <CertificationMethod>Measured</CertificationMethod>
+                <CertificationNumber>token</CertificationNumber>
+                <Date>2017-01-01T00:00:00Z</Date>
+                <AppVersion>aaaaa</AppVersion>
+                <ElectricMachineType>ASM</ElectricMachineType>
+                <R85RatedPower>140000</R85RatedPower>
+                <RotationalInertia>0.58</RotationalInertia>
+                <DcDcConverterIncluded>true</DcDcConverterIncluded>
+                <IHPCType>None</IHPCType>
+                <VoltageLevel>
+                  <Voltage>100</Voltage>
+                  <ContinuousTorque>700.00</ContinuousTorque>
+                  <TestSpeedContinuousTorque>1273.00</TestSpeedContinuousTorque>
+                  <OverloadTorque>1050.00</OverloadTorque>
+                  <TestSpeedOverloadTorque>1273.00</TestSpeedOverloadTorque>
+                  <OverloadDuration>120.00</OverloadDuration>
+                  <MaxTorqueCurve>
+                    <Entry outShaftSpeed="0.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="25.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="255.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="509.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="764.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="1019.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="1273.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="1528.00" maxTorque="875.00" minTorque="-875.00" />
+                    <Entry outShaftSpeed="1783.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="2037.00" maxTorque="656.25" minTorque="-656.25" />
+                    <Entry outShaftSpeed="2292.00" maxTorque="583.33" minTorque="-583.33" />
+                    <Entry outShaftSpeed="2546.00" maxTorque="525.00" minTorque="-525.00" />
+                    <Entry outShaftSpeed="2801.00" maxTorque="477.27" minTorque="-477.27" />
+                    <Entry outShaftSpeed="3056.00" maxTorque="437.50" minTorque="-437.50" />
+                    <Entry outShaftSpeed="3310.00" maxTorque="403.85" minTorque="-403.85" />
+                    <Entry outShaftSpeed="3565.00" maxTorque="375.00" minTorque="-375.00" />
+                    <Entry outShaftSpeed="3820.00" maxTorque="350.00" minTorque="-350.00" />
+                    <Entry outShaftSpeed="4074.00" maxTorque="328.13" minTorque="-328.13" />
+                    <Entry outShaftSpeed="4329.00" maxTorque="308.82" minTorque="-308.82" />
+                    <Entry outShaftSpeed="4584.00" maxTorque="291.67" minTorque="-291.67" />
+                    <Entry outShaftSpeed="4838.00" maxTorque="276.32" minTorque="-276.32" />
+                    <Entry outShaftSpeed="5093.00" maxTorque="262.50" minTorque="-262.50" />
+                  </MaxTorqueCurve>
+                </VoltageLevel>
+                <VoltageLevel>
+                  <Voltage>1000</Voltage>
+                  <ContinuousTorque>700.00</ContinuousTorque>
+                  <TestSpeedContinuousTorque>1273.00</TestSpeedContinuousTorque>
+                  <OverloadTorque>1050.00</OverloadTorque>
+                  <TestSpeedOverloadTorque>1273.00</TestSpeedOverloadTorque>
+                  <OverloadDuration>120.00</OverloadDuration>
+                  <MaxTorqueCurve>
+                    <Entry outShaftSpeed="0.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="25.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="255.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="509.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="764.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="1019.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="1273.00" maxTorque="1050.00" minTorque="-1050.00" />
+                    <Entry outShaftSpeed="1528.00" maxTorque="875.00" minTorque="-875.00" />
+                    <Entry outShaftSpeed="1783.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="2037.00" maxTorque="656.25" minTorque="-656.25" />
+                    <Entry outShaftSpeed="2292.00" maxTorque="583.33" minTorque="-583.33" />
+                    <Entry outShaftSpeed="2546.00" maxTorque="525.00" minTorque="-525.00" />
+                    <Entry outShaftSpeed="2801.00" maxTorque="477.27" minTorque="-477.27" />
+                    <Entry outShaftSpeed="3056.00" maxTorque="437.50" minTorque="-437.50" />
+                    <Entry outShaftSpeed="3310.00" maxTorque="403.85" minTorque="-403.85" />
+                    <Entry outShaftSpeed="3565.00" maxTorque="375.00" minTorque="-375.00" />
+                    <Entry outShaftSpeed="3820.00" maxTorque="350.00" minTorque="-350.00" />
+                    <Entry outShaftSpeed="4074.00" maxTorque="328.13" minTorque="-328.13" />
+                    <Entry outShaftSpeed="4329.00" maxTorque="308.82" minTorque="-308.82" />
+                    <Entry outShaftSpeed="4584.00" maxTorque="291.67" minTorque="-291.67" />
+                    <Entry outShaftSpeed="4838.00" maxTorque="276.32" minTorque="-276.32" />
+                    <Entry outShaftSpeed="5093.00" maxTorque="262.50" minTorque="-262.50" />
+                  </MaxTorqueCurve>
+                </VoltageLevel>
+                <DragCurve>
+                  <Entry outShaftSpeed="0.00" dragTorque="-4.37" />
+                  <Entry outShaftSpeed="25.46" dragTorque="-4.55" />
+                  <Entry outShaftSpeed="254.65" dragTorque="-6.16" />
+                  <Entry outShaftSpeed="509.30" dragTorque="-7.96" />
+                  <Entry outShaftSpeed="763.94" dragTorque="-9.76" />
+                  <Entry outShaftSpeed="1018.59" dragTorque="-11.55" />
+                  <Entry outShaftSpeed="1273.24" dragTorque="-13.35" />
+                  <Entry outShaftSpeed="1527.89" dragTorque="-15.15" />
+                  <Entry outShaftSpeed="1782.54" dragTorque="-16.95" />
+                  <Entry outShaftSpeed="2037.18" dragTorque="-18.74" />
+                  <Entry outShaftSpeed="2291.83" dragTorque="-20.54" />
+                  <Entry outShaftSpeed="2546.48" dragTorque="-22.34" />
+                  <Entry outShaftSpeed="2801.13" dragTorque="-24.13" />
+                  <Entry outShaftSpeed="3055.77" dragTorque="-25.93" />
+                  <Entry outShaftSpeed="3310.42" dragTorque="-27.73" />
+                  <Entry outShaftSpeed="3565.07" dragTorque="-29.52" />
+                  <Entry outShaftSpeed="3819.72" dragTorque="-31.32" />
+                  <Entry outShaftSpeed="4074.37" dragTorque="-33.12" />
+                  <Entry outShaftSpeed="4329.01" dragTorque="-34.91" />
+                  <Entry outShaftSpeed="4583.66" dragTorque="-36.71" />
+                  <Entry outShaftSpeed="4838.31" dragTorque="-38.51" />
+                  <Entry outShaftSpeed="5092.96" dragTorque="-40.31" />
+                </DragCurve>
+                <Conditioning>
+                  <Entry coolantTempInlet="30" coolingPower="5000" />
+                </Conditioning>
+              </Data>
+            </ElectricMachineSystem>
+          </ElectricMachine>
+          <ElectricEnergyStorage>
+            <Battery>
+              <StringID>0</StringID>
+              <REESS>
+                <Data xsi:type="BatterySystemDataType">
+                  <Manufacturer>a</Manufacturer>
+                  <Model>a</Model>
+                  <CertificationMethod>Measured</CertificationMethod>
+                  <CertificationNumber>token</CertificationNumber>
+                  <Date>2017-01-01T00:00:00Z</Date>
+                  <AppVersion>aaaaa</AppVersion>
+                  <BatteryType>HPBS</BatteryType>
+                  <RatedCapacity>14.30</RatedCapacity>
+                  <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+                  <JunctionboxIncluded>true</JunctionboxIncluded>
+                  <TestingTemperature>20</TestingTemperature>
+                  <OCV>
+                    <Entry SoC="0" OCV="628.60" />
+                    <Entry SoC="10" OCV="653.50" />
+                    <Entry SoC="20" OCV="667.70" />
+                    <Entry SoC="30" OCV="675.40" />
+                    <Entry SoC="40" OCV="679.20" />
+                    <Entry SoC="50" OCV="681.30" />
+                    <Entry SoC="60" OCV="682.90" />
+                    <Entry SoC="70" OCV="684.90" />
+                    <Entry SoC="80" OCV="687.90" />
+                    <Entry SoC="90" OCV="692.70" />
+                    <Entry SoC="100" OCV="700.20" />
+                  </OCV>
+                  <CurrentLimits>
+                    <Entry SoC="0" maxChargingCurrent="1620.00" maxDischargingCurrent="1620.00" />
+                    <Entry SoC="100" maxChargingCurrent="1620.00" maxDischargingCurrent="1620.00" />
+                  </CurrentLimits>
+                </Data>
+              </REESS>
+              <SOCmin>25</SOCmin>
+              <SOCmax>75</SOCmax>
+            </Battery>
+          </ElectricEnergyStorage>
+          <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>12.330</Ratio>
+                </Gear>
+                <Gear number="2">
+                  <Ratio>9.590</Ratio>
+                </Gear>
+                <Gear number="3">
+                  <Ratio>7.440</Ratio>
+                </Gear>
+                <Gear number="4">
+                  <Ratio>5.780</Ratio>
+                </Gear>
+                <Gear number="5">
+                  <Ratio>4.570</Ratio>
+                </Gear>
+                <Gear number="6">
+                  <Ratio>3.550</Ratio>
+                </Gear>
+                <Gear number="7">
+                  <Ratio>2.700</Ratio>
+                </Gear>
+                <Gear number="8">
+                  <Ratio>2.100</Ratio>
+                </Gear>
+                <Gear number="9">
+                  <Ratio>1.630</Ratio>
+                </Gear>
+                <Gear number="10">
+                  <Ratio>1.270</Ratio>
+                </Gear>
+                <Gear number="11">
+                  <Ratio>1.000</Ratio>
+                </Gear>
+                <Gear number="12">
+                  <Ratio>0.780</Ratio>
+                </Gear>
+              </Gears>
+            </Data>
+          </Transmission>
+          <Retarder>
+            <Data xsi:type="RetarderDataVIFType">
+              <Manufacturer>Generic Retarder Manufacturer</Manufacturer>
+              <Model>Generic Retarder</Model>
+              <CertificationMethod>Standard values</CertificationMethod>
+              <Date>2017-01-11T11:00:00Z</Date>
+              <AppVersion>3.0.1</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.700</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>
+                  <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>275/70 R22.5</Dimension>
+                      <RRCDeclared>0.0050</RRCDeclared>
+                      <FzISO>31300</FzISO>
+                    </Data>
+                    <Signature>
+                      <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+                        <di:Transforms>
+                          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                        </di:Transforms>
+                        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                        <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+                      </di:Reference>
+                    </Signature>
+                  </Tyre>
+                </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>
+                  <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>275/70 R22.5</Dimension>
+                      <RRCDeclared>0.0056</RRCDeclared>
+                      <FzISO>31300</FzISO>
+                    </Data>
+                    <Signature>
+                      <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+                        <di:Transforms>
+                          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                        </di:Transforms>
+                        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                        <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+                      </di:Reference>
+                    </Signature>
+                  </Tyre>
+                </vif:Axle>
+              </Axles>
+            </Data>
+          </AxleWheels>
+          <Auxiliaries>
+            <Data xsi:type="AUX_HEV-P_PrimaryBusType">
+              <Fan>
+                <Technology>Hydraulic driven - Constant displacement pump</Technology>
+              </Fan>
+              <SteeringPump>
+                <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+              </SteeringPump>
+              <ElectricSystem>
+                <AlternatorTechnology>conventional</AlternatorTechnology>
+                <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="#PrimaryCoach_P2_HEV_AMT">
+          <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>akKCTuStbdm/r/f+jwKDBb4hJaB+iNHpJaWIS23Fuv8=</di:DigestValue>
+        </di:Reference>
+      </InputDataSignature>
+      <ManufacturerRecordSignature>
+        <di:Reference URI="#MRF-ecb1eb5e45894e6bb5e8">
+          <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>41h3pYN8vRwZuPUI64xuVieAjuM8FJzjxacOTNa6qlo=</di:DigestValue>
+        </di:Reference>
+      </ManufacturerRecordSignature>
+      <Results>
+        <Status>success</Status>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">11.2</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">13.5</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">9.24</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">11.3</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">7.74</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">9.60</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13050</TotalVehicleMass>
+            <Payload unit="kg">1075</Payload>
+            <PassengerCount>15.15</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">9.60</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="error">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">15495</TotalVehicleMass>
+            <Payload unit="kg">3520</Payload>
+            <PassengerCount>49.57</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">9.60</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">12.4</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">14.9</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">10.1</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">12.5</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">8.50</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">10.4</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14225</TotalVehicleMass>
+            <Payload unit="kg">1075</Payload>
+            <PassengerCount>15.15</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">9.60</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16670</TotalVehicleMass>
+            <Payload unit="kg">3520</Payload>
+            <PassengerCount>49.57</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">9.60</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14245</TotalVehicleMass>
+            <Payload unit="kg">1095</Payload>
+            <PassengerCount>15.42</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">6.15</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">15887</TotalVehicleMass>
+            <Payload unit="kg">2737</Payload>
+            <PassengerCount>38.56</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">6.49</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14663</TotalVehicleMass>
+            <Payload unit="kg">1263</Payload>
+            <PassengerCount>17.79</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">9.60</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17609</TotalVehicleMass>
+            <Payload unit="kg">4209</Payload>
+            <PassengerCount>59.29</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">9.60</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14747</TotalVehicleMass>
+            <Payload unit="kg">1347</Payload>
+            <PassengerCount>18.97</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">6.58</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16768</TotalVehicleMass>
+            <Payload unit="kg">3368</Payload>
+            <PassengerCount>47.43</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">7.00</EnergyConsumption>
+          </Fuel>
+          <ElectricEnergyConsumption>
+            <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+          </ElectricEnergyConsumption>
+        </Result>
+      </Results>
+      <ApplicationInformation>
+        <SimulationToolVersion>0.7.10.3035-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+        <Date>2023-04-24T12:37:46.0184814Z</Date>
+      </ApplicationInformation>
+    </Data>
+    <Signature>
+      <di:Reference URI="#VIF_P-69807c2b36c94e5e8e42">
+        <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>92NQTnQ3qIosSk7mWgiQU3wqgJrkDvcILl3jXu9ha8o=</di:DigestValue>
+      </di:Reference>
+    </Signature>
+  </PrimaryVehicle>
+</VectoOutputMultistep>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCoach_S2_Base_AMT.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCoach_S2_Base_AMT.RSLT_VIF.xml
new file mode 100644
index 0000000000..d12eca554b
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/PrimaryCoach_S2_Base_AMT.RSLT_VIF.xml
@@ -0,0 +1,993 @@
+<?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-735e11dc1c844072af5b" xsi:type="PrimaryVehicleDataType">
+      <Vehicle xsi:type="HEV-Sx_VehicleVIFType">
+        <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+        <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
+        <Model>Generic Model</Model>
+        <VIN>VEH-1234567890</VIN>
+        <Date>2017-02-15T11:00:00Z</Date>
+        <LegislativeCategory>M3</LegislativeCategory>
+        <ChassisConfiguration>Bus</ChassisConfiguration>
+        <AxleConfiguration>4x2</AxleConfiguration>
+        <Articulated>false</Articulated>
+        <TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
+        <IdlingSpeed>1</IdlingSpeed>
+        <RetarderType>None</RetarderType>
+        <AngledriveType>None</AngledriveType>
+        <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+        <ArchitectureID>S2</ArchitectureID>
+        <OvcHev>true</OvcHev>
+        <vif:ADAS xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:type="ADAS_HEV_Type">
+          <EngineStopStart>true</EngineStopStart>
+          <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl>
+        </vif:ADAS>
+        <Components xsi:type="Vehicle_HEV-S2_ComponentsVIFType">
+          <Engine>
+            <Data xsi:type="EngineDataVIFType">
+              <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+              <Model>Generic 40t Long Haul Truck Engine</Model>
+              <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+              <Date>2017-02-15T11:00:00Z</Date>
+              <AppVersion>VectoEngine x.y</AppVersion>
+              <Displacement>12700</Displacement>
+              <RatedSpeed>1800</RatedSpeed>
+              <RatedPower>325000</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="-125.56" />
+                  <Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-130.72" />
+                  <Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-135.85" />
+                  <Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-146.72" />
+                  <Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-156.83" />
+                  <Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-183.84" />
+                  <Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-207.31" />
+                  <Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-236.72" />
+                  <Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-248.49" />
+                  <Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-274.38" />
+                </FullLoadAndDragCurve>
+                <Fuels>
+                  <FuelType>Diesel CI</FuelType>
+                </Fuels>
+              </Mode>
+            </Data>
+          </Engine>
+          <ElectricMachineGEN>
+            <PowertrainPosition>GEN</PowertrainPosition>
+            <Count>1</Count>
+            <ElectricMachineSystem>
+              <Data xsi:type="ElectricMachineSystemDataDeclarationType">
+                <Manufacturer>a</Manufacturer>
+                <Model>a</Model>
+                <CertificationMethod>Measured</CertificationMethod>
+                <CertificationNumber>token</CertificationNumber>
+                <Date>2017-01-01T00:00:00Z</Date>
+                <AppVersion>aaaaa</AppVersion>
+                <ElectricMachineType>ASM</ElectricMachineType>
+                <R85RatedPower>200000</R85RatedPower>
+                <RotationalInertia>0.13</RotationalInertia>
+                <DcDcConverterIncluded>true</DcDcConverterIncluded>
+                <IHPCType>None</IHPCType>
+                <VoltageLevel>
+                  <Voltage>1</Voltage>
+                  <ContinuousTorque>798.00</ContinuousTorque>
+                  <TestSpeedContinuousTorque>1850.00</TestSpeedContinuousTorque>
+                  <OverloadTorque>1030.00</OverloadTorque>
+                  <TestSpeedOverloadTorque>1850.00</TestSpeedOverloadTorque>
+                  <OverloadDuration>120.00</OverloadDuration>
+                  <MaxTorqueCurve>
+                    <Entry outShaftSpeed="0.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="37.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="370.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="740.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="1110.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="1480.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="1850.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="2220.00" maxTorque="858.33" minTorque="-858.33" />
+                    <Entry outShaftSpeed="2590.00" maxTorque="735.71" minTorque="-735.71" />
+                  </MaxTorqueCurve>
+                </VoltageLevel>
+                <VoltageLevel>
+                  <Voltage>1000</Voltage>
+                  <ContinuousTorque>798.00</ContinuousTorque>
+                  <TestSpeedContinuousTorque>1850.00</TestSpeedContinuousTorque>
+                  <OverloadTorque>1030.00</OverloadTorque>
+                  <TestSpeedOverloadTorque>1850.00</TestSpeedOverloadTorque>
+                  <OverloadDuration>120.00</OverloadDuration>
+                  <MaxTorqueCurve>
+                    <Entry outShaftSpeed="0.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="37.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="370.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="740.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="1110.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="1480.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="1850.00" maxTorque="1030.00" minTorque="-1030.00" />
+                    <Entry outShaftSpeed="2220.00" maxTorque="858.33" minTorque="-858.33" />
+                    <Entry outShaftSpeed="2590.00" maxTorque="735.71" minTorque="-735.71" />
+                  </MaxTorqueCurve>
+                </VoltageLevel>
+                <DragCurve>
+                  <Entry outShaftSpeed="0.00" dragTorque="-1.89" />
+                  <Entry outShaftSpeed="37.00" dragTorque="-2.01" />
+                  <Entry outShaftSpeed="370.00" dragTorque="-3.02" />
+                  <Entry outShaftSpeed="740.00" dragTorque="-4.14" />
+                  <Entry outShaftSpeed="1110.00" dragTorque="-5.26" />
+                  <Entry outShaftSpeed="1480.00" dragTorque="-6.38" />
+                  <Entry outShaftSpeed="1850.00" dragTorque="-7.50" />
+                  <Entry outShaftSpeed="2220.00" dragTorque="-8.62" />
+                  <Entry outShaftSpeed="2590.00" dragTorque="-9.74" />
+                </DragCurve>
+                <Conditioning>
+                  <Entry coolantTempInlet="30" coolingPower="5000" />
+                </Conditioning>
+              </Data>
+            </ElectricMachineSystem>
+          </ElectricMachineGEN>
+          <ElectricEnergyStorage>
+            <Battery>
+              <StringID>0</StringID>
+              <REESS>
+                <Data xsi:type="BatterySystemDataType">
+                  <Manufacturer>a</Manufacturer>
+                  <Model>a</Model>
+                  <CertificationMethod>Measured</CertificationMethod>
+                  <CertificationNumber>token</CertificationNumber>
+                  <Date>2017-01-01T00:00:00Z</Date>
+                  <AppVersion>aaaaa</AppVersion>
+                  <BatteryType>HPBS</BatteryType>
+                  <RatedCapacity>631.15</RatedCapacity>
+                  <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+                  <JunctionboxIncluded>true</JunctionboxIncluded>
+                  <TestingTemperature>20</TestingTemperature>
+                  <OCV>
+                    <Entry SoC="0" OCV="718.42" />
+                    <Entry SoC="10" OCV="746.84" />
+                    <Entry SoC="20" OCV="763.14" />
+                    <Entry SoC="30" OCV="771.85" />
+                    <Entry SoC="40" OCV="776.26" />
+                    <Entry SoC="50" OCV="778.61" />
+                    <Entry SoC="60" OCV="780.43" />
+                    <Entry SoC="70" OCV="782.70" />
+                    <Entry SoC="80" OCV="786.19" />
+                    <Entry SoC="90" OCV="791.68" />
+                    <Entry SoC="100" OCV="800.21" />
+                  </OCV>
+                  <CurrentLimits>
+                    <Entry SoC="0" maxChargingCurrent="1620.00" maxDischargingCurrent="1620.00" />
+                    <Entry SoC="100" maxChargingCurrent="1620.00" maxDischargingCurrent="1620.00" />
+                  </CurrentLimits>
+                </Data>
+              </REESS>
+              <SOCmin>8</SOCmin>
+              <SOCmax>92</SOCmax>
+            </Battery>
+          </ElectricEnergyStorage>
+          <ElectricMachine>
+            <PowertrainPosition>2</PowertrainPosition>
+            <Count>2</Count>
+            <ElectricMachineSystem>
+              <Data xsi:type="ElectricMachineSystemDataDeclarationType">
+                <Manufacturer>a</Manufacturer>
+                <Model>a</Model>
+                <CertificationMethod>Measured</CertificationMethod>
+                <CertificationNumber>token</CertificationNumber>
+                <Date>2017-01-01T00:00:00Z</Date>
+                <AppVersion>aaaaa</AppVersion>
+                <ElectricMachineType>ASM</ElectricMachineType>
+                <R85RatedPower>162500</R85RatedPower>
+                <RotationalInertia>0.39</RotationalInertia>
+                <DcDcConverterIncluded>true</DcDcConverterIncluded>
+                <IHPCType>None</IHPCType>
+                <VoltageLevel>
+                  <Voltage>100</Voltage>
+                  <ContinuousTorque>500.00</ContinuousTorque>
+                  <TestSpeedContinuousTorque>2069.00</TestSpeedContinuousTorque>
+                  <OverloadTorque>750.00</OverloadTorque>
+                  <TestSpeedOverloadTorque>2069.00</TestSpeedOverloadTorque>
+                  <OverloadDuration>120.00</OverloadDuration>
+                  <MaxTorqueCurve>
+                    <Entry outShaftSpeed="0.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="41.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="414.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="828.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="1241.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="1655.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="2069.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="2483.00" maxTorque="625.00" minTorque="-625.00" />
+                    <Entry outShaftSpeed="2897.00" maxTorque="535.71" minTorque="-535.71" />
+                    <Entry outShaftSpeed="3310.00" maxTorque="468.75" minTorque="-468.75" />
+                    <Entry outShaftSpeed="3724.00" maxTorque="416.67" minTorque="-416.67" />
+                    <Entry outShaftSpeed="4138.00" maxTorque="375.00" minTorque="-375.00" />
+                    <Entry outShaftSpeed="4552.00" maxTorque="340.91" minTorque="-340.91" />
+                    <Entry outShaftSpeed="4966.00" maxTorque="312.50" minTorque="-312.50" />
+                    <Entry outShaftSpeed="5379.00" maxTorque="288.46" minTorque="-288.46" />
+                    <Entry outShaftSpeed="5793.00" maxTorque="267.86" minTorque="-267.86" />
+                    <Entry outShaftSpeed="6207.00" maxTorque="250.00" minTorque="-250.00" />
+                    <Entry outShaftSpeed="6621.00" maxTorque="234.38" minTorque="-234.38" />
+                    <Entry outShaftSpeed="7035.00" maxTorque="220.59" minTorque="-220.59" />
+                    <Entry outShaftSpeed="7448.00" maxTorque="208.33" minTorque="-208.33" />
+                    <Entry outShaftSpeed="7862.00" maxTorque="197.37" minTorque="-197.37" />
+                    <Entry outShaftSpeed="8276.00" maxTorque="187.50" minTorque="-187.50" />
+                  </MaxTorqueCurve>
+                </VoltageLevel>
+                <VoltageLevel>
+                  <Voltage>1000</Voltage>
+                  <ContinuousTorque>500.00</ContinuousTorque>
+                  <TestSpeedContinuousTorque>2069.00</TestSpeedContinuousTorque>
+                  <OverloadTorque>750.00</OverloadTorque>
+                  <TestSpeedOverloadTorque>2069.00</TestSpeedOverloadTorque>
+                  <OverloadDuration>120.00</OverloadDuration>
+                  <MaxTorqueCurve>
+                    <Entry outShaftSpeed="0.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="41.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="414.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="828.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="1241.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="1655.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="2069.00" maxTorque="750.00" minTorque="-750.00" />
+                    <Entry outShaftSpeed="2483.00" maxTorque="625.00" minTorque="-625.00" />
+                    <Entry outShaftSpeed="2897.00" maxTorque="535.71" minTorque="-535.71" />
+                    <Entry outShaftSpeed="3310.00" maxTorque="468.75" minTorque="-468.75" />
+                    <Entry outShaftSpeed="3724.00" maxTorque="416.67" minTorque="-416.67" />
+                    <Entry outShaftSpeed="4138.00" maxTorque="375.00" minTorque="-375.00" />
+                    <Entry outShaftSpeed="4552.00" maxTorque="340.91" minTorque="-340.91" />
+                    <Entry outShaftSpeed="4966.00" maxTorque="312.50" minTorque="-312.50" />
+                    <Entry outShaftSpeed="5379.00" maxTorque="288.46" minTorque="-288.46" />
+                    <Entry outShaftSpeed="5793.00" maxTorque="267.86" minTorque="-267.86" />
+                    <Entry outShaftSpeed="6207.00" maxTorque="250.00" minTorque="-250.00" />
+                    <Entry outShaftSpeed="6621.00" maxTorque="234.38" minTorque="-234.38" />
+                    <Entry outShaftSpeed="7035.00" maxTorque="220.59" minTorque="-220.59" />
+                    <Entry outShaftSpeed="7448.00" maxTorque="208.33" minTorque="-208.33" />
+                    <Entry outShaftSpeed="7862.00" maxTorque="197.37" minTorque="-197.37" />
+                    <Entry outShaftSpeed="8276.00" maxTorque="187.50" minTorque="-187.50" />
+                  </MaxTorqueCurve>
+                </VoltageLevel>
+                <DragCurve>
+                  <Entry outShaftSpeed="0.00" dragTorque="-1.77" />
+                  <Entry outShaftSpeed="41.38" dragTorque="-1.86" />
+                  <Entry outShaftSpeed="413.80" dragTorque="-2.72" />
+                  <Entry outShaftSpeed="827.61" dragTorque="-3.66" />
+                  <Entry outShaftSpeed="1241.41" dragTorque="-4.61" />
+                  <Entry outShaftSpeed="1655.21" dragTorque="-5.55" />
+                  <Entry outShaftSpeed="2069.01" dragTorque="-6.50" />
+                  <Entry outShaftSpeed="2482.82" dragTorque="-7.45" />
+                  <Entry outShaftSpeed="2896.62" dragTorque="-8.39" />
+                  <Entry outShaftSpeed="3310.42" dragTorque="-9.34" />
+                  <Entry outShaftSpeed="3724.23" dragTorque="-10.29" />
+                  <Entry outShaftSpeed="4138.03" dragTorque="-11.23" />
+                  <Entry outShaftSpeed="4551.83" dragTorque="-12.18" />
+                  <Entry outShaftSpeed="4965.63" dragTorque="-13.12" />
+                  <Entry outShaftSpeed="5379.44" dragTorque="-14.07" />
+                  <Entry outShaftSpeed="5793.24" dragTorque="-15.02" />
+                  <Entry outShaftSpeed="6207.04" dragTorque="-15.96" />
+                  <Entry outShaftSpeed="6620.85" dragTorque="-16.91" />
+                  <Entry outShaftSpeed="7034.65" dragTorque="-17.86" />
+                  <Entry outShaftSpeed="7448.45" dragTorque="-18.80" />
+                  <Entry outShaftSpeed="7862.25" dragTorque="-19.75" />
+                  <Entry outShaftSpeed="8276.06" dragTorque="-20.69" />
+                </DragCurve>
+                <Conditioning>
+                  <Entry coolantTempInlet="30" coolingPower="5000" />
+                </Conditioning>
+              </Data>
+            </ElectricMachineSystem>
+          </ElectricMachine>
+          <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>8.310</Ratio>
+                </Gear>
+                <Gear number="2">
+                  <Ratio>4.650</Ratio>
+                </Gear>
+                <Gear number="3">
+                  <Ratio>2.750</Ratio>
+                </Gear>
+              </Gears>
+            </Data>
+          </Transmission>
+          <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.640</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>
+                  <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>275/70 R22.5</Dimension>
+                      <RRCDeclared>0.0050</RRCDeclared>
+                      <FzISO>31300</FzISO>
+                    </Data>
+                    <Signature>
+                      <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+                        <di:Transforms>
+                          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                        </di:Transforms>
+                        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                        <di:DigestValue>A/sq1ng4cqeOyauDUqUEnonRSPch3VCqZDX9Pf3tW1Q=</di:DigestValue>
+                      </di:Reference>
+                    </Signature>
+                  </Tyre>
+                </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>
+                  <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>275/70 R22.5</Dimension>
+                      <RRCDeclared>0.0056</RRCDeclared>
+                      <FzISO>31300</FzISO>
+                    </Data>
+                    <Signature>
+                      <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+                        <di:Transforms>
+                          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                        </di:Transforms>
+                        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                        <di:DigestValue>z+KDXmc5MIezM6RVgfYax5J9Efi0ghciG2/wLLmWaBk=</di:DigestValue>
+                      </di:Reference>
+                    </Signature>
+                  </Tyre>
+                </vif:Axle>
+              </Axles>
+            </Data>
+          </AxleWheels>
+          <Auxiliaries>
+            <Data xsi:type="AUX_HEV-S_PrimaryBusType">
+              <Fan>
+                <Technology>Crankshaft mounted - Electronically controlled visco clutch</Technology>
+              </Fan>
+              <SteeringPump>
+                <Technology axleNumber="1">Full electric steering gear</Technology>
+              </SteeringPump>
+              <ElectricSystem>
+                <AlternatorTechnology>conventional</AlternatorTechnology>
+                <SupplyFromHEVPossible>true</SupplyFromHEVPossible>
+              </ElectricSystem>
+              <PneumaticSystem>
+                <SizeOfAirSupply>not applicable</SizeOfAirSupply>
+                <CompressorDrive>electrically</CompressorDrive>
+                <Clutch>none</Clutch>
+                <CompressorRatio>1.000</CompressorRatio>
+                <SmartRegenerationSystem>false</SmartRegenerationSystem>
+                <AirsuspensionControl>electronically</AirsuspensionControl>
+                <PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
+              </PneumaticSystem>
+              <HVAC>
+                <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+                <EngineWasteGasHeatExchanger>false</EngineWasteGasHeatExchanger>
+              </HVAC>
+            </Data>
+          </Auxiliaries>
+        </Components>
+      </Vehicle>
+      <InputDataSignature>
+        <di:Reference URI="#PrimaryCoach_E2_AMT">
+          <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>AbkpXtWhkoHCSrL7cY5Z/Qaii82OExxXLoduRaRTNiI=</di:DigestValue>
+        </di:Reference>
+      </InputDataSignature>
+      <ManufacturerRecordSignature>
+        <di:Reference URI="#MRF-ae36cc323e844c30a119">
+          <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>r2DlKErwDnqDcrMtAqj/1O93ewx8qvSImYuvx20zy0U=</di:DigestValue>
+        </di:Reference>
+      </ManufacturerRecordSignature>
+      <Results>
+        <Status>success</Status>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">1.61</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.39</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">5.19</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">1.08</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">4.19</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">6.76</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">1.11</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.83</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">4.53</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.752</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.47</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">5.84</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.674</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.49</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">4.60</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.464</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.99</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">5.69</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13050</TotalVehicleMass>
+            <Payload unit="kg">1075</Payload>
+            <PassengerCount>15.15</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.505</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.55</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">5.25</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">15495</TotalVehicleMass>
+            <Payload unit="kg">3520</Payload>
+            <PassengerCount>49.57</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.399</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.78</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">5.78</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">1.99</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.64</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">5.51</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">1.12</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">4.53</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">7.29</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">1.38</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.05</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">4.87</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.782</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.77</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">6.34</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.859</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.70</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">4.99</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.483</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.25</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">6.21</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14225</TotalVehicleMass>
+            <Payload unit="kg">1075</Payload>
+            <PassengerCount>15.15</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.390</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.42</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">4.99</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16670</TotalVehicleMass>
+            <Payload unit="kg">3520</Payload>
+            <PassengerCount>49.57</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.324</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.66</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">5.52</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14245</TotalVehicleMass>
+            <Payload unit="kg">1095</Payload>
+            <PassengerCount>15.42</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.172</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.83</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">5.75</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">15887</TotalVehicleMass>
+            <Payload unit="kg">2737</Payload>
+            <PassengerCount>38.56</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.157</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.94</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">6.01</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14663</TotalVehicleMass>
+            <Payload unit="kg">1263</Payload>
+            <PassengerCount>17.79</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.419</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.54</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">5.26</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17609</TotalVehicleMass>
+            <Payload unit="kg">4209</Payload>
+            <PassengerCount>59.29</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.316</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">2.83</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">5.91</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14747</TotalVehicleMass>
+            <Payload unit="kg">1347</Payload>
+            <PassengerCount>18.97</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.185</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.03</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">6.20</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16768</TotalVehicleMass>
+            <Payload unit="kg">3368</Payload>
+            <PassengerCount>47.43</PassengerCount>
+          </SimulationParameters>
+          <OVCMode type="charge depleting">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">0.158</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">3.16</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+          <OVCMode type="charge sustaining">
+            <Fuel type="Diesel CI">
+              <EnergyConsumption unit="MJ/km">6.51</EnergyConsumption>
+            </Fuel>
+            <ElectricEnergyConsumption>
+              <EnergyConsumption unit="MJ/km">0.0</EnergyConsumption>
+            </ElectricEnergyConsumption>
+          </OVCMode>
+        </Result>
+      </Results>
+      <ApplicationInformation>
+        <SimulationToolVersion>0.7.10.3035-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+        <Date>2023-04-24T10:34:15.3802669Z</Date>
+      </ApplicationInformation>
+    </Data>
+    <Signature>
+      <di:Reference URI="#VIF_P-735e11dc1c844072af5b">
+        <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>SoJjhcUNQi15ihOz5g9BkXcc3nRVZWQVVTB0sp18Amw=</di:DigestValue>
+      </di:Reference>
+    </Signature>
+  </PrimaryVehicle>
+</VectoOutputMultistep>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/exempted_primary_heavyBus.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/exempted_primary_heavyBus.RSLT_VIF.xml
new file mode 100644
index 0000000000..a66ef27ce6
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/exempted_primary_heavyBus.RSLT_VIF.xml
@@ -0,0 +1,60 @@
+<?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-f0a24dc4e3974190ade2" xsi:type="PrimaryVehicleDataType">
+      <Vehicle xsi:type="Exempted_VehicleVIFType">
+        <Manufacturer>Some Manufacturer</Manufacturer>
+        <ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
+        <Model>Sample Bus Model</Model>
+        <VIN>VEH-1234567890</VIN>
+        <Date>2020-01-09T11:00:00Z</Date>
+        <LegislativeCategory>M3</LegislativeCategory>
+        <ChassisConfiguration>Bus</ChassisConfiguration>
+        <AxleConfiguration>6x2</AxleConfiguration>
+        <Articulated>false</Articulated>
+        <TechnicalPermissibleMaximumLadenMass>15400</TechnicalPermissibleMaximumLadenMass>
+        <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
+        <SumNetPower unit="W">350000</SumNetPower>
+        <Technology>Fuel cell vehicle</Technology>
+      </Vehicle>
+      <InputDataSignature>
+        <di:Reference URI="#VEH-1234567890">
+          <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>0ohMh7nFSSwDsbcVOh4FXfKGbL9fSwxqZbS7UR+5r0Q=</di:DigestValue>
+        </di:Reference>
+      </InputDataSignature>
+      <ManufacturerRecordSignature>
+        <di:Reference URI="#MRF-0b392046493e4581b14e">
+          <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>qLP5GP9dl9KWcpHa2cJrqY6/jSeZ2kY02atQ0xaQRn4=</di:DigestValue>
+        </di:Reference>
+      </ManufacturerRecordSignature>
+      <Results>
+        <Status>success</Status>
+        <ExemptedVehicle />
+      </Results>
+      <ApplicationInformation>
+        <SimulationToolVersion>0.7.10.3035-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+        <Date>2023-04-24T07:12:51.4658509Z</Date>
+      </ApplicationInformation>
+    </Data>
+    <Signature>
+      <di:Reference URI="#VIF_P-f0a24dc4e3974190ade2">
+        <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>ba+DGNW1ojaKgUUk2Dy5tOHRPfx798dB7gjK/VI+8SQ=</di:DigestValue>
+      </di:Reference>
+    </Signature>
+  </PrimaryVehicle>
+</VectoOutputMultistep>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/primary_heavyBus group41_nonSmart.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/primary_heavyBus group41_nonSmart.RSLT_VIF.xml
new file mode 100644
index 0000000000..776d7d9037
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/CompletedBus/VIF/primary_heavyBus group41_nonSmart.RSLT_VIF.xml	
@@ -0,0 +1,531 @@
+<?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-4faa6d2da1f947808df9" xsi:type="PrimaryVehicleDataType">
+      <Vehicle xsi:type="ConventionalVehicleVIFType">
+        <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+        <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
+        <Model>Generic Model</Model>
+        <VIN>VEH-1234567890_nonSmart</VIN>
+        <Date>2017-02-15T11:00:00Z</Date>
+        <LegislativeCategory>M3</LegislativeCategory>
+        <ChassisConfiguration>Bus</ChassisConfiguration>
+        <AxleConfiguration>4x2</AxleConfiguration>
+        <Articulated>false</Articulated>
+        <TechnicalPermissibleMaximumLadenMass>28000</TechnicalPermissibleMaximumLadenMass>
+        <IdlingSpeed>700</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" />
+        </vif:TorqueLimits>
+        <Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
+          <Engine>
+            <Data xsi:type="EngineDataVIFType">
+              <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+              <Model>Generic primary bus 41 Engine</Model>
+              <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+              <Date>2017-02-15T11:00:00Z</Date>
+              <AppVersion>VectoEngine x.y</AppVersion>
+              <Displacement>7700</Displacement>
+              <RatedSpeed>2200</RatedSpeed>
+              <RatedPower>220000</RatedPower>
+              <MaxEngineTorque>1100</MaxEngineTorque>
+              <WHRType>
+                <MechanicalOutputICE>false</MechanicalOutputICE>
+                <MechanicalOutputDrivetrain>false</MechanicalOutputDrivetrain>
+                <ElectricalOutput>false</ElectricalOutput>
+              </WHRType>
+              <Mode>
+                <IdlingSpeed>700</IdlingSpeed>
+                <FullLoadAndDragCurve>
+                  <Entry engineSpeed="600.00" maxTorque="546.02" dragTorque="-39.66" />
+                  <Entry engineSpeed="800.00" maxTorque="760.78" dragTorque="-48.83" />
+                  <Entry engineSpeed="1000.00" maxTorque="973.29" dragTorque="-56.44" />
+                  <Entry engineSpeed="1200.00" maxTorque="1092.03" dragTorque="-67.29" />
+                  <Entry engineSpeed="1400.00" maxTorque="1092.03" dragTorque="-77.58" />
+                  <Entry engineSpeed="1600.00" maxTorque="1092.03" dragTorque="-87.88" />
+                  <Entry engineSpeed="1800.00" maxTorque="1022.52" dragTorque="-94.11" />
+                  <Entry engineSpeed="2000.00" maxTorque="944.17" dragTorque="-100.76" />
+                  <Entry engineSpeed="2200.00" maxTorque="868.12" dragTorque="-113.36" />
+                  <Entry engineSpeed="2400.00" maxTorque="741.99" dragTorque="-122.60" />
+                  <Entry engineSpeed="2500.00" maxTorque="647.29" dragTorque="-126.66" />
+                  <Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-132.07" />
+                </FullLoadAndDragCurve>
+                <Fuels>
+                  <FuelType>Diesel CI</FuelType>
+                </Fuels>
+              </Mode>
+            </Data>
+          </Engine>
+          <Transmission>
+            <Data xsi:type="TransmissionDataVIFType">
+              <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+              <Model>AT 6 Gear</Model>
+              <MainCertificationMethod>Standard values</MainCertificationMethod>
+              <Date>2017-01-11T11:00:00Z</Date>
+              <AppVersion>3.0.1</AppVersion>
+              <TransmissionType>APT-S</TransmissionType>
+              <Gears xsi:type="TransmissionGearsVIFType">
+                <Gear number="1">
+                  <Ratio>3.364</Ratio>
+                  <MaxTorque>1900</MaxTorque>
+                  <MaxSpeed>2500</MaxSpeed>
+                </Gear>
+                <Gear number="2">
+                  <Ratio>1.909</Ratio>
+                  <MaxTorque>1900</MaxTorque>
+                  <MaxSpeed>2500</MaxSpeed>
+                </Gear>
+                <Gear number="3">
+                  <Ratio>1.421</Ratio>
+                  <MaxSpeed>2500</MaxSpeed>
+                </Gear>
+                <Gear number="4">
+                  <Ratio>1.000</Ratio>
+                  <MaxSpeed>2500</MaxSpeed>
+                </Gear>
+                <Gear number="5">
+                  <Ratio>0.720</Ratio>
+                  <MaxSpeed>2500</MaxSpeed>
+                </Gear>
+                <Gear number="6">
+                  <Ratio>0.615</Ratio>
+                  <MaxSpeed>2500</MaxSpeed>
+                </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 Retarder Manufacturer</Manufacturer>
+              <Model>Generic Retarder</Model>
+              <CertificationMethod>Standard values</CertificationMethod>
+              <Date>2017-01-11T11:00:00Z</Date>
+              <AppVersion>3.0.1</AppVersion>
+              <RetarderRatio>1.000</RetarderRatio>
+            </Data>
+          </Retarder>
+          <Axlegear>
+            <Data xsi:type="AxlegearDataVIFType">
+              <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+              <Model>Generic primary bus 41 AxleGear</Model>
+              <CertificationMethod>Standard values</CertificationMethod>
+              <Date>2017-01-11T11:00:00Z</Date>
+              <AppVersion>3.0.1</AppVersion>
+              <LineType>Single portal axle</LineType>
+              <Ratio>6.500</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>
+                  <Tyre>
+                    <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+                      <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+                      <Model>Generic Wheel</Model>
+                      <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+                      <Date>2017-01-11T14:00:00Z</Date>
+                      <AppVersion>Tyre Generation App 1.0</AppVersion>
+                      <Dimension>315/70 R22.5</Dimension>
+                      <RRCDeclared>0.0055</RRCDeclared>
+                      <FzISO>31300</FzISO>
+                    </Data>
+                    <Signature>
+                      <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+                        <di:Transforms>
+                          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                        </di:Transforms>
+                        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                        <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+                      </di:Reference>
+                    </Signature>
+                  </Tyre>
+                </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>
+                  <Tyre>
+                    <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+                      <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+                      <Model>Generic Wheel</Model>
+                      <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+                      <Date>2017-01-11T14:00:00Z</Date>
+                      <AppVersion>Tyre Generation App 1.0</AppVersion>
+                      <Dimension>315/70 R22.5</Dimension>
+                      <RRCDeclared>0.0063</RRCDeclared>
+                      <FzISO>31300</FzISO>
+                    </Data>
+                    <Signature>
+                      <di:Reference URI="#WHL-5432198760-315-70-R22.5">
+                        <di:Transforms>
+                          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                        </di:Transforms>
+                        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                        <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+                      </di:Reference>
+                    </Signature>
+                  </Tyre>
+                </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>false</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_nonSmart">
+          <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>luEczSkAg1KESXrFotVZcSUXnabyxiEqNxtcdmJj0Mo=</di:DigestValue>
+        </di:Reference>
+      </InputDataSignature>
+      <ManufacturerRecordSignature>
+        <di:Reference URI="#MRF-8b4a1dd3da8140408cec">
+          <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>mpq9/0HM/O3oVI9VyFGEtYCg0H5Ur+VQpI7U+jZvqWs=</di:DigestValue>
+        </di:Reference>
+      </ManufacturerRecordSignature>
+      <Results>
+        <Status>success</Status>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">20.7</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">24.9</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">16.9</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">20.2</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13099</TotalVehicleMass>
+            <Payload unit="kg">1124</Payload>
+            <PassengerCount>16.52</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">14.8</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17593</TotalVehicleMass>
+            <Payload unit="kg">5618</Payload>
+            <PassengerCount>82.62</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">17.7</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13050</TotalVehicleMass>
+            <Payload unit="kg">1075</Payload>
+            <PassengerCount>15.15</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">12.9</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">15495</TotalVehicleMass>
+            <Payload unit="kg">3520</Payload>
+            <PassengerCount>49.57</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">14.2</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">21.9</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Heavy Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">26.6</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">17.8</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Urban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">21.6</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">13543</TotalVehicleMass>
+            <Payload unit="kg">1193</Payload>
+            <PassengerCount>17.55</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">15.5</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
+          <Mission>Suburban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">18317</TotalVehicleMass>
+            <Payload unit="kg">5967</Payload>
+            <PassengerCount>87.75</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">18.8</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14225</TotalVehicleMass>
+            <Payload unit="kg">1075</Payload>
+            <PassengerCount>15.15</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">13.0</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16670</TotalVehicleMass>
+            <Payload unit="kg">3520</Payload>
+            <PassengerCount>49.57</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">14.3</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14245</TotalVehicleMass>
+            <Payload unit="kg">1095</Payload>
+            <PassengerCount>15.42</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">11.2</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">15887</TotalVehicleMass>
+            <Payload unit="kg">2737</Payload>
+            <PassengerCount>38.56</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">11.7</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14663</TotalVehicleMass>
+            <Payload unit="kg">1263</Payload>
+            <PassengerCount>17.79</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">13.5</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Interurban</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">17609</TotalVehicleMass>
+            <Payload unit="kg">4209</Payload>
+            <PassengerCount>59.29</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">15.0</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">14747</TotalVehicleMass>
+            <Payload unit="kg">1347</Payload>
+            <PassengerCount>18.97</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">11.7</EnergyConsumption>
+          </Fuel>
+        </Result>
+        <Result status="success">
+          <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
+          <Mission>Coach</Mission>
+          <SimulationParameters>
+            <TotalVehicleMass unit="kg">16768</TotalVehicleMass>
+            <Payload unit="kg">3368</Payload>
+            <PassengerCount>47.43</PassengerCount>
+          </SimulationParameters>
+          <Fuel type="Diesel CI">
+            <EnergyConsumption unit="MJ/km">12.3</EnergyConsumption>
+          </Fuel>
+        </Result>
+      </Results>
+      <ApplicationInformation>
+        <SimulationToolVersion>0.7.10.3035-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+        <Date>2023-04-24T08:01:40.8874342Z</Date>
+      </ApplicationInformation>
+    </Data>
+    <Signature>
+      <di:Reference URI="#VIF_P-4faa6d2da1f947808df9">
+        <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>DSPjsdoJc8TUO7ToA+JIBGFAi3RZSuzA69nmldJORFk=</di:DigestValue>
+      </di:Reference>
+    </Signature>
+  </PrimaryVehicle>
+</VectoOutputMultistep>
\ No newline at end of file
-- 
GitLab