diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.8_Stage.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.8_Stage.xsd
index f271776933f2fb024bc792951d4e85e5af4de647..81d1c2a19408709c721609f86f782363ec667fe0 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.8_Stage.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.8_Stage.xsd
@@ -212,7 +212,7 @@
 							</xs:annotation>
 						</xs:element>
 					</xs:sequence>
-					<xs:element name="VehicleCode" type="v2.6:VehicleCodeType" minOccurs="0">
+					<xs:element name="BodyworkCode" type="v2.6:VehicleCodeType" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>P285 - enum</xs:documentation>
 						</xs:annotation>
@@ -305,7 +305,7 @@
 							</xs:annotation>
 						</xs:element>
 					</xs:sequence>
-					<xs:element name="VehicleCode" type="v2.6:VehicleCodeType" minOccurs="0">
+					<xs:element name="BodyworkCode" type="v2.6:VehicleCodeType" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>P285 - enum</xs:documentation>
 						</xs:annotation>
@@ -342,7 +342,7 @@
 							<xs:documentation>P291 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="DeclarationType" type="v2.8:DeclarationType">
+					<xs:element name="VehicleDeclarationType" type="v2.8:DeclarationType">
 						<xs:annotation>
 							<xs:documentation>P293 - enum</xs:documentation>
 						</xs:annotation>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
index c72fa12a942328e109907adfa7b2651320b225a1..236d97016cbc01d21dcc7e87f00523a98099ed3d 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
@@ -156,7 +156,7 @@
 										</xs:restriction>
 									</xs:simpleType>
 								</xs:element>
-								<xs:element name="AdBlueDosing" type="xs:boolean"/>
+								<xs:element name="SCRReagentDosing" type="xs:boolean"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_full-sample.xml
index ae9b7d0763c6e2d275ead4ed9afb8d582a8f3c78..9e20d2cd2d4e3791611918ac7b389c79169f1984 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_full-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType">
		<Manufacturer>Some Manufacturer</Manufacturer>
		<ManufacturerAddress>Infinite Loop</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model 2</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>7000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
		<ClassBus>A</ClassBus>
		<NumberPassengersLowerDeck>10</NumberPassengersLowerDeck>
		<NumberPassengersUpperDeck>20</NumberPassengersUpperDeck>
		<VehicleCode>CC</VehicleCode>
		<LowEntry>true</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>		
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType">
		<Manufacturer>Some Manufacturer</Manufacturer>
		<ManufacturerAddress>Infinite Loop</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model 2</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>7000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
		<ClassBus>A</ClassBus>
		<NumberPassengersLowerDeck>10</NumberPassengersLowerDeck>
		<NumberPassengersUpperDeck>20</NumberPassengersUpperDeck>
		<BodyworkCode>CC</BodyworkCode>
		<LowEntry>true</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>		
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
index 54bdbe61924334f95a20f8e21b59949f2555ec11..760dc95f4322428fb6ec82cbdab6d6269e20fcdd 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType">
		<Manufacturer>Some Manufacturer 1</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>7000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
		<VehicleCode>CC</VehicleCode>
		<LowEntry>false</LowEntry>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType">
		<Manufacturer>Some Manufacturer 1</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>7000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
		<BodyworkCode>CC</BodyworkCode>
		<LowEntry>false</LowEntry>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml
index f23b14a11d40438e7e8a224f52ccfdbf384d2f01..f25279872f26cf7943770073c9328044a93450ac 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType">
		<Manufacturer>Some Manufacturer</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>500</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
		<NgTankSystem>Compressed</NgTankSystem>
		<ClassBus>II+III</ClassBus>
		<NumberPassengersLowerDeck>0</NumberPassengersLowerDeck>
		<NumberPassengersUpperDeck>10</NumberPassengersUpperDeck>
		<VehicleCode>CB</VehicleCode>
		<LowEntry>false</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>9500</VehicleLength>
		<VehicleWidth>2500</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<DoorDriveTechnology>electric</DoorDriveTechnology>
		<DeclarationType>interim</DeclarationType>
		<ADAS>
			<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
			<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
			<v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop>
			<v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl>
			<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
			<AirDrag>
				<v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX23h">
					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
					<v2.0:Model>Generic Model</v2.0:Model>
					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<di:Transforms>
							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
						</di:Transforms>
						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
						<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
			<Auxiliaries>
				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
					<ElectricSystem>
						<LEDLights>
							<Interiorlights>false</Interiorlights>
							<Dayrunninglights>true</Dayrunninglights>
							<Positionlights>true</Positionlights>
							<Brakelights>true</Brakelights>
							<Headlights>false</Headlights>
						</LEDLights>		
					</ElectricSystem>
					<HVAC>
						<SystemConfiguration>0</SystemConfiguration>
						<HeatPumpTypeDriverCompartment>none</HeatPumpTypeDriverCompartment>
						<HeatPumpModeDriverCompartment>heating</HeatPumpModeDriverCompartment>
						<HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
						<HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
						<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
						<DoubleGlazing>false</DoubleGlazing>
						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
						<WaterElectricHeater>true</WaterElectricHeater>
						<AirElectricHeater>false</AirElectricHeater>
						<OtherHeatingTechnology>false</OtherHeatingTechnology>			
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType">
		<Manufacturer>Some Manufacturer</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>500</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
		<NgTankSystem>Compressed</NgTankSystem>
		<ClassBus>II+III</ClassBus>
		<NumberPassengersLowerDeck>0</NumberPassengersLowerDeck>
		<NumberPassengersUpperDeck>10</NumberPassengersUpperDeck>
		<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>
			<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
			<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
			<v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop>
			<v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl>
			<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
			<AirDrag>
				<v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX23h">
					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
					<v2.0:Model>Generic Model</v2.0:Model>
					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<di:Transforms>
							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
						</di:Transforms>
						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
						<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
			<Auxiliaries>
				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
					<ElectricSystem>
						<LEDLights>
							<Interiorlights>false</Interiorlights>
							<Dayrunninglights>true</Dayrunninglights>
							<Positionlights>true</Positionlights>
							<Brakelights>true</Brakelights>
							<Headlights>false</Headlights>
						</LEDLights>		
					</ElectricSystem>
					<HVAC>
						<SystemConfiguration>0</SystemConfiguration>
						<HeatPumpTypeDriverCompartment>none</HeatPumpTypeDriverCompartment>
						<HeatPumpModeDriverCompartment>heating</HeatPumpModeDriverCompartment>
						<HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
						<HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
						<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
						<DoubleGlazing>false</DoubleGlazing>
						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
						<WaterElectricHeater>true</WaterElectricHeater>
						<AirElectricHeater>false</AirElectricHeater>
						<OtherHeatingTechnology>false</OtherHeatingTechnology>			
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries01-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
index 54add4d6aaee63ea89b20ec5b889ff379f1862aa..b3026591ed53048a8944edba0570ffc82d1e7085 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType" >
		<Manufacturer>Some Manufacturer 1</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model 2</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>5000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
		<NgTankSystem>Compressed</NgTankSystem>
		<ClassBus>A</ClassBus>
		<VehicleCode>CG</VehicleCode>
		<LowEntry>true</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>10000</VehicleLength>
		<VehicleWidth>2600</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
		<DeclarationType>interim</DeclarationType>
		<ADAS>
			<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
			<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
			<v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop>
			<v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl>
			<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
			<Auxiliaries>
				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
					<ElectricSystem>
						<LEDLights>
							<Interiorlights>false</Interiorlights>
							<Dayrunninglights>true</Dayrunninglights>
							<Headlights>false</Headlights>
						</LEDLights>		
					</ElectricSystem>
					<HVAC>
						<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
						<DoubleGlazing>false</DoubleGlazing>
						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
						<WaterElectricHeater>true</WaterElectricHeater>
						<OtherHeatingTechnology>false</OtherHeatingTechnology>			
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType" >
		<Manufacturer>Some Manufacturer 1</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model 2</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>5000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
		<NgTankSystem>Compressed</NgTankSystem>
		<ClassBus>A</ClassBus>
		<BodyworkCode>CG</BodyworkCode>
		<LowEntry>true</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>10000</VehicleLength>
		<VehicleWidth>2600</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
		<VehicleDeclarationType>interim</VehicleDeclarationType>
		<ADAS>
			<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
			<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
			<v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop>
			<v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl>
			<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
			<Auxiliaries>
				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
					<ElectricSystem>
						<LEDLights>
							<Interiorlights>false</Interiorlights>
							<Dayrunninglights>true</Dayrunninglights>
							<Headlights>false</Headlights>
						</LEDLights>		
					</ElectricSystem>
					<HVAC>
						<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
						<DoubleGlazing>false</DoubleGlazing>
						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
						<WaterElectricHeater>true</WaterElectricHeater>
						<OtherHeatingTechnology>false</OtherHeatingTechnology>			
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries02-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
index e60dd8772c21d9df7bbe216485f3ed9b4cc34ba7..cad329802b1ffae72c19223bc767d985b729eb48 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType" >
		<Manufacturer>Some Manufacturer 2</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>500</CorrectedActualMass>
		<NgTankSystem>Compressed</NgTankSystem>
		<ClassBus>II+III</ClassBus>
		<NumberPassengersLowerDeck>0</NumberPassengersLowerDeck>
		<NumberPassengersUpperDeck>10</NumberPassengersUpperDeck>
		<VehicleCode>CB</VehicleCode>
		<LowEntry>false</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>9500</VehicleLength>
		<VehicleWidth>2500</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<DeclarationType>interim</DeclarationType>
		<ADAS>
			<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
			<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
			<v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop>
			<v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl>
			<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
			<AirDrag>
				<v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX23h">
					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
					<v2.0:Model>Generic Model</v2.0:Model>
					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<di:Transforms>
							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
						</di:Transforms>
						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
						<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
			<Auxiliaries>
				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
					<HVAC>
						<SystemConfiguration>0</SystemConfiguration>
						<HeatPumpTypeDriverCompartment>none</HeatPumpTypeDriverCompartment>
						<HeatPumpModeDriverCompartment>heating</HeatPumpModeDriverCompartment>
						<HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
						<HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType" >
		<Manufacturer>Some Manufacturer 2</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>500</CorrectedActualMass>
		<NgTankSystem>Compressed</NgTankSystem>
		<ClassBus>II+III</ClassBus>
		<NumberPassengersLowerDeck>0</NumberPassengersLowerDeck>
		<NumberPassengersUpperDeck>10</NumberPassengersUpperDeck>
		<BodyworkCode>CB</BodyworkCode>
		<LowEntry>false</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>9500</VehicleLength>
		<VehicleWidth>2500</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<VehicleDeclarationType>interim</VehicleDeclarationType>
		<ADAS>
			<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
			<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
			<v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop>
			<v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl>
			<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
			<AirDrag>
				<v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX23h">
					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
					<v2.0:Model>Generic Model</v2.0:Model>
					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<di:Transforms>
							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
						</di:Transforms>
						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
						<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
			<Auxiliaries>
				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
					<HVAC>
						<SystemConfiguration>0</SystemConfiguration>
						<HeatPumpTypeDriverCompartment>none</HeatPumpTypeDriverCompartment>
						<HeatPumpModeDriverCompartment>heating</HeatPumpModeDriverCompartment>
						<HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
						<HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_component_nullable_entries.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_component_nullable_entries.xml
index 69c612191fd4cb419ac4c09ed1637fd16d67fb33..ec1d438284847d84a0bf12aa02ec27c59667390f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_component_nullable_entries.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_component_nullable_entries.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType" >
		<Manufacturer>Some Manufacturer 4</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 4</ManufacturerAddress>
		<VIN>VEH-1234567894</VIN>
		<Date>2022-01-09T11:00:00Z</Date>
		<DeclarationType>interim</DeclarationType>
		<ADAS>
			<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
			<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
			<v2.3:EcoRollWithEngineStop>true</v2.3:EcoRollWithEngineStop>
			<v2.3:PredictiveCruiseControl>1,2,3</v2.3:PredictiveCruiseControl>
		</ADAS>
		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
			<Auxiliaries>
				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
					<ElectricSystem>
						<LEDLights>
						</LEDLights>
					</ElectricSystem>				
					<HVAC>
					</HVAC>
				</Data>			
			</Auxiliaries>			
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType" >
		<Manufacturer>Some Manufacturer 4</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 4</ManufacturerAddress>
		<VIN>VEH-1234567894</VIN>
		<Date>2022-01-09T11:00:00Z</Date>
		<VehicleDeclarationType>interim</VehicleDeclarationType>
		<ADAS>
			<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
			<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
			<v2.3:EcoRollWithEngineStop>true</v2.3:EcoRollWithEngineStop>
			<v2.3:PredictiveCruiseControl>1,2,3</v2.3:PredictiveCruiseControl>
		</ADAS>
		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
			<Auxiliaries>
				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
					<ElectricSystem>
						<LEDLights>
						</LEDLights>
					</ElectricSystem>				
					<HVAC>
					</HVAC>
				</Data>			
			</Auxiliaries>			
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_mandatory_entries.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_mandatory_entries.xml
index 16aa2395163f17567da08a18fb907df873b372e9..a86a6460eeb1f924f7612fcd8fd89f49505b6e8c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_mandatory_entries.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_mandatory_entries.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType" >
		<Manufacturer>Some Manufacturer 3</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<DeclarationType>final</DeclarationType>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType" >
		<Manufacturer>Some Manufacturer 3</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<VehicleDeclarationType>final</VehicleDeclarationType>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_mandatory_standard_value_airdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_mandatory_standard_value_airdrag.xml
index 1524bff892e127deebfa635fc197c031d8eec082..eeb7196376b99f9e9978f2775d0ea446849213ff 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_mandatory_standard_value_airdrag.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_mandatory_standard_value_airdrag.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType" >
		<Manufacturer>Some Manufacturer 3</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<DeclarationType>final</DeclarationType>
		<Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType">
			<v2.8:AirDrag>
				<v2.0:Data xsi:type="v2.8:AirDragModifiedUseStandardValueType" id="std"/>
				<v2.0:Signature>
					<di:Reference URI="#std">
						<di:Transforms>
							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
						</di:Transforms>
						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
						<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</v2.8:AirDrag>
			<Auxiliaries>
				<Data xsi:type="v2.8:CompletedVehicleAuxiliaryDataDeclarationType"></Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType" >
		<Manufacturer>Some Manufacturer 3</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<VehicleDeclarationType>final</VehicleDeclarationType>
		<Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType">
			<v2.8:AirDrag>
				<v2.0:Data xsi:type="v2.8:AirDragModifiedUseStandardValueType" id="std"/>
				<v2.0:Signature>
					<di:Reference URI="#std">
						<di:Transforms>
							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
						</di:Transforms>
						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
						<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</v2.8:AirDrag>
			<Auxiliaries>
				<Data xsi:type="v2.8:CompletedVehicleAuxiliaryDataDeclarationType"></Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_vif_input.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_vif_input.xml
index a30202d771c1661fa35888ac04e18172c0688ec5..79df6b5f74ea9180fde89bd78042b0e17691e9b3 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_vif_input.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_vif_input.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
			<v2.0:Vehicle xsi:type="InterimStageInputType" id="MSTG-3-Vehicle">
				<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
				<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
				<VIN>VEH-2234567866</VIN>
				<Date>2021-02-13T07:20:08.0187663Z</Date>
				<LegislativeCategory>M3</LegislativeCategory>				
				<TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>				
				<NgTankSystem>Liquefied</NgTankSystem>				
				<ClassBus>B</ClassBus>			
				<DeclarationType>interim</DeclarationType>
				<ADAS>
					<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
					<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
					<v2.3:EcoRollWithEngineStop>true</v2.3:EcoRollWithEngineStop>
					<v2.3:PredictiveCruiseControl>1,2</v2.3:PredictiveCruiseControl>
					<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
				</ADAS>				
				<Components xsi:type="CompletedVehicleComponentsDeclarationType">
					<Auxiliaries>
						<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
							<ElectricSystem>
								<LEDLights>
									<Positionlights>false</Positionlights>
									<Brakelights>false</Brakelights>
									<Headlights>true</Headlights>									
								</LEDLights>
							</ElectricSystem>
							<HVAC>
								<WaterElectricHeater>false</WaterElectricHeater>
								<AirElectricHeater>false</AirElectricHeater>
								<OtherHeatingTechnology>true</OtherHeatingTechnology>							
							</HVAC>
						</Data>
					</Auxiliaries>
				</Components>
			</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
			<v2.0:Vehicle xsi:type="InterimStageInputType" id="MSTG-3-Vehicle">
				<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
				<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
				<VIN>VEH-2234567866</VIN>
				<Date>2021-02-13T07:20:08.0187663Z</Date>
				<LegislativeCategory>M3</LegislativeCategory>				
				<TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>				
				<NgTankSystem>Liquefied</NgTankSystem>				
				<ClassBus>B</ClassBus>			
				<VehicleDeclarationType>interim</VehicleDeclarationType>
				<ADAS>
					<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
					<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
					<v2.3:EcoRollWithEngineStop>true</v2.3:EcoRollWithEngineStop>
					<v2.3:PredictiveCruiseControl>1,2</v2.3:PredictiveCruiseControl>
					<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
				</ADAS>				
				<Components xsi:type="CompletedVehicleComponentsDeclarationType">
					<Auxiliaries>
						<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
							<ElectricSystem>
								<LEDLights>
									<Positionlights>false</Positionlights>
									<Brakelights>false</Brakelights>
									<Headlights>true</Headlights>									
								</LEDLights>
							</ElectricSystem>
							<HVAC>
								<WaterElectricHeater>false</WaterElectricHeater>
								<AirElectricHeater>false</AirElectricHeater>
								<OtherHeatingTechnology>true</OtherHeatingTechnology>							
							</HVAC>
						</Data>
					</Auxiliaries>
				</Components>
			</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
index f0aaa02983f72e862a3d54323c9080c52c906e02..1fffb5a5b1b6442a3ca17e01fa9721a7a9d8f225 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
@@ -282,7 +282,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 								<SmartCompressionSystem>true</SmartCompressionSystem>
 								<SmartRegenerationSystem>false</SmartRegenerationSystem>
 								<AirsuspensionControl>electronically</AirsuspensionControl>
-								<AdBlueDosing>true</AdBlueDosing>
+								<SCRReagentDosing>true</SCRReagentDosing>
 							</PneumaticSystem>
 							<HVAC>
 								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
@@ -665,7 +665,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:VehicleLength>12000</v2.8:VehicleLength>
 				<v2.8:VehicleWidth>2500</v2.8:VehicleWidth>
 				<v2.8:EntranceHeight>2500</v2.8:EntranceHeight>
-				<v2.8:DeclarationType>interim</v2.8:DeclarationType>
+				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
 			</Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
@@ -701,9 +701,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:VIN>VEH-2234567890</v2.8:VIN>
 				<v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date>
 				<v2.8:CorrectedActualMass>15000</v2.8:CorrectedActualMass>				
-				<v2.8:VehicleCode>CB</v2.8:VehicleCode>
+				<v2.8:BodyworkCode>CB</v2.8:BodyworkCode>
 				<v2.8:DoorDriveTechnology>mixed</v2.8:DoorDriveTechnology>				
-				<v2.8:DeclarationType>interim</v2.8:DeclarationType>				
+				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>				
 				<v2.8:ADAS>
 					<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
 					<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
@@ -771,7 +771,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:TechnicalPermissibleMaximumLadenMass>20000</v2.8:TechnicalPermissibleMaximumLadenMass>				
 				<v2.8:NgTankSystem>Liquefied</v2.8:NgTankSystem>				
 				<v2.8:ClassBus>B</v2.8:ClassBus>			
-				<v2.8:DeclarationType>interim</v2.8:DeclarationType>
+				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
 				<v2.8:ADAS>
 					<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
 					<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
index 13eea87db70e3bbfd04501654b777f015fa90eac..d76c4eeb0891b44a6ee78e93e4b7036e36af36c0 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
@@ -283,7 +283,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 								<SmartCompressionSystem>true</SmartCompressionSystem>
 								<SmartRegenerationSystem>false</SmartRegenerationSystem>
 								<AirsuspensionControl>electronically</AirsuspensionControl>
-								<AdBlueDosing>true</AdBlueDosing>
+								<SCRReagentDosing>true</SCRReagentDosing>
 							</PneumaticSystem>
 							<HVAC>
 								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
@@ -665,7 +665,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:VehicleLength>12000</v2.8:VehicleLength>
 				<v2.8:VehicleWidth>2500</v2.8:VehicleWidth>
 				<v2.8:EntranceHeight>2500</v2.8:EntranceHeight>
-				<v2.8:DeclarationType>interim</v2.8:DeclarationType>
+				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
 				<v2.8:Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType">
 					<v2.8:Auxiliaries>
 						<v2.8:Data xsi:type="v2.8:CompletedVehicleAuxiliaryDataDeclarationType"/>
@@ -706,9 +706,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:VIN>VEH-2234567890</v2.8:VIN>
 				<v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date>
 				<v2.8:CorrectedActualMass>15000</v2.8:CorrectedActualMass>	
-				<v2.8:VehicleCode>CB</v2.8:VehicleCode>				
+				<v2.8:BodyworkCode>CB</v2.8:BodyworkCode>				
 				<v2.8:DoorDriveTechnology>mixed</v2.8:DoorDriveTechnology>				
-				<v2.8:DeclarationType>interim</v2.8:DeclarationType>				
+				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>				
 				<v2.8:ADAS>
 					<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
 					<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
@@ -776,7 +776,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:TechnicalPermissibleMaximumLadenMass>20000</v2.8:TechnicalPermissibleMaximumLadenMass>
 				<v2.8:NgTankSystem>Liquefied</v2.8:NgTankSystem>				
 				<v2.8:ClassBus>B</v2.8:ClassBus>			
-				<v2.8:DeclarationType>interim</v2.8:DeclarationType>
+				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
 				<v2.8:ADAS>
 					<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
 					<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
index f5b88deccd7263ba525c1f93a443998eba55b063..f2396ee035d69295929e2d37a3200f433102651d 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
@@ -282,7 +282,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 								<SmartCompressionSystem>true</SmartCompressionSystem>
 								<SmartRegenerationSystem>false</SmartRegenerationSystem>
 								<AirsuspensionControl>electronically</AirsuspensionControl>
-								<AdBlueDosing>true</AdBlueDosing>
+								<SCRReagentDosing>true</SCRReagentDosing>
 							</PneumaticSystem>
 							<HVAC>
 								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
@@ -665,7 +665,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:VehicleLength>12000</v2.8:VehicleLength>
 				<v2.8:VehicleWidth>2500</v2.8:VehicleWidth>
 				<v2.8:EntranceHeight>2500</v2.8:EntranceHeight>
-				<v2.8:DeclarationType>interim</v2.8:DeclarationType>
+				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
 				<v2.8:Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType">
 					<v2.8:AirDrag>
 						<v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX24h">
@@ -729,9 +729,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date>
 				<v2.8:CorrectedActualMass>15000</v2.8:CorrectedActualMass>	
 				<v2.8:AirdragModifiedMultistage>false</v2.8:AirdragModifiedMultistage>
-				<v2.8:VehicleCode>CB</v2.8:VehicleCode>
+				<v2.8:BodyworkCode>CB</v2.8:BodyworkCode>
 				<v2.8:DoorDriveTechnology>mixed</v2.8:DoorDriveTechnology>				
-				<v2.8:DeclarationType>interim</v2.8:DeclarationType>				
+				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>				
 				<v2.8:ADAS>
 					<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
 					<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
@@ -800,7 +800,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:AirdragModifiedMultistage>false</v2.8:AirdragModifiedMultistage>
 				<v2.8:NgTankSystem>Liquefied</v2.8:NgTankSystem>				
 				<v2.8:ClassBus>B</v2.8:ClassBus>			
-				<v2.8:DeclarationType>interim</v2.8:DeclarationType>
+				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
 				<v2.8:ADAS>
 					<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
 					<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
index 6be0347de82dfb3dd9955f8c05e76ff82d60ff08..a8e07ea0a640a9974e91ef6c0a2fdcd6b7722ac2 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
@@ -282,7 +282,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 								<SmartCompressionSystem>true</SmartCompressionSystem>
 								<SmartRegenerationSystem>false</SmartRegenerationSystem>
 								<AirsuspensionControl>electronically</AirsuspensionControl>
-								<AdBlueDosing>true</AdBlueDosing>
+								<SCRReagentDosing>true</SCRReagentDosing>
 							</PneumaticSystem>
 							<HVAC>
 								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
@@ -665,7 +665,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:VehicleLength>12000</v2.8:VehicleLength>
 				<v2.8:VehicleWidth>2500</v2.8:VehicleWidth>
 				<v2.8:EntranceHeight>2500</v2.8:EntranceHeight>
-				<v2.8:DeclarationType>interim</v2.8:DeclarationType>
+				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
 			</Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
@@ -701,9 +701,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:VIN>VEH-2234567890</v2.8:VIN>
 				<v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date>
 				<v2.8:CorrectedActualMass>15000</v2.8:CorrectedActualMass>	
-				<v2.8:VehicleCode>CB</v2.8:VehicleCode>
+				<v2.8:BodyworkCode>CB</v2.8:BodyworkCode>
 				<v2.8:DoorDriveTechnology>mixed</v2.8:DoorDriveTechnology>				
-				<v2.8:DeclarationType>interim</v2.8:DeclarationType>				
+				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>				
 				<v2.8:ADAS>
 					<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
 					<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
@@ -771,7 +771,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:TechnicalPermissibleMaximumLadenMass>20000</v2.8:TechnicalPermissibleMaximumLadenMass>
 				<v2.8:NgTankSystem>Liquefied</v2.8:NgTankSystem>				
 				<v2.8:ClassBus>B</v2.8:ClassBus>			
-				<v2.8:DeclarationType>interim</v2.8:DeclarationType>
+				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
 				<v2.8:ADAS>
 					<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
 					<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
index 93457a8d6addf92e60af3dad434c36eb93a21ddf..27cf5564fb4a2099856ee41dbb5237ca1ed8f806 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
@@ -282,7 +282,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 								<SmartCompressionSystem>true</SmartCompressionSystem>
 								<SmartRegenerationSystem>false</SmartRegenerationSystem>
 								<AirsuspensionControl>electronically</AirsuspensionControl>
-								<AdBlueDosing>true</AdBlueDosing>
+								<SCRReagentDosing>true</SCRReagentDosing>
 							</PneumaticSystem>
 							<HVAC>
 								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
@@ -665,7 +665,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:VehicleLength>12000</v2.8:VehicleLength>
 				<v2.8:VehicleWidth>2500</v2.8:VehicleWidth>
 				<v2.8:EntranceHeight>2500</v2.8:EntranceHeight>
-				<v2.8:DeclarationType>interim</v2.8:DeclarationType>
+				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
 			</Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
@@ -701,9 +701,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:VIN>VEH-2234567890</v2.8:VIN>
 				<v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date>
 				<v2.8:CorrectedActualMass>15000</v2.8:CorrectedActualMass>				
-				<v2.8:VehicleCode>CB</v2.8:VehicleCode>
+				<v2.8:BodyworkCode>CB</v2.8:BodyworkCode>
 				<v2.8:DoorDriveTechnology>mixed</v2.8:DoorDriveTechnology>				
-				<v2.8:DeclarationType>interim</v2.8:DeclarationType>				
+				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>				
 				<v2.8:ADAS>
 					<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
 					<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
@@ -771,7 +771,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:TechnicalPermissibleMaximumLadenMass>20000</v2.8:TechnicalPermissibleMaximumLadenMass>				
 				<v2.8:NgTankSystem>Liquefied</v2.8:NgTankSystem>				
 				<v2.8:ClassBus>B</v2.8:ClassBus>			
-				<v2.8:DeclarationType>interim</v2.8:DeclarationType>
+				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
 				<v2.8:ADAS>
 					<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
 					<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
index 4ce2ada997a1c8f0e4fcadcf3af2ea7895cc6be7..131bb91001895044de048e16255be12924ef728b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
@@ -282,7 +282,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 								<SmartCompressionSystem>true</SmartCompressionSystem>
 								<SmartRegenerationSystem>false</SmartRegenerationSystem>
 								<AirsuspensionControl>electronically</AirsuspensionControl>
-								<AdBlueDosing>true</AdBlueDosing>
+								<SCRReagentDosing>true</SCRReagentDosing>
 							</PneumaticSystem>
 							<HVAC>
 								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
@@ -665,7 +665,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:VehicleLength>12000</v2.8:VehicleLength>
 				<v2.8:VehicleWidth>2500</v2.8:VehicleWidth>
 				<v2.8:EntranceHeight>2500</v2.8:EntranceHeight>
-				<v2.8:DeclarationType>interim</v2.8:DeclarationType>
+				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
 			</Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
@@ -701,9 +701,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:VIN>VEH-2234567890</v2.8:VIN>
 				<v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date>
 				<v2.8:CorrectedActualMass>15000</v2.8:CorrectedActualMass>				
-				<v2.8:VehicleCode>CB</v2.8:VehicleCode>
+				<v2.8:BodyworkCode>CB</v2.8:BodyworkCode>
 				<v2.8:DoorDriveTechnology>mixed</v2.8:DoorDriveTechnology>				
-				<v2.8:DeclarationType>interim</v2.8:DeclarationType>				
+				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>				
 				<v2.8:ADAS>
 					<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
 					<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
index 9ef86eac61ce7408fd7196aaaca15d4f5df37166..2f6323f50e5a610fe8bd30693586dbe38d60bc98 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
@@ -282,7 +282,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 								<SmartCompressionSystem>true</SmartCompressionSystem>
 								<SmartRegenerationSystem>false</SmartRegenerationSystem>
 								<AirsuspensionControl>electronically</AirsuspensionControl>
-								<AdBlueDosing>true</AdBlueDosing>
+								<SCRReagentDosing>true</SCRReagentDosing>
 							</PneumaticSystem>
 							<HVAC>
 								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
@@ -656,7 +656,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:ManufacturerAddress>Intermediate Manufacturer Address 1</v2.8:ManufacturerAddress>
 				<v2.8:VIN>VEH-1234567890</v2.8:VIN>
 				<v2.8:Date>2018-02-15T11:00:00Z</v2.8:Date>
-				<v2.8:DeclarationType>interim</v2.8:DeclarationType>
+				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
 				<v2.8:Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType">
 					<v2.8:Auxiliaries>
 						<v2.8:Data xsi:type="v2.8:CompletedVehicleAuxiliaryDataDeclarationType"/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
index 912eaeaeaa711ce1aca6414201bc91511a76b777..bdcfaae4c466b748015ca63fa9d195aaf8e52136 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
@@ -282,7 +282,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 								<SmartCompressionSystem>true</SmartCompressionSystem>
 								<SmartRegenerationSystem>false</SmartRegenerationSystem>
 								<AirsuspensionControl>electronically</AirsuspensionControl>
-								<AdBlueDosing>true</AdBlueDosing>
+								<SCRReagentDosing>true</SCRReagentDosing>
 							</PneumaticSystem>
 							<HVAC>
 								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
@@ -665,7 +665,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:VehicleLength>12000</v2.8:VehicleLength>
 				<v2.8:VehicleWidth>2500</v2.8:VehicleWidth>
 				<v2.8:EntranceHeight>2500</v2.8:EntranceHeight>
-				<v2.8:DeclarationType>interim</v2.8:DeclarationType>
+				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
 			</Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
@@ -702,9 +702,9 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date>
 				<v2.8:CorrectedActualMass>15000</v2.8:CorrectedActualMass>	
 				<v2.8:AirdragModifiedMultistage>false</v2.8:AirdragModifiedMultistage>
-				<v2.8:VehicleCode>CB</v2.8:VehicleCode>
+				<v2.8:BodyworkCode>CB</v2.8:BodyworkCode>
 				<v2.8:DoorDriveTechnology>mixed</v2.8:DoorDriveTechnology>				
-				<v2.8:DeclarationType>interim</v2.8:DeclarationType>				
+				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>				
 				<v2.8:ADAS>
 					<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
 					<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
index 38d53728658bb666937642610a4cebdc7de3bfdb..86421ddc5828cbdf881f8dcd894e81381fcb8cb7 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
	<PrimaryVehicle>
		<Data id="text" xsi:type="PrimaryVehicleDataType">
			<Vehicle xsi:type="VehiclePIFType">
				<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
				<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
				<Model>Generic Model</Model>
				<VIN>VEH-1234567890_nonSmart-ESS</VIN>
				<Date>2017-02-15T11:00:00Z</Date>
				<VehicleCategory>Bus</VehicleCategory>
				<AxleConfiguration>8x2</AxleConfiguration>
				<Articulated>true</Articulated>
				<TechnicalPermissibleMaximumLadenMass>4000</TechnicalPermissibleMaximumLadenMass>
				<IdlingSpeed>600</IdlingSpeed>
				<RetarderType>Transmission Output Retarder</RetarderType>
				<RetarderRatio>1.000</RetarderRatio>
				<AngledriveType>None</AngledriveType>
				<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
				<ADAS xsi:type="v2.3:AdvancedDriverAssistantSystemsType">
					<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
					<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
					<v2.3:EcoRollWithEngineStop>true</v2.3:EcoRollWithEngineStop>
					<v2.3:PredictiveCruiseControl>1,2,3</v2.3:PredictiveCruiseControl>
					<v2.3:APTEcoRollReleaseLockupClutch>false</v2.3:APTEcoRollReleaseLockupClutch>
				</ADAS>
				<TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
					<tcl:Entry gear="6" maxTorque="1800"/>
					<tcl:Entry gear="1" maxTorque="2500"/>
					<tcl:Entry gear="12" maxTorque="1900"/>
				</TorqueLimits>
				<Components xsi:type="VehicleComponentsPIFType">
					<Engine>
						<Data xsi:type="EngineDataPIFType">
							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
							<Model>Bus 6x2</Model>
							<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
							<Date>2017-02-15T11:00:00Z</Date>
							<AppVersion>VectoEngine x.y</AppVersion>
							<Displacement>12730</Displacement>
							<RatedSpeed>1800</RatedSpeed>
							<RatedPower>325032</RatedPower>
							<MaxEngineTorque>2134</MaxEngineTorque>
							<WHRType>
								<v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
								<v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
								<v2.3:ElectricalOutput>true</v2.3:ElectricalOutput>
							</WHRType>
							<Mode>
								<IdlingSpeed>600</IdlingSpeed>
								<FullLoadAndDragCurve>
									<Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00"/>
									<Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00"/>
									<Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00"/>
									<Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00"/>
									<Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00"/>
									<Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00"/>
									<Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00"/>
									<Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00"/>
									<Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00"/>
									<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00"/>
								</FullLoadAndDragCurve>
								<Fuels>
									<FuelType>Diesel CI</FuelType>
								</Fuels>
							</Mode>
						</Data>
					</Engine>
					<Transmission>
						<Data xsi:type="TransmissionDataPIFType">
							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
							<Model>Generic 40t Long Haul Truck Gearbox</Model>
							<MainCertificationMethod>Standard values</MainCertificationMethod>
							<CertificationNumber>Trans-5464sdf6sdf555</CertificationNumber>
							<Date>2017-01-11T11:00:00Z</Date>
							<AppVersion>3.0.1</AppVersion>
							<TransmissionType>AMT</TransmissionType>
							<Gears xsi:type="TransmissionGearsPIFType">
								<Gear number="1">
									<Ratio>14.930</Ratio>
									<MaxTorque>1900</MaxTorque>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="2">
									<Ratio>11.640</Ratio>
									<MaxTorque>1900</MaxTorque>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="3">
									<Ratio>9.020</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="4">
									<Ratio>7.040</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="5">
									<Ratio>5.640</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="6">
									<Ratio>4.400</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="7">
									<Ratio>3.390</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="8">
									<Ratio>2.650</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="9">
									<Ratio>2.050</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="10">
									<Ratio>1.600</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="11">
									<Ratio>1.280</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="12">
									<Ratio>1.000</Ratio>
								</Gear>
							</Gears>
						</Data>
					</Transmission>
					<TorqueConverter>
						<Data xsi:type="TorqueConverterDataPIFType">
							<Manufacturer>Generic Torque Converter</Manufacturer>
							<Model>Generic Torque Converter Model</Model>
							<CertificationMethod>Standard values</CertificationMethod>
							<CertificationNumber>Torq-4546565455</CertificationNumber>
							<Date>2018-01-12T12:00:00Z</Date>
							<AppVersion>3.0.3</AppVersion>
							<Characteristics>
								<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
								<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
								<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
							</Characteristics>
						</Data>
					</TorqueConverter>
					<Angledrive>
						<Data xsi:type="AngledriveDataPIFType">
							<Manufacturer>Generic Angledrive</Manufacturer>
							<Model>Generic Angledrive Model</Model>
							<CertificationMethod>Standard values</CertificationMethod>
							<CertificationNumber>ANG-Z64665456654</CertificationNumber>
							<Date>2019-01-12T12:00:00Z</Date>
							<AppVersion>3.2.3</AppVersion>
							<Ratio>20</Ratio>
						</Data>
					</Angledrive>
					<Axlegear>
						<Data xsi:type="AxlegearDataPIFType">
							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
							<Model>Generic 40t Long Haul Truck AxleGear</Model>
							<CertificationMethod>Standard values</CertificationMethod>
							<CertificationNumber>AX-6654888s5f4</CertificationNumber>
							<Date>2017-01-11T11:00:00Z</Date>
							<AppVersion>3.0.1</AppVersion>
							<LineType>Single portal axle</LineType>
							<Ratio>2.590</Ratio>
						</Data>
					</Axlegear>
					<AxleWheels>
						<Data xsi:type="AxleWheelsDataPIFType">
							<Axles>
								<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
									<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
									<v2.0:TwinTyres>false</v2.0:TwinTyres>
									<v2.0:Steered>true</v2.0:Steered>
									<v2.0:Tyre>
										<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
											<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
											<v2.0:Model>Generic Wheel</v2.0:Model>
											<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
											<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
											<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
											<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
											<v2.0:RRCDeclared>0.0055</v2.0:RRCDeclared>
											<v2.0:FzISO>31300</v2.0:FzISO>
										</v2.0:Data>
										<v2.0:Signature>
											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
												<di:Transforms>
													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
												</di:Transforms>
												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
												<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
											</di:Reference>
										</v2.0:Signature>
									</v2.0:Tyre>
								</Axle>
								<Axle axleNumber="2" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
									<v2.0:AxleType>VehicleDriven</v2.0:AxleType>
									<v2.0:TwinTyres>true</v2.0:TwinTyres>
									<v2.0:Steered>false</v2.0:Steered>
									<v2.0:Tyre>
										<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
											<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
											<v2.0:Model>Generic Wheel</v2.0:Model>
											<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
											<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
											<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
											<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
											<v2.0:RRCDeclared>0.0063</v2.0:RRCDeclared>
											<v2.0:FzISO>31300</v2.0:FzISO>
										</v2.0:Data>
										<v2.0:Signature>
											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
												<di:Transforms>
													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
												</di:Transforms>
												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
												<di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
											</di:Reference>
										</v2.0:Signature>
									</v2.0:Tyre>
								</Axle>
								<Axle axleNumber="3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
									<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
									<v2.0:TwinTyres>false</v2.0:TwinTyres>
									<v2.0:Steered>false</v2.0:Steered>
									<v2.0:Tyre>
										<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
											<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
											<v2.0:Model>Generic Wheel</v2.0:Model>
											<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
											<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
											<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
											<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
											<v2.0:RRCDeclared>0.0055</v2.0:RRCDeclared>
											<v2.0:FzISO>31300</v2.0:FzISO>
										</v2.0:Data>
										<v2.0:Signature>
											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
												<di:Transforms>
													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
												</di:Transforms>
												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
												<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
											</di:Reference>
										</v2.0:Signature>
									</v2.0:Tyre>
								</Axle>
							</Axles>
						</Data>
					</AxleWheels>
					<Auxiliaries>
						<Data xsi:type="AuxiliaryDataPIFType">
							<Fan>
								<Technology>Hydraulic driven - Constant displacement pump</Technology>
							</Fan>
							<SteeringPump>
								<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
							</SteeringPump>
							<ElectricSystem>
								<AlternatorTechnology>default</AlternatorTechnology>
								<SmartElectrics>true</SmartElectrics>
								<MaxAlternatorPower>15000</MaxAlternatorPower>
								<ElectricStorageCapacity>50</ElectricStorageCapacity>
							</ElectricSystem>
							<PneumaticSystem>
								<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
								<Clutch>none</Clutch>
								<CompressorRatio>1.000</CompressorRatio>
								<SmartCompressionSystem>true</SmartCompressionSystem>
								<SmartRegenerationSystem>false</SmartRegenerationSystem>
								<AirsuspensionControl>electronically</AirsuspensionControl>
								<AdBlueDosing>true</AdBlueDosing>
							</PneumaticSystem>
							<HVAC>
								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
								<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
							</HVAC>
						</Data>
					</Auxiliaries>
				</Components>
			</Vehicle>
			<InputDataSignature>
				<di:Reference URI="#VEH-PrimaryBus_SmartPS">
					<di:Transforms>
						<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
						<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
					</di:Transforms>
					<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
					<di:DigestValue>uqcFIXtDYxvl513ruiYYJCrV1fIiyw37t8vJhg4xxoo=</di:DigestValue>
				</di:Reference>
			</InputDataSignature>
			<ManufacturerRecordSignature>
				<di:Reference URI="#RESULT-5f30c7fe665a47938f6b">
					<di:Transforms>
						<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
						<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
					</di:Transforms>
					<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
					<di:DigestValue>KUpFCKh1bu/YPwYj36kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
				</di:Reference>
			</ManufacturerRecordSignature>
			<Results>
				<Status>success</Status>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
						<Payload unit="kg">1352.52</Payload>
						<PassengerCount>19.89</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">21.22359</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1555.73</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
						<Payload unit="kg">6762.60</Payload>
						<PassengerCount>99.45</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">25.40945</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1862.57</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
						<Payload unit="kg">1352.52</Payload>
						<PassengerCount>19.89</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">16.74101</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1227.15</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
						<Payload unit="kg">6762.60</Payload>
						<PassengerCount>99.45</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">20.24221</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1483.80</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
						<Payload unit="kg">1352.52</Payload>
						<PassengerCount>19.89</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">14.34578</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1051.58</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
						<Payload unit="kg">6762.60</Payload>
						<PassengerCount>99.45</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">17.60016</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1290.13</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
						<Payload unit="kg">1294.51</Payload>
						<PassengerCount>18.23</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">11.82313</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">866.66</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
						<Payload unit="kg">4236.57</Payload>
						<PassengerCount>59.67</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">13.24283</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">970.73</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
						<Payload unit="kg">1578.29</Payload>
						<PassengerCount>23.21</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">22.72091</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1665.49</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
						<Payload unit="kg">7891.43</Payload>
						<PassengerCount>116.05</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">27.95930</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">2049.48</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
						<Payload unit="kg">1578.29</Payload>
						<PassengerCount>23.21</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">17.90756</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1312.66</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
						<Payload unit="kg">7891.43</Payload>
						<PassengerCount>116.05</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">22.23796</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1630.09</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
						<Payload unit="kg">1578.29</Payload>
						<PassengerCount>23.21</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">15.28035</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1120.08</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
						<Payload unit="kg">7891.43</Payload>
						<PassengerCount>116.05</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">19.26201</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1411.95</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16467.68</TotalVehicleMass>
						<Payload unit="kg">1254.68</Payload>
						<PassengerCount>17.67</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">11.93701</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">875.01</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
						<Payload unit="kg">4106.21</Payload>
						<PassengerCount>57.83</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">13.32341</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">976.63</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16490.49</TotalVehicleMass>
						<Payload unit="kg">1277.49</Payload>
						<PassengerCount>17.99</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">8.71847</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">639.08</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">18406.72</TotalVehicleMass>
						<Payload unit="kg">3193.72</Payload>
						<PassengerCount>44.98</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">9.20255</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">674.57</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">19588.08</TotalVehicleMass>
						<Payload unit="kg">1738.08</Payload>
						<PassengerCount>24.48</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">13.58335</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">995.69</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
						<Payload unit="kg">5793.60</Payload>
						<PassengerCount>81.60</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">15.56740</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1141.12</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">19703.95</TotalVehicleMass>
						<Payload unit="kg">1853.95</Payload>
						<PassengerCount>26.11</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">9.82937</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">720.51</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22484.88</TotalVehicleMass>
						<Payload unit="kg">4634.88</Payload>
						<PassengerCount>65.28</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">10.56728</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">774.60</CO2>
				</Result>
			</Results>
			<ApplicationInformation>
				<SimulationToolVersion>String</SimulationToolVersion>
				<Date>2017-01-01T00:00:00Z</Date>
			</ApplicationInformation>
		</Data>
		<Signature>
			<di:Reference URI="#PIF-d10aff76c5d149948046">
				<di:Transforms>
					<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
					<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
				</di:Transforms>
				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
			</di:Reference>
		</Signature>
	</PrimaryVehicle>
</VectoOutputMultistage>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
	<PrimaryVehicle>
		<Data id="text" xsi:type="PrimaryVehicleDataType">
			<Vehicle xsi:type="VehiclePIFType">
				<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
				<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
				<Model>Generic Model</Model>
				<VIN>VEH-1234567890_nonSmart-ESS</VIN>
				<Date>2017-02-15T11:00:00Z</Date>
				<VehicleCategory>Bus</VehicleCategory>
				<AxleConfiguration>8x2</AxleConfiguration>
				<Articulated>true</Articulated>
				<TechnicalPermissibleMaximumLadenMass>4000</TechnicalPermissibleMaximumLadenMass>
				<IdlingSpeed>600</IdlingSpeed>
				<RetarderType>Transmission Output Retarder</RetarderType>
				<RetarderRatio>1.000</RetarderRatio>
				<AngledriveType>None</AngledriveType>
				<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
				<ADAS xsi:type="v2.3:AdvancedDriverAssistantSystemsType">
					<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
					<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
					<v2.3:EcoRollWithEngineStop>true</v2.3:EcoRollWithEngineStop>
					<v2.3:PredictiveCruiseControl>1,2,3</v2.3:PredictiveCruiseControl>
					<v2.3:APTEcoRollReleaseLockupClutch>false</v2.3:APTEcoRollReleaseLockupClutch>
				</ADAS>
				<TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
					<tcl:Entry gear="6" maxTorque="1800"/>
					<tcl:Entry gear="1" maxTorque="2500"/>
					<tcl:Entry gear="12" maxTorque="1900"/>
				</TorqueLimits>
				<Components xsi:type="VehicleComponentsPIFType">
					<Engine>
						<Data xsi:type="EngineDataPIFType">
							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
							<Model>Bus 6x2</Model>
							<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
							<Date>2017-02-15T11:00:00Z</Date>
							<AppVersion>VectoEngine x.y</AppVersion>
							<Displacement>12730</Displacement>
							<RatedSpeed>1800</RatedSpeed>
							<RatedPower>325032</RatedPower>
							<MaxEngineTorque>2134</MaxEngineTorque>
							<WHRType>
								<v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
								<v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
								<v2.3:ElectricalOutput>true</v2.3:ElectricalOutput>
							</WHRType>
							<Mode>
								<IdlingSpeed>600</IdlingSpeed>
								<FullLoadAndDragCurve>
									<Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00"/>
									<Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00"/>
									<Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00"/>
									<Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00"/>
									<Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00"/>
									<Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00"/>
									<Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00"/>
									<Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00"/>
									<Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00"/>
									<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00"/>
								</FullLoadAndDragCurve>
								<Fuels>
									<FuelType>Diesel CI</FuelType>
								</Fuels>
							</Mode>
						</Data>
					</Engine>
					<Transmission>
						<Data xsi:type="TransmissionDataPIFType">
							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
							<Model>Generic 40t Long Haul Truck Gearbox</Model>
							<MainCertificationMethod>Standard values</MainCertificationMethod>
							<CertificationNumber>Trans-5464sdf6sdf555</CertificationNumber>
							<Date>2017-01-11T11:00:00Z</Date>
							<AppVersion>3.0.1</AppVersion>
							<TransmissionType>AMT</TransmissionType>
							<Gears xsi:type="TransmissionGearsPIFType">
								<Gear number="1">
									<Ratio>14.930</Ratio>
									<MaxTorque>1900</MaxTorque>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="2">
									<Ratio>11.640</Ratio>
									<MaxTorque>1900</MaxTorque>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="3">
									<Ratio>9.020</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="4">
									<Ratio>7.040</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="5">
									<Ratio>5.640</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="6">
									<Ratio>4.400</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="7">
									<Ratio>3.390</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="8">
									<Ratio>2.650</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="9">
									<Ratio>2.050</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="10">
									<Ratio>1.600</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="11">
									<Ratio>1.280</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="12">
									<Ratio>1.000</Ratio>
								</Gear>
							</Gears>
						</Data>
					</Transmission>
					<TorqueConverter>
						<Data xsi:type="TorqueConverterDataPIFType">
							<Manufacturer>Generic Torque Converter</Manufacturer>
							<Model>Generic Torque Converter Model</Model>
							<CertificationMethod>Standard values</CertificationMethod>
							<CertificationNumber>Torq-4546565455</CertificationNumber>
							<Date>2018-01-12T12:00:00Z</Date>
							<AppVersion>3.0.3</AppVersion>
							<Characteristics>
								<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
								<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
								<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
							</Characteristics>
						</Data>
					</TorqueConverter>
					<Angledrive>
						<Data xsi:type="AngledriveDataPIFType">
							<Manufacturer>Generic Angledrive</Manufacturer>
							<Model>Generic Angledrive Model</Model>
							<CertificationMethod>Standard values</CertificationMethod>
							<CertificationNumber>ANG-Z64665456654</CertificationNumber>
							<Date>2019-01-12T12:00:00Z</Date>
							<AppVersion>3.2.3</AppVersion>
							<Ratio>20</Ratio>
						</Data>
					</Angledrive>
					<Axlegear>
						<Data xsi:type="AxlegearDataPIFType">
							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
							<Model>Generic 40t Long Haul Truck AxleGear</Model>
							<CertificationMethod>Standard values</CertificationMethod>
							<CertificationNumber>AX-6654888s5f4</CertificationNumber>
							<Date>2017-01-11T11:00:00Z</Date>
							<AppVersion>3.0.1</AppVersion>
							<LineType>Single portal axle</LineType>
							<Ratio>2.590</Ratio>
						</Data>
					</Axlegear>
					<AxleWheels>
						<Data xsi:type="AxleWheelsDataPIFType">
							<Axles>
								<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
									<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
									<v2.0:TwinTyres>false</v2.0:TwinTyres>
									<v2.0:Steered>true</v2.0:Steered>
									<v2.0:Tyre>
										<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
											<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
											<v2.0:Model>Generic Wheel</v2.0:Model>
											<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
											<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
											<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
											<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
											<v2.0:RRCDeclared>0.0055</v2.0:RRCDeclared>
											<v2.0:FzISO>31300</v2.0:FzISO>
										</v2.0:Data>
										<v2.0:Signature>
											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
												<di:Transforms>
													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
												</di:Transforms>
												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
												<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
											</di:Reference>
										</v2.0:Signature>
									</v2.0:Tyre>
								</Axle>
								<Axle axleNumber="2" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
									<v2.0:AxleType>VehicleDriven</v2.0:AxleType>
									<v2.0:TwinTyres>true</v2.0:TwinTyres>
									<v2.0:Steered>false</v2.0:Steered>
									<v2.0:Tyre>
										<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
											<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
											<v2.0:Model>Generic Wheel</v2.0:Model>
											<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
											<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
											<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
											<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
											<v2.0:RRCDeclared>0.0063</v2.0:RRCDeclared>
											<v2.0:FzISO>31300</v2.0:FzISO>
										</v2.0:Data>
										<v2.0:Signature>
											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
												<di:Transforms>
													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
												</di:Transforms>
												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
												<di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
											</di:Reference>
										</v2.0:Signature>
									</v2.0:Tyre>
								</Axle>
								<Axle axleNumber="3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
									<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
									<v2.0:TwinTyres>false</v2.0:TwinTyres>
									<v2.0:Steered>false</v2.0:Steered>
									<v2.0:Tyre>
										<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
											<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
											<v2.0:Model>Generic Wheel</v2.0:Model>
											<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
											<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
											<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
											<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
											<v2.0:RRCDeclared>0.0055</v2.0:RRCDeclared>
											<v2.0:FzISO>31300</v2.0:FzISO>
										</v2.0:Data>
										<v2.0:Signature>
											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
												<di:Transforms>
													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
												</di:Transforms>
												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
												<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
											</di:Reference>
										</v2.0:Signature>
									</v2.0:Tyre>
								</Axle>
							</Axles>
						</Data>
					</AxleWheels>
					<Auxiliaries>
						<Data xsi:type="AuxiliaryDataPIFType">
							<Fan>
								<Technology>Hydraulic driven - Constant displacement pump</Technology>
							</Fan>
							<SteeringPump>
								<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
							</SteeringPump>
							<ElectricSystem>
								<AlternatorTechnology>default</AlternatorTechnology>
								<SmartElectrics>true</SmartElectrics>
								<MaxAlternatorPower>15000</MaxAlternatorPower>
								<ElectricStorageCapacity>50</ElectricStorageCapacity>
							</ElectricSystem>
							<PneumaticSystem>
								<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
								<Clutch>none</Clutch>
								<CompressorRatio>1.000</CompressorRatio>
								<SmartCompressionSystem>true</SmartCompressionSystem>
								<SmartRegenerationSystem>false</SmartRegenerationSystem>
								<AirsuspensionControl>electronically</AirsuspensionControl>
								<SCRReagentDosing>true</SCRReagentDosing>
							</PneumaticSystem>
							<HVAC>
								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
								<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
							</HVAC>
						</Data>
					</Auxiliaries>
				</Components>
			</Vehicle>
			<InputDataSignature>
				<di:Reference URI="#VEH-PrimaryBus_SmartPS">
					<di:Transforms>
						<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
						<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
					</di:Transforms>
					<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
					<di:DigestValue>uqcFIXtDYxvl513ruiYYJCrV1fIiyw37t8vJhg4xxoo=</di:DigestValue>
				</di:Reference>
			</InputDataSignature>
			<ManufacturerRecordSignature>
				<di:Reference URI="#RESULT-5f30c7fe665a47938f6b">
					<di:Transforms>
						<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
						<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
					</di:Transforms>
					<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
					<di:DigestValue>KUpFCKh1bu/YPwYj36kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
				</di:Reference>
			</ManufacturerRecordSignature>
			<Results>
				<Status>success</Status>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
						<Payload unit="kg">1352.52</Payload>
						<PassengerCount>19.89</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">21.22359</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1555.73</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
						<Payload unit="kg">6762.60</Payload>
						<PassengerCount>99.45</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">25.40945</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1862.57</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
						<Payload unit="kg">1352.52</Payload>
						<PassengerCount>19.89</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">16.74101</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1227.15</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
						<Payload unit="kg">6762.60</Payload>
						<PassengerCount>99.45</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">20.24221</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1483.80</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
						<Payload unit="kg">1352.52</Payload>
						<PassengerCount>19.89</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">14.34578</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1051.58</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
						<Payload unit="kg">6762.60</Payload>
						<PassengerCount>99.45</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">17.60016</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1290.13</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
						<Payload unit="kg">1294.51</Payload>
						<PassengerCount>18.23</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">11.82313</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">866.66</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
						<Payload unit="kg">4236.57</Payload>
						<PassengerCount>59.67</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">13.24283</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">970.73</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
						<Payload unit="kg">1578.29</Payload>
						<PassengerCount>23.21</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">22.72091</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1665.49</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
						<Payload unit="kg">7891.43</Payload>
						<PassengerCount>116.05</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">27.95930</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">2049.48</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
						<Payload unit="kg">1578.29</Payload>
						<PassengerCount>23.21</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">17.90756</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1312.66</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
						<Payload unit="kg">7891.43</Payload>
						<PassengerCount>116.05</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">22.23796</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1630.09</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
						<Payload unit="kg">1578.29</Payload>
						<PassengerCount>23.21</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">15.28035</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1120.08</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
						<Payload unit="kg">7891.43</Payload>
						<PassengerCount>116.05</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">19.26201</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1411.95</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16467.68</TotalVehicleMass>
						<Payload unit="kg">1254.68</Payload>
						<PassengerCount>17.67</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">11.93701</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">875.01</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
						<Payload unit="kg">4106.21</Payload>
						<PassengerCount>57.83</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">13.32341</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">976.63</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16490.49</TotalVehicleMass>
						<Payload unit="kg">1277.49</Payload>
						<PassengerCount>17.99</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">8.71847</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">639.08</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">18406.72</TotalVehicleMass>
						<Payload unit="kg">3193.72</Payload>
						<PassengerCount>44.98</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">9.20255</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">674.57</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">19588.08</TotalVehicleMass>
						<Payload unit="kg">1738.08</Payload>
						<PassengerCount>24.48</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">13.58335</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">995.69</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
						<Payload unit="kg">5793.60</Payload>
						<PassengerCount>81.60</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">15.56740</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1141.12</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">19703.95</TotalVehicleMass>
						<Payload unit="kg">1853.95</Payload>
						<PassengerCount>26.11</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">9.82937</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">720.51</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22484.88</TotalVehicleMass>
						<Payload unit="kg">4634.88</Payload>
						<PassengerCount>65.28</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">10.56728</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">774.60</CO2>
				</Result>
			</Results>
			<ApplicationInformation>
				<SimulationToolVersion>String</SimulationToolVersion>
				<Date>2017-01-01T00:00:00Z</Date>
			</ApplicationInformation>
		</Data>
		<Signature>
			<di:Reference URI="#PIF-d10aff76c5d149948046">
				<di:Transforms>
					<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
					<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
				</di:Transforms>
				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
			</di:Reference>
		</Signature>
	</PrimaryVehicle>
</VectoOutputMultistage>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
index 0a66dac0041c063fee12d66623c7a980548a73b8..a1a631c88bc84853b0756f347beedc191ba2acff 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
@@ -282,7 +282,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 								<SmartCompressionSystem>true</SmartCompressionSystem>
 								<SmartRegenerationSystem>false</SmartRegenerationSystem>
 								<AirsuspensionControl>electronically</AirsuspensionControl>
-								<AdBlueDosing>true</AdBlueDosing>
+								<SCRReagentDosing>true</SCRReagentDosing>
 							</PneumaticSystem>
 							<HVAC>
 								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
@@ -656,7 +656,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:ManufacturerAddress>Intermediate Manufacturer Address 1</v2.8:ManufacturerAddress>
 				<v2.8:VIN>VEH-1234567890</v2.8:VIN>
 				<v2.8:Date>2018-02-15T11:00:00Z</v2.8:Date>
-				<v2.8:DeclarationType>interim</v2.8:DeclarationType>
+				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
 			</Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
@@ -692,7 +692,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:VIN>VEH-2234567890</v2.8:VIN>
 				<v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date>
 				<v2.8:AirdragModifiedMultistage>false</v2.8:AirdragModifiedMultistage>				
-				<v2.8:DeclarationType>final</v2.8:DeclarationType>
+				<v2.8:VehicleDeclarationType>final</v2.8:VehicleDeclarationType>
 				<v2.8:ADAS>
 					<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
 					<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
index b520d7845cc7424ca6ac897f9faeb9c190b41322..feee29a3b0002c3239bef680843bf786812b8d1d 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
@@ -282,7 +282,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 								<SmartCompressionSystem>true</SmartCompressionSystem>
 								<SmartRegenerationSystem>false</SmartRegenerationSystem>
 								<AirsuspensionControl>electronically</AirsuspensionControl>
-								<AdBlueDosing>true</AdBlueDosing>
+								<SCRReagentDosing>true</SCRReagentDosing>
 							</PneumaticSystem>
 							<HVAC>
 								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
@@ -665,14 +665,14 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:ClassBus>B</v2.8:ClassBus>
 				<v2.8:NumberPassengersLowerDeck>30</v2.8:NumberPassengersLowerDeck>
 				<v2.8:NumberPassengersUpperDeck>24</v2.8:NumberPassengersUpperDeck>
-				<v2.8:VehicleCode>CA</v2.8:VehicleCode>
+				<v2.8:BodyworkCode>CA</v2.8:BodyworkCode>
 				<v2.8:LowEntry>true</v2.8:LowEntry>
 				<v2.8:HeightIntegratedBody>2500</v2.8:HeightIntegratedBody>				
 				<v2.8:VehicleLength>12000</v2.8:VehicleLength>				
 				<v2.8:VehicleWidth>2000</v2.8:VehicleWidth>				
 				<v2.8:EntranceHeight>2050</v2.8:EntranceHeight>
 				<v2.8:DoorDriveTechnology>pneumatic</v2.8:DoorDriveTechnology>
-				<v2.8:DeclarationType>final</v2.8:DeclarationType>
+				<v2.8:VehicleDeclarationType>final</v2.8:VehicleDeclarationType>
 				<v2.8:ADAS>
 					<v2.3:EngineStopStart>false</v2.3:EngineStopStart>
 					<v2.3:EcoRollWithoutEngineStop>true</v2.3:EcoRollWithoutEngineStop>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
index 15a666c2aa1a8efc1ec1204c38837fed72e8f335..6c080dc5b08fe47c1082ce3dcd64a62297251487 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
@@ -282,7 +282,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 								<SmartCompressionSystem>true</SmartCompressionSystem>
 								<SmartRegenerationSystem>false</SmartRegenerationSystem>
 								<AirsuspensionControl>electronically</AirsuspensionControl>
-								<AdBlueDosing>true</AdBlueDosing>
+								<SCRReagentDosing>true</SCRReagentDosing>
 							</PneumaticSystem>
 							<HVAC>
 								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
@@ -656,7 +656,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:ManufacturerAddress>Intermediate Manufacturer Address 1</v2.8:ManufacturerAddress>
 				<v2.8:VIN>adfas</v2.8:VIN>
 				<v2.8:Date>2018-02-15T11:00:00Z</v2.8:Date>
-				<v2.8:DeclarationType>interim</v2.8:DeclarationType>
+				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
 			</Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>