diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/AidragComponent.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/AidragComponent.xml
index 9bc44b124397a660b40ff7ce3bd6f3fad43a4819..273455ce72b39d75af9bde98ae07b8399a4eac4f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/AidragComponent.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/AidragComponent.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Sample XML file generated by XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com)-->
-<v2.0:VectoInputDeclaration 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:DeclarationComponent:v2.0" xmlns:vdecdef2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaVersion="1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0 VectoComponent.2.0.xsd">
-	<v2.0:AirDrag>
-		<vdecdef2.0:Data xsi:type="vdecdef2.0:AirDragDataDeclarationType" id="a">
-			<vdecdef2.0:Manufacturer>a</vdecdef2.0:Manufacturer>
-			<vdecdef2.0:Model>a</vdecdef2.0:Model>
-			<vdecdef2.0:CertificationNumber>token</vdecdef2.0:CertificationNumber>
-			<vdecdef2.0:Date>2017-01-01T00:00:00Z</vdecdef2.0:Date>
-			<vdecdef2.0:AppVersion>aaaaa</vdecdef2.0:AppVersion>
-			<vdecdef2.0:CdxA_0>6.66</vdecdef2.0:CdxA_0>
-			<vdecdef2.0:TransferredCdxA>6.66</vdecdef2.0:TransferredCdxA>
-			<vdecdef2.0:DeclaredCdxA>6.66</vdecdef2.0:DeclaredCdxA>
-		</vdecdef2.0:Data>
-		<vdecdef2.0:Signature>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoComponent.xsd">
+	<tns:AirDrag>
+		<Data xsi:type="AirDragDataDeclarationType" id="a">
+			<Manufacturer>a</Manufacturer>
+			<Model>a</Model>
+			<CertificationNumber>token</CertificationNumber>
+			<Date>2017-01-01T00:00:00Z</Date>
+			<AppVersion>aaaaa</AppVersion>
+			<CdxA_0>6.66</CdxA_0>
+			<TransferredCdxA>6.66</TransferredCdxA>
+			<DeclaredCdxA>6.66</DeclaredCdxA>
+		</Data>
+		<Signature>
 			<di:Reference>
 				<di:DigestMethod Algorithm="http://www.altova.com/"/>
 				<di:DigestValue>UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi</di:DigestValue>
 			</di:Reference>
-		</vdecdef2.0:Signature>
-	</v2.0:AirDrag>
-</v2.0:VectoInputDeclaration>
+		</Signature>
+	</tns:AirDrag>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/AirdragLoadTestFile.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/AirdragLoadTestFile.xml
index 3baab2fa609ec00fcb3b5095be0d7a63a5211f9d..282007c49b9fe54baa5fad3a0c0940f0ac60d929 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/AirdragLoadTestFile.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/AirdragLoadTestFile.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoComponent.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoComponent.xsd">
     <tns:AirDrag>
         <Data id="TestAirDrag1234" xsi:type="AirDragDataDeclarationType">
             <Manufacturer>Test AirDrag Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/AirdragLoadTestFilev2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/AirdragLoadTestFilev2.xml
index 45cc6f8f24c4475d5cf9c26215e4ac6e5a8a3c5d..f23081c95c253aa94db05313e647a0d1193dbc87 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/AirdragLoadTestFilev2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/AirdragLoadTestFilev2.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoComponent.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoComponent.xsd">
     <tns:AirDrag>
         <Data id="TestAirDrag1234" xsi:type="AirDragDataDeclarationType">
             <Manufacturer>Test AirDrag Manufacturer</Manufacturer>
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 0f1a6b00a4c12c975d46159a5c7af810d97a7105..044d5ff8e0a4a9ef07d5784ff997c946d400e639 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
@@ -2,11 +2,11 @@
 <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:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" 
-xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -651,24 +651,24 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-1-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 1</v2.8:Manufacturer>
-				<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:Model>Intermediate Model 1</v2.8:Model>
-				<v2.8:NgTankSystem>Compressed</v2.8:NgTankSystem>
-				<v2.8:NumberPassengerSeatsLowerDeck>11</v2.8:NumberPassengerSeatsLowerDeck>
-				<v2.8:NumberPassengersStandingLowerDeck>3</v2.8:NumberPassengersStandingLowerDeck>
-				<v2.8:NumberPassengerSeatsUpperDeck>31</v2.8:NumberPassengerSeatsUpperDeck>
-				<v2.8:NumberPassengersStandingUpperDeck>1</v2.8:NumberPassengersStandingUpperDeck>
-				<v2.8:LowEntry>true</v2.8:LowEntry>
-				<v2.8:HeightIntegratedBody>3000</v2.8:HeightIntegratedBody>
-				<v2.8:VehicleLength>12000</v2.8:VehicleLength>
-				<v2.8:VehicleWidth>2500</v2.8:VehicleWidth>
-				<v2.8:EntranceHeight>2500</v2.8:EntranceHeight>
-				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
+				<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
+				<VIN>VEH-1234567890</VIN>
+				<Date>2018-02-15T11:00:00Z</Date>
+				<Model>Intermediate Model 1</Model>
+				<NgTankSystem>Compressed</NgTankSystem>
+				<NumberPassengerSeatsLowerDeck>11</NumberPassengerSeatsLowerDeck>
+				<NumberPassengersStandingLowerDeck>3</NumberPassengersStandingLowerDeck>
+				<NumberPassengerSeatsUpperDeck>31</NumberPassengerSeatsUpperDeck>
+				<NumberPassengersStandingUpperDeck>1</NumberPassengersStandingUpperDeck>
+				<LowEntry>true</LowEntry>
+				<HeightIntegratedBody>3000</HeightIntegratedBody>
+				<VehicleLength>12000</VehicleLength>
+				<VehicleWidth>2500</VehicleWidth>
+				<EntranceHeight>2500</EntranceHeight>
+				<VehicleDeclarationType>interim</VehicleDeclarationType>
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-01-12T07:20:08.0187663Z</Date>
@@ -697,45 +697,49 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-2-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 2</v2.8:Manufacturer>
-				<v2.8:ManufacturerAddress>Intermediate Manufacturer Address 2</v2.8:ManufacturerAddress>
-				<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:BodyworkCode>CB</v2.8:BodyworkCode>
-				<v2.8:DoorDriveTechnology>mixed</v2.8:DoorDriveTechnology>				
-				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>				
-				<v2.8: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.8:ADAS>	
-				<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">
-							<v2.8:ElectricSystem>
-								<v2.8:LEDLights>
-									<v2.8:Interiorlights>true</v2.8:Interiorlights>	
-									<v2.8:Dayrunninglights>true</v2.8:Dayrunninglights>													
-								</v2.8:LEDLights>
-							</v2.8:ElectricSystem>
-							<v2.8:HVAC>
-								<v2.8:SystemConfiguration>1</v2.8:SystemConfiguration>
-								<v2.8:HeatPumpTypeDriverCompartment>non R-744 2-stage</v2.8:HeatPumpTypeDriverCompartment>
-								<v2.8:HeatPumpModeDriverCompartment>heating</v2.8:HeatPumpModeDriverCompartment>
-								<v2.8:HeatPumpTypePassengerCompartment>non R-744 3-stage</v2.8:HeatPumpTypePassengerCompartment>
-								<v2.8:HeatPumpModePassengerCompartment>cooling</v2.8:HeatPumpModePassengerCompartment>
-								<v2.8:AuxiliaryHeaterPower>50</v2.8:AuxiliaryHeaterPower>
-								<v2.8:DoubleGlazing>false</v2.8:DoubleGlazing>
-								<v2.8:AdjustableAuxiliaryHeater>true</v2.8:AdjustableAuxiliaryHeater>
-								<v2.8:SeparateAirDistributionDucts>false</v2.8:SeparateAirDistributionDucts>	
-							</v2.8:HVAC>
-						</v2.8:Data>
-					</v2.8:Auxiliaries>
-				</v2.8:Components>		
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
+				<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
+				<VIN>VEH-2234567890</VIN>
+				<Date>2021-02-13T07:20:08.0187663Z</Date>
+				<CorrectedActualMass>15000</CorrectedActualMass>				
+				<BodyworkCode>CB</BodyworkCode>
+				<DoorDriveTechnology>mixed</DoorDriveTechnology>				
+				<VehicleDeclarationType>interim</VehicleDeclarationType>				
+				<ADAS xsi:type="ADAS_Conventional_Type">
+					<EngineStopStart>true</EngineStopStart>
+					<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+					<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
+					<PredictiveCruiseControl>1,2</PredictiveCruiseControl>
+				</ADAS>	
+				<Components xsi:type="Components_Conventional_CompletedBusType">					
+					<Auxiliaries>
+						<Data xsi:type="AUX_Conventional_CompletedBusType">
+							<ElectricSystem>
+								<LEDLights>
+									<Interiorlights>true</Interiorlights>	
+									<Dayrunninglights>true</Dayrunninglights>													
+								</LEDLights>
+							</ElectricSystem>
+							<HVAC>
+								<SystemConfiguration>1</SystemConfiguration>
+								<HeatPumpTypeDriverCompartment>
+									<Cooling>none</Cooling>
+									<Heating>non R-744 2-stage</Heating>
+								</HeatPumpTypeDriverCompartment>
+								<HeatPumpTypePassengerCompartment>
+									<Cooling>non R-744 3-stage</Cooling>
+									<Heating>none</Heating>
+								</HeatPumpTypePassengerCompartment>
+								<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
+								<DoubleGlazing>false</DoubleGlazing>
+								<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+								<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>	
+							</HVAC>
+						</Data>
+					</Auxiliaries>
+				</Components>		
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-02-13T07:20:08.0187663Z</Date>
@@ -764,42 +768,39 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 				</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-3-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 3</v2.8:Manufacturer>
-				<v2.8:ManufacturerAddress>Intermediate Manufacturer Address 3</v2.8:ManufacturerAddress>
-				<v2.8:VIN>VEH-2234567866</v2.8:VIN>
-				<v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date>
-				<v2.8:LegislativeCategory>M3</v2.8:LegislativeCategory>				
-				<v2.8:TechnicalPermissibleMaximumLadenMass>20000</v2.8:TechnicalPermissibleMaximumLadenMass>				
-				<v2.8:NgTankSystem>Liquefied</v2.8:NgTankSystem>				
-				<v2.8:ClassBus>B</v2.8:ClassBus>			
-				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
-				<v2.8: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>
-				</v2.8:ADAS>				
-				<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">
-							<v2.8:ElectricSystem>
-								<v2.8:LEDLights>
-									<v2.8:Positionlights>false</v2.8:Positionlights>
-									<v2.8:Brakelights>false</v2.8:Brakelights>
-									<v2.8:Headlights>true</v2.8:Headlights>									
-								</v2.8:LEDLights>
-							</v2.8:ElectricSystem>
-							<v2.8:HVAC>
-								<v2.8:WaterElectricHeater>false</v2.8:WaterElectricHeater>
-								<v2.8:AirElectricHeater>false</v2.8:AirElectricHeater>
-								<v2.8:OtherHeatingTechnology>true</v2.8:OtherHeatingTechnology>							
-							</v2.8:HVAC>
-						</v2.8:Data>
-					</v2.8:Auxiliaries>
-				</v2.8:Components>
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<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 xsi:type="ADAS_Conventional_Type">
+					<EngineStopStart>true</EngineStopStart>
+					<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+					<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
+					<PredictiveCruiseControl>1,2</PredictiveCruiseControl>
+					<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
+				</ADAS>				
+				<Components xsi:type="Components_Conventional_CompletedBusType">
+					<Auxiliaries>
+						<Data xsi:type="AUX_Conventional_CompletedBusType">
+							<ElectricSystem>
+								<LEDLights>
+									<Positionlights>false</Positionlights>
+									<Brakelights>false</Brakelights>
+									<Headlights>true</Headlights>									
+								</LEDLights>
+							</ElectricSystem>
+							<HVAC>
+							</HVAC>
+						</Data>
+					</Auxiliaries>
+				</Components>
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-03-13T07:20:08.0187663Z</Date>
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 b497bba9991b6a358afa84783748494a3b39c24f..2212c5f75b73e474135bf16ada9f742efb036060 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
@@ -2,11 +2,11 @@
 <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:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" 
-xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" 
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -652,28 +652,28 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-1-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 1</v2.8:Manufacturer>
-				<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:Model>Intermediate Model 1</v2.8:Model>				
-				<v2.8:NumberPassengerSeatsLowerDeck>12</v2.8:NumberPassengerSeatsLowerDeck>
-				<v2.8:NumberPassengersStandingLowerDeck>5</v2.8:NumberPassengersStandingLowerDeck>
-				<v2.8:NumberPassengerSeatsUpperDeck>30</v2.8:NumberPassengerSeatsUpperDeck>
-				<v2.8:NumberPassengersStandingUpperDeck>4</v2.8:NumberPassengersStandingUpperDeck>
-				<v2.8:LowEntry>true</v2.8:LowEntry>
-				<v2.8:HeightIntegratedBody>3000</v2.8:HeightIntegratedBody>
-				<v2.8:VehicleLength>12000</v2.8:VehicleLength>
-				<v2.8:VehicleWidth>2500</v2.8:VehicleWidth>
-				<v2.8:EntranceHeight>2500</v2.8:EntranceHeight>
-				<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"/>
-					</v2.8:Auxiliaries>
-				</v2.8:Components>
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
+				<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
+				<VIN>VEH-1234567890</VIN>
+				<Date>2018-02-15T11:00:00Z</Date>
+				<Model>Intermediate Model 1</Model>				
+				<NumberPassengerSeatsLowerDeck>12</NumberPassengerSeatsLowerDeck>
+				<NumberPassengersStandingLowerDeck>5</NumberPassengersStandingLowerDeck>
+				<NumberPassengerSeatsUpperDeck>30</NumberPassengerSeatsUpperDeck>
+				<NumberPassengersStandingUpperDeck>4</NumberPassengersStandingUpperDeck>
+				<LowEntry>true</LowEntry>
+				<HeightIntegratedBody>3000</HeightIntegratedBody>
+				<VehicleLength>12000</VehicleLength>
+				<VehicleWidth>2500</VehicleWidth>
+				<EntranceHeight>2500</EntranceHeight>
+				<VehicleDeclarationType>interim</VehicleDeclarationType>
+				<Components xsi:type="Components_Conventional_CompletedBusType">
+					<Auxiliaries>
+						<Data xsi:type="AUX_Conventional_CompletedBusType"/>
+					</Auxiliaries>
+				</Components>
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-01-12T07:20:08.0187663Z</Date>
@@ -702,45 +702,49 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-2-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 2</v2.8:Manufacturer>
-				<v2.8:ManufacturerAddress>Intermediate Manufacturer Address 2</v2.8:ManufacturerAddress>
-				<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:BodyworkCode>CB</v2.8:BodyworkCode>				
-				<v2.8:DoorDriveTechnology>mixed</v2.8:DoorDriveTechnology>				
-				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>				
-				<v2.8: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.8:ADAS>	
-				<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">
-							<v2.8:ElectricSystem>
-								<v2.8:LEDLights>
-									<v2.8:Interiorlights>true</v2.8:Interiorlights>	
-									<v2.8:Dayrunninglights>true</v2.8:Dayrunninglights>													
-								</v2.8:LEDLights>
-							</v2.8:ElectricSystem>
-							<v2.8:HVAC>
-								<v2.8:SystemConfiguration>1</v2.8:SystemConfiguration>
-								<v2.8:HeatPumpTypeDriverCompartment>non R-744 2-stage</v2.8:HeatPumpTypeDriverCompartment>
-								<v2.8:HeatPumpModeDriverCompartment>heating</v2.8:HeatPumpModeDriverCompartment>
-								<v2.8:HeatPumpTypePassengerCompartment>non R-744 3-stage</v2.8:HeatPumpTypePassengerCompartment>
-								<v2.8:HeatPumpModePassengerCompartment>cooling</v2.8:HeatPumpModePassengerCompartment>
-								<v2.8:AuxiliaryHeaterPower>50</v2.8:AuxiliaryHeaterPower>
-								<v2.8:DoubleGlazing>false</v2.8:DoubleGlazing>
-								<v2.8:AdjustableAuxiliaryHeater>true</v2.8:AdjustableAuxiliaryHeater>
-								<v2.8:SeparateAirDistributionDucts>false</v2.8:SeparateAirDistributionDucts>	
-							</v2.8:HVAC>
-						</v2.8:Data>
-					</v2.8:Auxiliaries>
-				</v2.8:Components>		
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
+				<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
+				<VIN>VEH-2234567890</VIN>
+				<Date>2021-02-13T07:20:08.0187663Z</Date>
+				<CorrectedActualMass>15000</CorrectedActualMass>	
+				<BodyworkCode>CB</BodyworkCode>				
+				<DoorDriveTechnology>mixed</DoorDriveTechnology>				
+				<VehicleDeclarationType>interim</VehicleDeclarationType>				
+				<ADAS xsi:type="ADAS_Conventional_Type">
+					<EngineStopStart>true</EngineStopStart>
+					<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+					<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
+					<PredictiveCruiseControl>1,2</PredictiveCruiseControl>
+				</ADAS>	
+				<Components xsi:type="Components_Conventional_CompletedBusType">					
+					<Auxiliaries>
+						<Data xsi:type="AUX_Conventional_CompletedBusType">
+							<ElectricSystem>
+								<LEDLights>
+									<Interiorlights>true</Interiorlights>	
+									<Dayrunninglights>true</Dayrunninglights>													
+								</LEDLights>
+							</ElectricSystem>
+							<HVAC>
+								<SystemConfiguration>1</SystemConfiguration>
+								<HeatPumpTypeDriverCompartment>
+									<Cooling>none</Cooling>
+									<Heating>non R-744 2-stage</Heating>
+								</HeatPumpTypeDriverCompartment>
+								<HeatPumpTypePassengerCompartment>
+									<Cooling>non R-744 3-stage</Cooling>
+									<Heating>none</Heating>
+								</HeatPumpTypePassengerCompartment>
+								<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
+								<DoubleGlazing>false</DoubleGlazing>
+								<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+								<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>	
+							</HVAC>
+						</Data>
+					</Auxiliaries>
+				</Components>		
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-02-13T07:20:08.0187663Z</Date>
@@ -769,42 +773,39 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 				</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-3-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 3</v2.8:Manufacturer>
-				<v2.8:ManufacturerAddress>Intermediate Manufacturer Address 3</v2.8:ManufacturerAddress>
-				<v2.8:VIN>VEH-2234567866</v2.8:VIN>
-				<v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date>
-				<v2.8:LegislativeCategory>M3</v2.8:LegislativeCategory>				
-				<v2.8:TechnicalPermissibleMaximumLadenMass>20000</v2.8:TechnicalPermissibleMaximumLadenMass>
-				<v2.8:NgTankSystem>Liquefied</v2.8:NgTankSystem>				
-				<v2.8:ClassBus>B</v2.8:ClassBus>			
-				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
-				<v2.8: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>
-				</v2.8:ADAS>				
-				<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">
-							<v2.8:ElectricSystem>
-								<v2.8:LEDLights>
-									<v2.8:Positionlights>false</v2.8:Positionlights>
-									<v2.8:Brakelights>false</v2.8:Brakelights>
-									<v2.8:Headlights>true</v2.8:Headlights>									
-								</v2.8:LEDLights>
-							</v2.8:ElectricSystem>
-							<v2.8:HVAC>
-								<v2.8:WaterElectricHeater>false</v2.8:WaterElectricHeater>
-								<v2.8:AirElectricHeater>false</v2.8:AirElectricHeater>
-								<v2.8:OtherHeatingTechnology>true</v2.8:OtherHeatingTechnology>							
-							</v2.8:HVAC>
-						</v2.8:Data>
-					</v2.8:Auxiliaries>
-				</v2.8:Components>
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<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 xsi:type="ADAS_Conventional_Type">
+					<EngineStopStart>true</EngineStopStart>
+					<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+					<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
+					<PredictiveCruiseControl>1,2</PredictiveCruiseControl>
+					<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
+				</ADAS>				
+				<Components xsi:type="Components_Conventional_CompletedBusType">
+					<Auxiliaries>
+						<Data xsi:type="AUX_Conventional_CompletedBusType">
+							<ElectricSystem>
+								<LEDLights>
+									<Positionlights>false</Positionlights>
+									<Brakelights>false</Brakelights>
+									<Headlights>true</Headlights>									
+								</LEDLights>
+							</ElectricSystem>
+							<HVAC>
+							</HVAC>
+						</Data>
+					</Auxiliaries>
+				</Components>
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-03-13T07:20:08.0187663Z</Date>
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 0ad9eb1fd6408dfc14358161bfd69f0884139892..5e29352eacc6037b7afb9ef74b25d9589a9ec903 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
@@ -2,11 +2,11 @@
 <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:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" 
-xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" 
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -651,25 +651,25 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-1-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 1</v2.8:Manufacturer>
-				<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:Model>Intermediate Model 1</v2.8:Model>
-				<v2.8:NgTankSystem>Compressed</v2.8:NgTankSystem>
-				<v2.8:NumberPassengerSeatsLowerDeck>12</v2.8:NumberPassengerSeatsLowerDeck>
-				<v2.8:NumberPassengersStandingLowerDeck>5</v2.8:NumberPassengersStandingLowerDeck>
-				<v2.8:NumberPassengerSeatsUpperDeck>30</v2.8:NumberPassengerSeatsUpperDeck>
-				<v2.8:NumberPassengersStandingUpperDeck>0</v2.8:NumberPassengersStandingUpperDeck>
-				<v2.8:LowEntry>true</v2.8:LowEntry>
-				<v2.8:HeightIntegratedBody>3000</v2.8:HeightIntegratedBody>
-				<v2.8:VehicleLength>12000</v2.8:VehicleLength>
-				<v2.8:VehicleWidth>2500</v2.8:VehicleWidth>
-				<v2.8:EntranceHeight>2500</v2.8:EntranceHeight>
-				<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>
+			<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" >
+				<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
+				<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
+				<VIN>VEH-1234567890</VIN>
+				<Date>2018-02-15T11:00:00Z</Date>
+				<Model>Intermediate Model 1</Model>
+				<NgTankSystem>Compressed</NgTankSystem>
+				<NumberPassengerSeatsLowerDeck>12</NumberPassengerSeatsLowerDeck>
+				<NumberPassengersStandingLowerDeck>5</NumberPassengersStandingLowerDeck>
+				<NumberPassengerSeatsUpperDeck>30</NumberPassengerSeatsUpperDeck>
+				<NumberPassengersStandingUpperDeck>0</NumberPassengersStandingUpperDeck>
+				<LowEntry>true</LowEntry>
+				<HeightIntegratedBody>3000</HeightIntegratedBody>
+				<VehicleLength>12000</VehicleLength>
+				<VehicleWidth>2500</VehicleWidth>
+				<EntranceHeight>2500</EntranceHeight>
+				<VehicleDeclarationType>interim</VehicleDeclarationType>
+				<Components xsi:type="Components_Conventional_CompletedBusType">
+					<AirDrag>
 						<v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX24h">
 							<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
 							<v2.0:Model>Generic Model</v2.0:Model>
@@ -690,25 +690,29 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 								<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/28N8=</di:DigestValue>
 							</di:Reference>
 						</v2.0:Signature>
-					</v2.8:AirDrag>
-					<v2.8:Auxiliaries>
-						<v2.8:Data xsi:type="v2.8:CompletedVehicleAuxiliaryDataDeclarationType">
-							<v2.8:HVAC>
-								<v2.8:SystemConfiguration>1</v2.8:SystemConfiguration>
-								<v2.8:HeatPumpTypeDriverCompartment>non R-744 2-stage</v2.8:HeatPumpTypeDriverCompartment>
-								<v2.8:HeatPumpModeDriverCompartment>heating</v2.8:HeatPumpModeDriverCompartment>
-								<v2.8:HeatPumpTypePassengerCompartment>non R-744 3-stage</v2.8:HeatPumpTypePassengerCompartment>
-								<v2.8:HeatPumpModePassengerCompartment>heating</v2.8:HeatPumpModePassengerCompartment>
-								<v2.8:AuxiliaryHeaterPower>50</v2.8:AuxiliaryHeaterPower>
-								<v2.8:DoubleGlazing>false</v2.8:DoubleGlazing>
-								<v2.8:AdjustableAuxiliaryHeater>true</v2.8:AdjustableAuxiliaryHeater>
-								<v2.8:SeparateAirDistributionDucts>false</v2.8:SeparateAirDistributionDucts>
-							</v2.8:HVAC>
-						</v2.8:Data>
-					</v2.8:Auxiliaries>
+					</AirDrag>
+					<Auxiliaries>
+						<Data xsi:type="AUX_Conventional_CompletedBusType">
+							<HVAC>
+								<SystemConfiguration>1</SystemConfiguration>
+								<HeatPumpTypeDriverCompartment>
+									<Cooling>none</Cooling>
+									<Heating>non R-744 2-stage</Heating>
+								</HeatPumpTypeDriverCompartment>
+								<HeatPumpTypePassengerCompartment>
+									<Cooling>none</Cooling>
+									<Heating>non R-744 3-stage</Heating>
+								</HeatPumpTypePassengerCompartment>
+								<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
+								<DoubleGlazing>false</DoubleGlazing>
+								<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+								<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
+							</HVAC>
+						</Data>
+					</Auxiliaries>
 
-				</v2.8:Components>
-			</Vehicle>
+				</Components>
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-01-12T07:20:08.0187663Z</Date>
@@ -737,48 +741,50 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-2-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 2</v2.8:Manufacturer>
-				<v2.8:ManufacturerAddress>Intermediate Manufacturer Address 2</v2.8:ManufacturerAddress>
-				<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:AirdragModifiedMultistage>false</v2.8:AirdragModifiedMultistage>
-				<v2.8:BodyworkCode>CB</v2.8:BodyworkCode>
-				<v2.8:DoorDriveTechnology>mixed</v2.8:DoorDriveTechnology>				
-				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>				
-				<v2.8: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.8:ADAS>	
-				<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">
-							<v2.8:ElectricSystem>
-								<v2.8:LEDLights>
-									<v2.8:Interiorlights>true</v2.8:Interiorlights>	
-									<v2.8:Dayrunninglights>true</v2.8:Dayrunninglights>													
-								</v2.8:LEDLights>
-							</v2.8:ElectricSystem>
-							<v2.8:HVAC>
-								<v2.8:SystemConfiguration>1</v2.8:SystemConfiguration>
-								<v2.8:HeatPumpTypeDriverCompartment>non R-744 2-stage</v2.8:HeatPumpTypeDriverCompartment>
-								<v2.8:HeatPumpModeDriverCompartment>heating</v2.8:HeatPumpModeDriverCompartment>
-								<v2.8:HeatPumpTypePassengerCompartment>non R-744 3-stage</v2.8:HeatPumpTypePassengerCompartment>
-								<v2.8:HeatPumpModePassengerCompartment>cooling</v2.8:HeatPumpModePassengerCompartment>
-								<v2.8:HeatPumpTypePassengerCompartment>non R-744 2-stage</v2.8:HeatPumpTypePassengerCompartment>
-								<v2.8:HeatPumpModePassengerCompartment>heating</v2.8:HeatPumpModePassengerCompartment>
-								<v2.8:AuxiliaryHeaterPower>50</v2.8:AuxiliaryHeaterPower>
-								<v2.8:DoubleGlazing>false</v2.8:DoubleGlazing>
-								<v2.8:AdjustableAuxiliaryHeater>true</v2.8:AdjustableAuxiliaryHeater>
-								<v2.8:SeparateAirDistributionDucts>false</v2.8:SeparateAirDistributionDucts>	
-							</v2.8:HVAC>
-						</v2.8:Data>
-					</v2.8:Auxiliaries>
-				</v2.8:Components>		
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
+				<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
+				<VIN>VEH-2234567890</VIN>
+				<Date>2021-02-13T07:20:08.0187663Z</Date>
+				<CorrectedActualMass>15000</CorrectedActualMass>	
+				<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
+				<BodyworkCode>CB</BodyworkCode>
+				<DoorDriveTechnology>mixed</DoorDriveTechnology>				
+				<VehicleDeclarationType>interim</VehicleDeclarationType>				
+				<ADAS xsi:type="ADAS_Conventional_Type">
+					<EngineStopStart>true</EngineStopStart>
+					<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+					<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
+					<PredictiveCruiseControl>1,2</PredictiveCruiseControl>
+				</ADAS>	
+				<Components xsi:type="Components_Conventional_CompletedBusType">		
+					<Auxiliaries>
+						<Data xsi:type="AUX_Conventional_CompletedBusType">
+							<ElectricSystem>
+								<LEDLights>
+									<Interiorlights>true</Interiorlights>	
+									<Dayrunninglights>true</Dayrunninglights>													
+								</LEDLights>
+							</ElectricSystem>
+							<HVAC>
+								<SystemConfiguration>1</SystemConfiguration>
+								<HeatPumpTypeDriverCompartment>
+									<Cooling>none</Cooling>
+									<Heating>non R-744 2-stage</Heating>
+								</HeatPumpTypeDriverCompartment>
+								<HeatPumpTypePassengerCompartment>
+									<Cooling>non R-744 3-stage</Cooling>
+									<Heating>non R-744 2-stage</Heating>
+								</HeatPumpTypePassengerCompartment>
+								<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
+								<DoubleGlazing>false</DoubleGlazing>
+								<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+								<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>	
+							</HVAC>
+						</Data>
+					</Auxiliaries>
+				</Components>		
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-02-13T07:20:08.0187663Z</Date>
@@ -807,43 +813,40 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 				</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-3-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 3</v2.8:Manufacturer>
-				<v2.8:ManufacturerAddress>Intermediate Manufacturer Address 3</v2.8:ManufacturerAddress>
-				<v2.8:VIN>VEH-2234567866</v2.8:VIN>
-				<v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date>
-				<v2.8:LegislativeCategory>M3</v2.8:LegislativeCategory>				
-				<v2.8:TechnicalPermissibleMaximumLadenMass>20000</v2.8:TechnicalPermissibleMaximumLadenMass>
-				<v2.8:AirdragModifiedMultistage>false</v2.8:AirdragModifiedMultistage>
-				<v2.8:NgTankSystem>Liquefied</v2.8:NgTankSystem>				
-				<v2.8:ClassBus>B</v2.8:ClassBus>			
-				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
-				<v2.8: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>
-				</v2.8:ADAS>				
-				<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">
-							<v2.8:ElectricSystem>
-								<v2.8:LEDLights>
-									<v2.8:Positionlights>false</v2.8:Positionlights>
-									<v2.8:Brakelights>false</v2.8:Brakelights>
-									<v2.8:Headlights>true</v2.8:Headlights>									
-								</v2.8:LEDLights>
-							</v2.8:ElectricSystem>
-							<v2.8:HVAC>
-								<v2.8:WaterElectricHeater>false</v2.8:WaterElectricHeater>
-								<v2.8:AirElectricHeater>false</v2.8:AirElectricHeater>
-								<v2.8:OtherHeatingTechnology>true</v2.8:OtherHeatingTechnology>							
-							</v2.8:HVAC>
-						</v2.8:Data>
-					</v2.8:Auxiliaries>
-				</v2.8:Components>
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<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>
+				<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
+				<NgTankSystem>Liquefied</NgTankSystem>				
+				<ClassBus>B</ClassBus>			
+				<VehicleDeclarationType>interim</VehicleDeclarationType>
+				<ADAS xsi:type="ADAS_Conventional_Type">
+					<EngineStopStart>true</EngineStopStart>
+					<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+					<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
+					<PredictiveCruiseControl>1,2</PredictiveCruiseControl>
+					<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
+				</ADAS>				
+				<Components  xsi:type="Components_Conventional_CompletedBusType">			
+					<Auxiliaries>
+						<Data xsi:type="AUX_Conventional_CompletedBusType">
+							<ElectricSystem>
+								<LEDLights>
+									<Positionlights>false</Positionlights>
+									<Brakelights>false</Brakelights>
+									<Headlights>true</Headlights>									
+								</LEDLights>
+							</ElectricSystem>
+							<HVAC>
+							</HVAC>
+						</Data>
+					</Auxiliaries>
+				</Components>
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-03-13T07:20:08.0187663Z</Date>
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 03897a0f18688c32f35ab458d36e5f2c72e48036..f324c6318b3f39a935c99faf06a8a0736c7b87de 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
@@ -2,11 +2,11 @@
 <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:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" 
-xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -651,24 +651,24 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-1-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 1</v2.8:Manufacturer>
-				<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:Model>Intermediate Model 1</v2.8:Model>
-				<v2.8:NgTankSystem>Compressed</v2.8:NgTankSystem>
-				<v2.8:NumberPassengerSeatsLowerDeck>12</v2.8:NumberPassengerSeatsLowerDeck>
-				<v2.8:NumberPassengersStandingLowerDeck>5</v2.8:NumberPassengersStandingLowerDeck>
-				<v2.8:NumberPassengerSeatsUpperDeck>30</v2.8:NumberPassengerSeatsUpperDeck>
-				<v2.8:NumberPassengersStandingUpperDeck>3</v2.8:NumberPassengersStandingUpperDeck>
-				<v2.8:LowEntry>true</v2.8:LowEntry>
-				<v2.8:HeightIntegratedBody>3000</v2.8:HeightIntegratedBody>
-				<v2.8:VehicleLength>12000</v2.8:VehicleLength>
-				<v2.8:VehicleWidth>2500</v2.8:VehicleWidth>
-				<v2.8:EntranceHeight>2500</v2.8:EntranceHeight>
-				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
+				<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
+				<VIN>VEH-1234567890</VIN>
+				<Date>2018-02-15T11:00:00Z</Date>
+				<Model>Intermediate Model 1</Model>
+				<NgTankSystem>Compressed</NgTankSystem>
+				<NumberPassengerSeatsLowerDeck>12</NumberPassengerSeatsLowerDeck>
+				<NumberPassengersStandingLowerDeck>5</NumberPassengersStandingLowerDeck>
+				<NumberPassengerSeatsUpperDeck>30</NumberPassengerSeatsUpperDeck>
+				<NumberPassengersStandingUpperDeck>3</NumberPassengersStandingUpperDeck>
+				<LowEntry>true</LowEntry>
+				<HeightIntegratedBody>3000</HeightIntegratedBody>
+				<VehicleLength>12000</VehicleLength>
+				<VehicleWidth>2500</VehicleWidth>
+				<EntranceHeight>2500</EntranceHeight>
+				<VehicleDeclarationType>interim</VehicleDeclarationType>
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-01-12T07:20:08.0187663Z</Date>
@@ -697,45 +697,49 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-2-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 2</v2.8:Manufacturer>
-				<v2.8:ManufacturerAddress>Intermediate Manufacturer Address 2</v2.8:ManufacturerAddress>
-				<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:BodyworkCode>CB</v2.8:BodyworkCode>
-				<v2.8:DoorDriveTechnology>mixed</v2.8:DoorDriveTechnology>				
-				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>				
-				<v2.8: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.8:ADAS>	
-				<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">
-							<v2.8:ElectricSystem>
-								<v2.8:LEDLights>
-									<v2.8:Interiorlights>true</v2.8:Interiorlights>	
-									<v2.8:Dayrunninglights>true</v2.8:Dayrunninglights>													
-								</v2.8:LEDLights>
-							</v2.8:ElectricSystem>
-							<v2.8:HVAC>
-								<v2.8:SystemConfiguration>1</v2.8:SystemConfiguration>
-								<v2.8:HeatPumpTypeDriverCompartment>none</v2.8:HeatPumpTypeDriverCompartment>
-								<v2.8:HeatPumpModeDriverCompartment>N.A.</v2.8:HeatPumpModeDriverCompartment>
-								<v2.8:HeatPumpTypePassengerCompartment>non R-744 3-stage</v2.8:HeatPumpTypePassengerCompartment>
-								<v2.8:HeatPumpModePassengerCompartment>cooling</v2.8:HeatPumpModePassengerCompartment>
-								<v2.8:AuxiliaryHeaterPower>50</v2.8:AuxiliaryHeaterPower>
-								<v2.8:DoubleGlazing>false</v2.8:DoubleGlazing>
-								<v2.8:AdjustableAuxiliaryHeater>true</v2.8:AdjustableAuxiliaryHeater>
-								<v2.8:SeparateAirDistributionDucts>false</v2.8:SeparateAirDistributionDucts>	
-							</v2.8:HVAC>
-						</v2.8:Data>
-					</v2.8:Auxiliaries>
-				</v2.8:Components>		
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
+				<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
+				<VIN>VEH-2234567890</VIN>
+				<Date>2021-02-13T07:20:08.0187663Z</Date>
+				<CorrectedActualMass>15000</CorrectedActualMass>	
+				<BodyworkCode>CB</BodyworkCode>
+				<DoorDriveTechnology>mixed</DoorDriveTechnology>				
+				<VehicleDeclarationType>interim</VehicleDeclarationType>				
+				<ADAS xsi:type="ADAS_Conventional_Type">
+					<EngineStopStart>true</EngineStopStart>
+					<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+					<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
+					<PredictiveCruiseControl>1,2</PredictiveCruiseControl>
+				</ADAS>	
+				<Components xsi:type="Components_Conventional_CompletedBusType">					
+					<Auxiliaries>
+						<Data xsi:type="AUX_Conventional_CompletedBusType">
+							<ElectricSystem>
+								<LEDLights>
+									<Interiorlights>true</Interiorlights>	
+									<Dayrunninglights>true</Dayrunninglights>													
+								</LEDLights>
+							</ElectricSystem>
+							<HVAC>
+								<SystemConfiguration>1</SystemConfiguration>
+								<HeatPumpTypeDriverCompartment>
+									<Cooling>not applicable</Cooling>
+									<Heating>not applicable</Heating>
+								</HeatPumpTypeDriverCompartment>
+								<HeatPumpTypePassengerCompartment>
+									<Cooling>non R-744 3-stage</Cooling>
+									<Heating>none</Heating>
+								</HeatPumpTypePassengerCompartment>
+								<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
+								<DoubleGlazing>false</DoubleGlazing>
+								<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+								<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>	
+							</HVAC>
+						</Data>
+					</Auxiliaries>
+				</Components>		
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-02-13T07:20:08.0187663Z</Date>
@@ -764,42 +768,39 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 				</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-3-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 3</v2.8:Manufacturer>
-				<v2.8:ManufacturerAddress>Intermediate Manufacturer Address 3</v2.8:ManufacturerAddress>
-				<v2.8:VIN>VEH-2234567866</v2.8:VIN>
-				<v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date>
-				<v2.8:LegislativeCategory>M3</v2.8:LegislativeCategory>				
-				<v2.8:TechnicalPermissibleMaximumLadenMass>20000</v2.8:TechnicalPermissibleMaximumLadenMass>
-				<v2.8:NgTankSystem>Liquefied</v2.8:NgTankSystem>				
-				<v2.8:ClassBus>B</v2.8:ClassBus>			
-				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
-				<v2.8: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>
-				</v2.8:ADAS>				
-				<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">
-							<v2.8:ElectricSystem>
-								<v2.8:LEDLights>
-									<v2.8:Positionlights>false</v2.8:Positionlights>
-									<v2.8:Brakelights>false</v2.8:Brakelights>
-									<v2.8:Headlights>true</v2.8:Headlights>									
-								</v2.8:LEDLights>
-							</v2.8:ElectricSystem>
-							<v2.8:HVAC>
-								<v2.8:WaterElectricHeater>false</v2.8:WaterElectricHeater>
-								<v2.8:AirElectricHeater>false</v2.8:AirElectricHeater>
-								<v2.8:OtherHeatingTechnology>true</v2.8:OtherHeatingTechnology>							
-							</v2.8:HVAC>
-						</v2.8:Data>
-					</v2.8:Auxiliaries>
-				</v2.8:Components>
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<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 xsi:type="ADAS_Conventional_Type">
+					<EngineStopStart>true</EngineStopStart>
+					<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+					<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
+					<PredictiveCruiseControl>1,2</PredictiveCruiseControl>
+					<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
+				</ADAS>				
+				<Components xsi:type="Components_Conventional_CompletedBusType">
+					<Auxiliaries>
+						<Data xsi:type="AUX_Conventional_CompletedBusType">
+							<ElectricSystem>
+								<LEDLights>
+									<Positionlights>false</Positionlights>
+									<Brakelights>false</Brakelights>
+									<Headlights>true</Headlights>									
+								</LEDLights>
+							</ElectricSystem>
+							<HVAC>
+							</HVAC>
+						</Data>
+					</Auxiliaries>
+				</Components>
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-03-13T07:20:08.0187663Z</Date>
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 2fee2955707e5ff98e191f12a782bed7ed190de4..970ff8c1904d18b062c511d4ad0887c3ad2c6aa6 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
@@ -2,11 +2,11 @@
 <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:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" 
-xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"  
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"  
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -651,24 +651,24 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-1-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 1</v2.8:Manufacturer>
-				<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:Model>Intermediate Model 1</v2.8:Model>
-				<v2.8:NgTankSystem>Compressed</v2.8:NgTankSystem>
-				<v2.8:NumberPassengerSeatsLowerDeck>12</v2.8:NumberPassengerSeatsLowerDeck>
-				<v2.8:NumberPassengersStandingLowerDeck>5</v2.8:NumberPassengersStandingLowerDeck>
-				<v2.8:NumberPassengerSeatsUpperDeck>30</v2.8:NumberPassengerSeatsUpperDeck>
-				<v2.8:NumberPassengersStandingUpperDeck>4</v2.8:NumberPassengersStandingUpperDeck>
-				<v2.8:LowEntry>true</v2.8:LowEntry>
-				<v2.8:HeightIntegratedBody>3000</v2.8:HeightIntegratedBody>
-				<v2.8:VehicleLength>12000</v2.8:VehicleLength>
-				<v2.8:VehicleWidth>2500</v2.8:VehicleWidth>
-				<v2.8:EntranceHeight>2500</v2.8:EntranceHeight>
-				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
+				<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
+				<VIN>VEH-1234567890</VIN>
+				<Date>2018-02-15T11:00:00Z</Date>
+				<Model>Intermediate Model 1</Model>
+				<NgTankSystem>Compressed</NgTankSystem>
+				<NumberPassengerSeatsLowerDeck>12</NumberPassengerSeatsLowerDeck>
+				<NumberPassengersStandingLowerDeck>5</NumberPassengersStandingLowerDeck>
+				<NumberPassengerSeatsUpperDeck>30</NumberPassengerSeatsUpperDeck>
+				<NumberPassengersStandingUpperDeck>4</NumberPassengersStandingUpperDeck>
+				<LowEntry>true</LowEntry>
+				<HeightIntegratedBody>3000</HeightIntegratedBody>
+				<VehicleLength>12000</VehicleLength>
+				<VehicleWidth>2500</VehicleWidth>
+				<EntranceHeight>2500</EntranceHeight>
+				<VehicleDeclarationType>interim</VehicleDeclarationType>
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-01-12T07:20:08.0187663Z</Date>
@@ -697,45 +697,49 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-2-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 2</v2.8:Manufacturer>
-				<v2.8:ManufacturerAddress>Intermediate Manufacturer Address 2</v2.8:ManufacturerAddress>
-				<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:BodyworkCode>CB</v2.8:BodyworkCode>
-				<v2.8:DoorDriveTechnology>mixed</v2.8:DoorDriveTechnology>				
-				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>				
-				<v2.8: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.8:ADAS>	
-				<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">
-							<v2.8:ElectricSystem>
-								<v2.8:LEDLights>
-									<v2.8:Interiorlights>true</v2.8:Interiorlights>	
-									<v2.8:Dayrunninglights>true</v2.8:Dayrunninglights>													
-								</v2.8:LEDLights>
-							</v2.8:ElectricSystem>
-							<v2.8:HVAC>
-								<v2.8:SystemConfiguration>1</v2.8:SystemConfiguration>
-								<v2.8:HeatPumpTypeDriverCompartment>non R-744 2-stage</v2.8:HeatPumpTypeDriverCompartment>
-								<v2.8:HeatPumpModeDriverCompartment>heating</v2.8:HeatPumpModeDriverCompartment>
-								<v2.8:HeatPumpTypePassengerCompartment>non R-744 3-stage</v2.8:HeatPumpTypePassengerCompartment>
-								<v2.8:HeatPumpModePassengerCompartment>cooling</v2.8:HeatPumpModePassengerCompartment>
-								<v2.8:AuxiliaryHeaterPower>50</v2.8:AuxiliaryHeaterPower>
-								<v2.8:DoubleGlazing>false</v2.8:DoubleGlazing>
-								<v2.8:AdjustableAuxiliaryHeater>true</v2.8:AdjustableAuxiliaryHeater>
-								<v2.8:SeparateAirDistributionDucts>false</v2.8:SeparateAirDistributionDucts>	
-							</v2.8:HVAC>
-						</v2.8:Data>
-					</v2.8:Auxiliaries>
-				</v2.8:Components>		
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
+				<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
+				<VIN>VEH-2234567890</VIN>
+				<Date>2021-02-13T07:20:08.0187663Z</Date>
+				<CorrectedActualMass>15000</CorrectedActualMass>				
+				<BodyworkCode>CB</BodyworkCode>
+				<DoorDriveTechnology>mixed</DoorDriveTechnology>				
+				<VehicleDeclarationType>interim</VehicleDeclarationType>				
+				<ADAS xsi:type="ADAS_Conventional_Type">
+					<EngineStopStart>true</EngineStopStart>
+					<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+					<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
+					<PredictiveCruiseControl>1,2</PredictiveCruiseControl>
+				</ADAS>	
+				<Components xsi:type="Components_Conventional_CompletedBusType">					
+					<Auxiliaries>
+						<Data xsi:type="AUX_Conventional_CompletedBusType">
+							<ElectricSystem>
+								<LEDLights>
+									<Interiorlights>true</Interiorlights>	
+									<Dayrunninglights>true</Dayrunninglights>													
+								</LEDLights>
+							</ElectricSystem>
+							<HVAC>
+								<SystemConfiguration>1</SystemConfiguration>
+								<HeatPumpTypeDriverCompartment>
+									<Cooling>none</Cooling>
+									<Heating>non R-744 2-stage</Heating>
+								</HeatPumpTypeDriverCompartment>
+								<HeatPumpTypePassengerCompartment>
+									<Cooling>non R-744 3-stage</Cooling>
+									<Heating>none</Heating>
+								</HeatPumpTypePassengerCompartment>
+								<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
+								<DoubleGlazing>false</DoubleGlazing>
+								<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+								<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>	
+							</HVAC>
+						</Data>
+					</Auxiliaries>
+				</Components>		
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-02-13T07:20:08.0187663Z</Date>
@@ -764,37 +768,37 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 				</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-3-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 3</v2.8:Manufacturer>
-				<v2.8:ManufacturerAddress>Intermediate Manufacturer Address 3</v2.8:ManufacturerAddress>
-				<v2.8:VIN>VEH-2234567866</v2.8:VIN>
-				<v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date>
-				<v2.8:LegislativeCategory>M3</v2.8:LegislativeCategory>				
-				<v2.8:TechnicalPermissibleMaximumLadenMass>20000</v2.8:TechnicalPermissibleMaximumLadenMass>				
-				<v2.8:NgTankSystem>Liquefied</v2.8:NgTankSystem>				
-				<v2.8:ClassBus>B</v2.8:ClassBus>			
-				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
-				<v2.8: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>
-				</v2.8:ADAS>				
-				<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">
-							<v2.8:ElectricSystem>
-								<v2.8:LEDLights>
-									<v2.8:Positionlights>false</v2.8:Positionlights>
-									<v2.8:Brakelights>false</v2.8:Brakelights>
-									<v2.8:Headlights>true</v2.8:Headlights>									
-								</v2.8:LEDLights>
-							</v2.8:ElectricSystem>
-						</v2.8:Data>
-					</v2.8:Auxiliaries>
-				</v2.8:Components>
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<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 xsi:type="ADAS_Conventional_Type">
+					<EngineStopStart>true</EngineStopStart>
+					<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+					<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
+					<PredictiveCruiseControl>1,2</PredictiveCruiseControl>
+					<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
+				</ADAS>				
+				<Components  xsi:type="Components_Conventional_CompletedBusType">
+					<Auxiliaries>
+						<Data xsi:type="AUX_Conventional_CompletedBusType">
+							<ElectricSystem>
+								<LEDLights>
+									<Positionlights>false</Positionlights>
+									<Brakelights>false</Brakelights>
+									<Headlights>true</Headlights>									
+								</LEDLights>
+							</ElectricSystem>
+						</Data>
+					</Auxiliaries>
+				</Components>
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-03-13T07:20:08.0187663Z</Date>
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 aa48d6f8c47bd231f6c18be5065f030b55e6ace5..02fc55554ce9506fca4478c9e633d6b156dfeccf 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
@@ -2,11 +2,11 @@
 <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:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" 
-xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" 
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -651,24 +651,24 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-1-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 1</v2.8:Manufacturer>
-				<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:Model>Intermediate Model 1</v2.8:Model>
-				<v2.8:NgTankSystem>Compressed</v2.8:NgTankSystem>
-				<v2.8:NumberPassengerSeatsLowerDeck>12</v2.8:NumberPassengerSeatsLowerDeck>
-				<v2.8:NumberPassengersStandingLowerDeck>5</v2.8:NumberPassengersStandingLowerDeck>
-				<v2.8:NumberPassengerSeatsUpperDeck>30</v2.8:NumberPassengerSeatsUpperDeck>
-				<v2.8:NumberPassengersStandingUpperDeck>4</v2.8:NumberPassengersStandingUpperDeck>
-				<v2.8:LowEntry>true</v2.8:LowEntry>
-				<v2.8:HeightIntegratedBody>3000</v2.8:HeightIntegratedBody>
-				<v2.8:VehicleLength>12000</v2.8:VehicleLength>
-				<v2.8:VehicleWidth>2500</v2.8:VehicleWidth>
-				<v2.8:EntranceHeight>2500</v2.8:EntranceHeight>
-				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
+				<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
+				<VIN>VEH-1234567890</VIN>
+				<Date>2018-02-15T11:00:00Z</Date>
+				<Model>Intermediate Model 1</Model>
+				<NgTankSystem>Compressed</NgTankSystem>
+				<NumberPassengerSeatsLowerDeck>12</NumberPassengerSeatsLowerDeck>
+				<NumberPassengersStandingLowerDeck>5</NumberPassengersStandingLowerDeck>
+				<NumberPassengerSeatsUpperDeck>30</NumberPassengerSeatsUpperDeck>
+				<NumberPassengersStandingUpperDeck>4</NumberPassengersStandingUpperDeck>
+				<LowEntry>true</LowEntry>
+				<HeightIntegratedBody>3000</HeightIntegratedBody>
+				<VehicleLength>12000</VehicleLength>
+				<VehicleWidth>2500</VehicleWidth>
+				<EntranceHeight>2500</EntranceHeight>
+				<VehicleDeclarationType>interim</VehicleDeclarationType>
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-01-12T07:20:08.0187663Z</Date>
@@ -697,45 +697,49 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-2-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 2</v2.8:Manufacturer>
-				<v2.8:ManufacturerAddress>Intermediate Manufacturer Address 2</v2.8:ManufacturerAddress>
-				<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:BodyworkCode>CB</v2.8:BodyworkCode>
-				<v2.8:DoorDriveTechnology>mixed</v2.8:DoorDriveTechnology>				
-				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>				
-				<v2.8: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.8:ADAS>	
-				<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">
-							<v2.8:ElectricSystem>
-								<v2.8:LEDLights>
-									<v2.8:Interiorlights>true</v2.8:Interiorlights>	
-									<v2.8:Dayrunninglights>true</v2.8:Dayrunninglights>													
-								</v2.8:LEDLights>
-							</v2.8:ElectricSystem>
-							<v2.8:HVAC>
-								<v2.8:SystemConfiguration>1</v2.8:SystemConfiguration>
-								<v2.8:HeatPumpTypeDriverCompartment>non R-744 2-stage</v2.8:HeatPumpTypeDriverCompartment>
-								<v2.8:HeatPumpModeDriverCompartment>heating</v2.8:HeatPumpModeDriverCompartment>
-								<v2.8:HeatPumpTypePassengerCompartment>non R-744 3-stage</v2.8:HeatPumpTypePassengerCompartment>
-								<v2.8:HeatPumpModePassengerCompartment>cooling</v2.8:HeatPumpModePassengerCompartment>
-								<v2.8:AuxiliaryHeaterPower>50</v2.8:AuxiliaryHeaterPower>
-								<v2.8:DoubleGlazing>false</v2.8:DoubleGlazing>
-								<v2.8:AdjustableAuxiliaryHeater>true</v2.8:AdjustableAuxiliaryHeater>
-								<v2.8:SeparateAirDistributionDucts>false</v2.8:SeparateAirDistributionDucts>	
-							</v2.8:HVAC>
-						</v2.8:Data>
-					</v2.8:Auxiliaries>
-				</v2.8:Components>		
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
+				<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
+				<VIN>VEH-2234567890</VIN>
+				<Date>2021-02-13T07:20:08.0187663Z</Date>
+				<CorrectedActualMass>15000</CorrectedActualMass>				
+				<BodyworkCode>CB</BodyworkCode>
+				<DoorDriveTechnology>mixed</DoorDriveTechnology>				
+				<VehicleDeclarationType>interim</VehicleDeclarationType>				
+				<ADAS xsi:type="ADAS_Conventional_Type">
+					<EngineStopStart>true</EngineStopStart>
+					<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+					<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
+					<PredictiveCruiseControl>1,2</PredictiveCruiseControl>
+				</ADAS>	
+				<Components xsi:type="Components_Conventional_CompletedBusType">					
+					<Auxiliaries>
+						<Data xsi:type="AUX_Conventional_CompletedBusType">
+							<ElectricSystem>
+								<LEDLights>
+									<Interiorlights>true</Interiorlights>	
+									<Dayrunninglights>true</Dayrunninglights>													
+								</LEDLights>
+							</ElectricSystem>
+							<HVAC>
+								<SystemConfiguration>1</SystemConfiguration>
+								<HeatPumpTypeDriverCompartment>
+									<Cooling>none</Cooling>
+									<Heating>non R-744 2-stage</Heating>
+								</HeatPumpTypeDriverCompartment>
+								<HeatPumpTypePassengerCompartment>
+									<Cooling>non R-744 3-stage</Cooling>
+									<Heating>none</Heating>
+								</HeatPumpTypePassengerCompartment>
+								<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
+								<DoubleGlazing>false</DoubleGlazing>
+								<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+								<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>	
+							</HVAC>
+						</Data>
+					</Auxiliaries>
+				</Components>		
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-02-13T07:20:08.0187663Z</Date>
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 fb2e80fe11d5fc899f937767d1e5af4f0225a403..2566c5713dfa9c84758dffe1b197ada3480ed5f2 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
@@ -2,11 +2,11 @@
 <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:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" 
-xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" 
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -651,18 +651,18 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-1-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 1</v2.8:Manufacturer>
-				<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: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"/>
-					</v2.8:Auxiliaries>
-				</v2.8:Components>
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
+				<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
+				<VIN>VEH-1234567890</VIN>
+				<Date>2018-02-15T11:00:00Z</Date>
+				<VehicleDeclarationType>interim</VehicleDeclarationType>
+				<Components xsi:type="Components_Conventional_CompletedBusType">
+					<Auxiliaries>
+						<Data xsi:type="AUX_Conventional_CompletedBusType"/>
+					</Auxiliaries>
+				</Components>
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-01-12T07:20:08.0187663Z</Date>
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 598780c234753ef3b92e48189a3a9d4ac1a45078..38f9eea853ac0a54c8d2a4563ab274eda2af2a79 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
@@ -2,11 +2,11 @@
 <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:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" 
-xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" 
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -651,24 +651,24 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-1-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 1</v2.8:Manufacturer>
-				<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:Model>Intermediate Model 1</v2.8:Model>
-				<v2.8:NgTankSystem>Compressed</v2.8:NgTankSystem>
-				<v2.8:NumberPassengerSeatsLowerDeck>12</v2.8:NumberPassengerSeatsLowerDeck>
-				<v2.8:NumberPassengersStandingLowerDeck>5</v2.8:NumberPassengersStandingLowerDeck>
-				<v2.8:NumberPassengerSeatsUpperDeck>30</v2.8:NumberPassengerSeatsUpperDeck>
-				<v2.8:NumberPassengersStandingUpperDeck>4</v2.8:NumberPassengersStandingUpperDeck>
-				<v2.8:LowEntry>true</v2.8:LowEntry>
-				<v2.8:HeightIntegratedBody>3000</v2.8:HeightIntegratedBody>
-				<v2.8:VehicleLength>12000</v2.8:VehicleLength>
-				<v2.8:VehicleWidth>2500</v2.8:VehicleWidth>
-				<v2.8:EntranceHeight>2500</v2.8:EntranceHeight>
-				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle"  xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
+				<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
+				<VIN>VEH-1234567890</VIN>
+				<Date>2018-02-15T11:00:00Z</Date>
+				<Model>Intermediate Model 1</Model>
+				<NgTankSystem>Compressed</NgTankSystem>
+				<NumberPassengerSeatsLowerDeck>12</NumberPassengerSeatsLowerDeck>
+				<NumberPassengersStandingLowerDeck>5</NumberPassengersStandingLowerDeck>
+				<NumberPassengerSeatsUpperDeck>30</NumberPassengerSeatsUpperDeck>
+				<NumberPassengersStandingUpperDeck>4</NumberPassengersStandingUpperDeck>
+				<LowEntry>true</LowEntry>
+				<HeightIntegratedBody>3000</HeightIntegratedBody>
+				<VehicleLength>12000</VehicleLength>
+				<VehicleWidth>2500</VehicleWidth>
+				<EntranceHeight>2500</EntranceHeight>
+				<VehicleDeclarationType>interim</VehicleDeclarationType>
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-01-12T07:20:08.0187663Z</Date>
@@ -697,34 +697,34 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-2-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 2</v2.8:Manufacturer>
-				<v2.8:ManufacturerAddress>Intermediate Manufacturer Address 2</v2.8:ManufacturerAddress>
-				<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:BodyworkCode>CB</v2.8:BodyworkCode>
-				<v2.8:DoorDriveTechnology>mixed</v2.8:DoorDriveTechnology>				
-				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>				
-				<v2.8: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.8:ADAS>	
-				<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">
-							<v2.8:ElectricSystem>
-								<v2.8:LEDLights>												
-								</v2.8:LEDLights>
-							</v2.8:ElectricSystem>
-							<v2.8:HVAC>	
-							</v2.8:HVAC>
-						</v2.8:Data>
-					</v2.8:Auxiliaries>
-				</v2.8:Components>		
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle"  xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
+				<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
+				<VIN>VEH-2234567890</VIN>
+				<Date>2021-02-13T07:20:08.0187663Z</Date>
+				<CorrectedActualMass>15000</CorrectedActualMass>
+				<BodyworkCode>CB</BodyworkCode>
+				<DoorDriveTechnology>mixed</DoorDriveTechnology>				
+				<VehicleDeclarationType>interim</VehicleDeclarationType>				
+				<ADAS xsi:type="ADAS_Conventional_Type">
+					<EngineStopStart>true</EngineStopStart>
+					<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+					<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
+					<PredictiveCruiseControl>1,2</PredictiveCruiseControl>
+				</ADAS>	
+				<Components xsi:type="Components_Conventional_CompletedBusType">					
+					<Auxiliaries>
+						<Data xsi:type="AUX_Conventional_CompletedBusType">
+							<ElectricSystem>
+								<LEDLights>												
+								</LEDLights>
+							</ElectricSystem>
+							<HVAC>	
+							</HVAC>
+						</Data>
+					</Auxiliaries>
+				</Components>		
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-02-13T07:20:08.0187663Z</Date>
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 e7c8c66e624966c33f067f9cefec6ee4143526fc..6719cd32560e3ac07dd7d4f9e4b1467743542816 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 v:\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>
				<LegislativeCategory>M3</LegislativeCategory>
				<ChassisConfiguration>Bus</ChassisConfiguration>
				<AxleConfiguration>8x2</AxleConfiguration>
				<Articulated>true</Articulated>
				<TechnicalPermissibleMaximumLadenMass>4000</TechnicalPermissibleMaximumLadenMass>
				<IdlingSpeed>600</IdlingSpeed>
				<RetarderType>Transmission Output Retarder</RetarderType>
				<RetarderRatio>1.000</RetarderRatio>
				<AngledriveType>None</AngledriveType>
				<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
				<ADAS xsi:type="v2.3:AdvancedDriverAssistantSystemsType">
					<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
					<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
					<v2.3:EcoRollWithEngineStop>true</v2.3:EcoRollWithEngineStop>
					<v2.3:PredictiveCruiseControl>1,2,3</v2.3:PredictiveCruiseControl>
					<v2.3:APTEcoRollReleaseLockupClutch>false</v2.3:APTEcoRollReleaseLockupClutch>
				</ADAS>
				<TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
					<tcl:Entry gear="6" maxTorque="1800"/>
					<tcl:Entry gear="1" maxTorque="2500"/>
					<tcl:Entry gear="12" maxTorque="1900"/>
				</TorqueLimits>
				<Components xsi:type="VehicleComponentsPIFType">
					<Engine>
						<Data xsi:type="EngineDataPIFType">
							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
							<Model>Bus 6x2</Model>
							<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
							<Date>2017-02-15T11:00:00Z</Date>
							<AppVersion>VectoEngine x.y</AppVersion>
							<Displacement>12730</Displacement>
							<RatedSpeed>1800</RatedSpeed>
							<RatedPower>325032</RatedPower>
							<MaxEngineTorque>2134</MaxEngineTorque>
							<WHRType>
								<v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
								<v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
								<v2.3:ElectricalOutput>true</v2.3:ElectricalOutput>
							</WHRType>
							<Mode>
								<IdlingSpeed>600</IdlingSpeed>
								<FullLoadAndDragCurve>
									<Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00"/>
									<Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00"/>
									<Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00"/>
									<Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00"/>
									<Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00"/>
									<Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00"/>
									<Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00"/>
									<Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00"/>
									<Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00"/>
									<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00"/>
								</FullLoadAndDragCurve>
								<Fuels>
									<FuelType>Diesel CI</FuelType>
								</Fuels>
							</Mode>
						</Data>
					</Engine>
					<Transmission>
						<Data xsi:type="TransmissionDataPIFType">
							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
							<Model>Generic 40t Long Haul Truck Gearbox</Model>
							<MainCertificationMethod>Standard values</MainCertificationMethod>
							<CertificationNumber>Trans-5464sdf6sdf555</CertificationNumber>
							<Date>2017-01-11T11:00:00Z</Date>
							<AppVersion>3.0.1</AppVersion>
							<TransmissionType>AMT</TransmissionType>
							<Gears xsi:type="TransmissionGearsPIFType">
								<Gear number="1">
									<Ratio>14.930</Ratio>
									<MaxTorque>1900</MaxTorque>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="2">
									<Ratio>11.640</Ratio>
									<MaxTorque>1900</MaxTorque>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="3">
									<Ratio>9.020</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="4">
									<Ratio>7.040</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="5">
									<Ratio>5.640</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="6">
									<Ratio>4.400</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="7">
									<Ratio>3.390</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="8">
									<Ratio>2.650</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="9">
									<Ratio>2.050</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="10">
									<Ratio>1.600</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="11">
									<Ratio>1.280</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="12">
									<Ratio>1.000</Ratio>
								</Gear>
							</Gears>
						</Data>
					</Transmission>
					<TorqueConverter>
						<Data xsi:type="TorqueConverterDataPIFType">
							<Manufacturer>Generic Torque Converter</Manufacturer>
							<Model>Generic Torque Converter Model</Model>
							<CertificationMethod>Standard values</CertificationMethod>
							<CertificationNumber>Torq-4546565455</CertificationNumber>
							<Date>2018-01-12T12:00:00Z</Date>
							<AppVersion>3.0.3</AppVersion>
							<Characteristics>
								<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
								<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
								<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
							</Characteristics>
						</Data>
					</TorqueConverter>
					<Angledrive>
						<Data xsi:type="AngledriveDataPIFType">
							<Manufacturer>Generic Angledrive</Manufacturer>
							<Model>Generic Angledrive Model</Model>
							<CertificationMethod>Standard values</CertificationMethod>
							<CertificationNumber>ANG-Z64665456654</CertificationNumber>
							<Date>2019-01-12T12:00:00Z</Date>
							<AppVersion>3.2.3</AppVersion>
							<Ratio>20</Ratio>
						</Data>
					</Angledrive>
					<Axlegear>
						<Data xsi:type="AxlegearDataPIFType">
							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
							<Model>Generic 40t Long Haul Truck AxleGear</Model>
							<CertificationMethod>Standard values</CertificationMethod>
							<CertificationNumber>AX-6654888s5f4</CertificationNumber>
							<Date>2017-01-11T11:00:00Z</Date>
							<AppVersion>3.0.1</AppVersion>
							<LineType>Single portal axle</LineType>
							<Ratio>2.590</Ratio>
						</Data>
					</Axlegear>
					<AxleWheels>
						<Data xsi:type="AxleWheelsDataPIFType">
							<Axles>
								<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
									<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
									<v2.0:TwinTyres>false</v2.0:TwinTyres>
									<v2.0:Steered>true</v2.0:Steered>
									<v2.0:Tyre>
										<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
											<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
											<v2.0:Model>Generic Wheel</v2.0:Model>
											<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
											<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
											<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
											<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
											<v2.0:RRCDeclared>0.0055</v2.0:RRCDeclared>
											<v2.0:FzISO>31300</v2.0:FzISO>
										</v2.0:Data>
										<v2.0:Signature>
											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
												<di:Transforms>
													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
												</di:Transforms>
												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
												<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
											</di:Reference>
										</v2.0:Signature>
									</v2.0:Tyre>
								</Axle>
								<Axle axleNumber="2" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
									<v2.0:AxleType>VehicleDriven</v2.0:AxleType>
									<v2.0:TwinTyres>true</v2.0:TwinTyres>
									<v2.0:Steered>false</v2.0:Steered>
									<v2.0:Tyre>
										<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
											<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
											<v2.0:Model>Generic Wheel</v2.0:Model>
											<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
											<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
											<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
											<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
											<v2.0:RRCDeclared>0.0063</v2.0:RRCDeclared>
											<v2.0:FzISO>31300</v2.0:FzISO>
										</v2.0:Data>
										<v2.0:Signature>
											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
												<di:Transforms>
													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
												</di:Transforms>
												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
												<di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
											</di:Reference>
										</v2.0:Signature>
									</v2.0:Tyre>
								</Axle>
								<Axle axleNumber="3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
									<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
									<v2.0:TwinTyres>false</v2.0:TwinTyres>
									<v2.0:Steered>false</v2.0:Steered>
									<v2.0:Tyre>
										<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
											<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
											<v2.0:Model>Generic Wheel</v2.0:Model>
											<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
											<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
											<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
											<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
											<v2.0:RRCDeclared>0.0055</v2.0:RRCDeclared>
											<v2.0:FzISO>31300</v2.0:FzISO>
										</v2.0:Data>
										<v2.0:Signature>
											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
												<di:Transforms>
													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
												</di:Transforms>
												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
												<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
											</di:Reference>
										</v2.0:Signature>
									</v2.0:Tyre>
								</Axle>
							</Axles>
						</Data>
					</AxleWheels>
					<Auxiliaries>
						<Data xsi:type="AuxiliaryDataPIFType">
							<Fan>
								<Technology>Hydraulic driven - Constant displacement pump</Technology>
							</Fan>
							<SteeringPump>
								<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
							</SteeringPump>
							<ElectricSystem>
								<AlternatorTechnology>smart</AlternatorTechnology>
								<SmartAlternator>
									<RatedCurrent>10</RatedCurrent>
									<RatedVoltage>12</RatedVoltage>
									</SmartAlternator>
									<Battery>
									<BatteryTechnology>lead-acid battery – conventional</BatteryTechnology>
									<RatedCapacity>50</RatedCapacity>
									<NominalVoltage>12</NominalVoltage>
									</Battery>
									<Capacitor>
										<CapacitorTechnology></CapacitorTechnology>
										<RatedCapacitance>30</RatedCapacitance>
										<RatedVoltage>3</RatedVoltage>
									</Capacitor>
								<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
							</ElectricSystem>
							<PneumaticSystem>
								<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
								<CompressorDrive>electrically</CompressorDrive>
								<Clutch>none</Clutch>
								<CompressorRatio>1.000</CompressorRatio>
								<SmartCompressionSystem>true</SmartCompressionSystem>
								<SmartRegenerationSystem>false</SmartRegenerationSystem>
								<AirsuspensionControl>electronically</AirsuspensionControl>
								<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
							</PneumaticSystem>
							<HVAC>
								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
								<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
							</HVAC>
						</Data>
					</Auxiliaries>
				</Components>
			</Vehicle>
			<InputDataSignature>
				<di:Reference URI="#VEH-PrimaryBus_SmartPS">
					<di:Transforms>
						<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
						<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
					</di:Transforms>
					<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
					<di:DigestValue>uqcFIXtDYxvl513ruiYYJCrV1fIiyw37t8vJhg4xxoo=</di:DigestValue>
				</di:Reference>
			</InputDataSignature>
			<ManufacturerRecordSignature>
				<di:Reference URI="#RESULT-5f30c7fe665a47938f6b">
					<di:Transforms>
						<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
						<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
					</di:Transforms>
					<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
					<di:DigestValue>KUpFCKh1bu/YPwYj36kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
				</di:Reference>
			</ManufacturerRecordSignature>
			<Results>
				<Status>success</Status>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
						<Payload unit="kg">1352.52</Payload>
						<PassengerCount>19.89</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">21.22359</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1555.73</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
						<Payload unit="kg">6762.60</Payload>
						<PassengerCount>99.45</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">25.40945</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1862.57</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
						<Payload unit="kg">1352.52</Payload>
						<PassengerCount>19.89</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">16.74101</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1227.15</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
						<Payload unit="kg">6762.60</Payload>
						<PassengerCount>99.45</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">20.24221</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1483.80</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
						<Payload unit="kg">1352.52</Payload>
						<PassengerCount>19.89</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">14.34578</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1051.58</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
						<Payload unit="kg">6762.60</Payload>
						<PassengerCount>99.45</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">17.60016</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1290.13</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
						<Payload unit="kg">1294.51</Payload>
						<PassengerCount>18.23</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">11.82313</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">866.66</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
						<Payload unit="kg">4236.57</Payload>
						<PassengerCount>59.67</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">13.24283</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">970.73</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
						<Payload unit="kg">1578.29</Payload>
						<PassengerCount>23.21</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">22.72091</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1665.49</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
						<Payload unit="kg">7891.43</Payload>
						<PassengerCount>116.05</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">27.95930</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">2049.48</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
						<Payload unit="kg">1578.29</Payload>
						<PassengerCount>23.21</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">17.90756</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1312.66</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
						<Payload unit="kg">7891.43</Payload>
						<PassengerCount>116.05</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">22.23796</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1630.09</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
						<Payload unit="kg">1578.29</Payload>
						<PassengerCount>23.21</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">15.28035</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1120.08</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
						<Payload unit="kg">7891.43</Payload>
						<PassengerCount>116.05</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">19.26201</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1411.95</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16467.68</TotalVehicleMass>
						<Payload unit="kg">1254.68</Payload>
						<PassengerCount>17.67</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">11.93701</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">875.01</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
						<Payload unit="kg">4106.21</Payload>
						<PassengerCount>57.83</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">13.32341</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">976.63</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16490.49</TotalVehicleMass>
						<Payload unit="kg">1277.49</Payload>
						<PassengerCount>17.99</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">8.71847</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">639.08</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">18406.72</TotalVehicleMass>
						<Payload unit="kg">3193.72</Payload>
						<PassengerCount>44.98</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">9.20255</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">674.57</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">19588.08</TotalVehicleMass>
						<Payload unit="kg">1738.08</Payload>
						<PassengerCount>24.48</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">13.58335</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">995.69</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
						<Payload unit="kg">5793.60</Payload>
						<PassengerCount>81.60</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">15.56740</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1141.12</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">19703.95</TotalVehicleMass>
						<Payload unit="kg">1853.95</Payload>
						<PassengerCount>26.11</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">9.82937</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">720.51</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22484.88</TotalVehicleMass>
						<Payload unit="kg">4634.88</Payload>
						<PassengerCount>65.28</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">10.56728</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">774.60</CO2>
				</Result>
			</Results>
			<ApplicationInformation>
				<SimulationToolVersion>String</SimulationToolVersion>
				<Date>2017-01-01T00:00:00Z</Date>
			</ApplicationInformation>
		</Data>
		<Signature>
			<di:Reference URI="#PIF-d10aff76c5d149948046">
				<di:Transforms>
					<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
					<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
				</di:Transforms>
				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
			</di:Reference>
		</Signature>
	</PrimaryVehicle>
</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.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
	<PrimaryVehicle>
		<Data id="text" xsi:type="PrimaryVehicleDataType">
			<Vehicle xsi:type="VehiclePIFType">
				<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
				<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
				<Model>Generic Model</Model>
				<VIN>VEH-1234567890_nonSmart-ESS</VIN>
				<Date>2017-02-15T11:00:00Z</Date>
				<LegislativeCategory>M3</LegislativeCategory>
				<ChassisConfiguration>Bus</ChassisConfiguration>
				<AxleConfiguration>8x2</AxleConfiguration>
				<Articulated>true</Articulated>
				<TechnicalPermissibleMaximumLadenMass>4000</TechnicalPermissibleMaximumLadenMass>
				<IdlingSpeed>600</IdlingSpeed>
				<RetarderType>Transmission Output Retarder</RetarderType>
				<RetarderRatio>1.000</RetarderRatio>
				<AngledriveType>None</AngledriveType>
				<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
				<ADAS xsi:type="v2.3:AdvancedDriverAssistantSystemsType">
					<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
					<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
					<v2.3:EcoRollWithEngineStop>true</v2.3:EcoRollWithEngineStop>
					<v2.3:PredictiveCruiseControl>1,2,3</v2.3:PredictiveCruiseControl>
					<v2.3:APTEcoRollReleaseLockupClutch>false</v2.3:APTEcoRollReleaseLockupClutch>
				</ADAS>
				<TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
					<tcl:Entry gear="6" maxTorque="1800"/>
					<tcl:Entry gear="1" maxTorque="2500"/>
					<tcl:Entry gear="12" maxTorque="1900"/>
				</TorqueLimits>
				<Components xsi:type="VehicleComponentsPIFType">
					<Engine>
						<Data xsi:type="EngineDataPIFType">
							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
							<Model>Bus 6x2</Model>
							<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
							<Date>2017-02-15T11:00:00Z</Date>
							<AppVersion>VectoEngine x.y</AppVersion>
							<Displacement>12730</Displacement>
							<RatedSpeed>1800</RatedSpeed>
							<RatedPower>325032</RatedPower>
							<MaxEngineTorque>2134</MaxEngineTorque>
							<WHRType>
								<v2.3:MechanicalOutputICE>false</v2.3:MechanicalOutputICE>
								<v2.3:MechanicalOutputDrivetrain>false</v2.3:MechanicalOutputDrivetrain>
								<v2.3:ElectricalOutput>true</v2.3:ElectricalOutput>
							</WHRType>
							<Mode>
								<IdlingSpeed>600</IdlingSpeed>
								<FullLoadAndDragCurve>
									<Entry engineSpeed="600.00" maxTorque="1188.00" dragTorque="-138.00"/>
									<Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00"/>
									<Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00"/>
									<Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00"/>
									<Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00"/>
									<Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00"/>
									<Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00"/>
									<Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00"/>
									<Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00"/>
									<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00"/>
								</FullLoadAndDragCurve>
								<Fuels>
									<FuelType>Diesel CI</FuelType>
								</Fuels>
							</Mode>
						</Data>
					</Engine>
					<Transmission>
						<Data xsi:type="TransmissionDataPIFType">
							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
							<Model>Generic 40t Long Haul Truck Gearbox</Model>
							<MainCertificationMethod>Standard values</MainCertificationMethod>
							<CertificationNumber>Trans-5464sdf6sdf555</CertificationNumber>
							<Date>2017-01-11T11:00:00Z</Date>
							<AppVersion>3.0.1</AppVersion>
							<TransmissionType>AMT</TransmissionType>
							<Gears xsi:type="TransmissionGearsPIFType">
								<Gear number="1">
									<Ratio>14.930</Ratio>
									<MaxTorque>1900</MaxTorque>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="2">
									<Ratio>11.640</Ratio>
									<MaxTorque>1900</MaxTorque>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="3">
									<Ratio>9.020</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="4">
									<Ratio>7.040</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="5">
									<Ratio>5.640</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="6">
									<Ratio>4.400</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="7">
									<Ratio>3.390</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="8">
									<Ratio>2.650</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="9">
									<Ratio>2.050</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="10">
									<Ratio>1.600</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="11">
									<Ratio>1.280</Ratio>
									<MaxSpeed>2000</MaxSpeed>
								</Gear>
								<Gear number="12">
									<Ratio>1.000</Ratio>
								</Gear>
							</Gears>
						</Data>
					</Transmission>
					<TorqueConverter>
						<Data xsi:type="TorqueConverterDataPIFType">
							<Manufacturer>Generic Torque Converter</Manufacturer>
							<Model>Generic Torque Converter Model</Model>
							<CertificationMethod>Standard values</CertificationMethod>
							<CertificationNumber>Torq-4546565455</CertificationNumber>
							<Date>2018-01-12T12:00:00Z</Date>
							<AppVersion>3.0.3</AppVersion>
							<Characteristics>
								<Entry speedRatio="0.0000" torqueRatio="1.00" inputTorqueRef="300.00"/>
								<Entry speedRatio="0.5000" torqueRatio="1.00" inputTorqueRef="200.00"/>
								<Entry speedRatio="0.9000" torqueRatio="0.90" inputTorqueRef="200.00"/>
							</Characteristics>
						</Data>
					</TorqueConverter>
					<Angledrive>
						<Data xsi:type="AngledriveDataPIFType">
							<Manufacturer>Generic Angledrive</Manufacturer>
							<Model>Generic Angledrive Model</Model>
							<CertificationMethod>Standard values</CertificationMethod>
							<CertificationNumber>ANG-Z64665456654</CertificationNumber>
							<Date>2019-01-12T12:00:00Z</Date>
							<AppVersion>3.2.3</AppVersion>
							<Ratio>20</Ratio>
						</Data>
					</Angledrive>
					<Axlegear>
						<Data xsi:type="AxlegearDataPIFType">
							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
							<Model>Generic 40t Long Haul Truck AxleGear</Model>
							<CertificationMethod>Standard values</CertificationMethod>
							<CertificationNumber>AX-6654888s5f4</CertificationNumber>
							<Date>2017-01-11T11:00:00Z</Date>
							<AppVersion>3.0.1</AppVersion>
							<LineType>Single portal axle</LineType>
							<Ratio>2.590</Ratio>
						</Data>
					</Axlegear>
					<AxleWheels>
						<Data xsi:type="AxleWheelsDataPIFType">
							<Axles>
								<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
									<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
									<v2.0:TwinTyres>false</v2.0:TwinTyres>
									<v2.0:Steered>true</v2.0:Steered>
									<v2.0:Tyre>
										<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
											<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
											<v2.0:Model>Generic Wheel</v2.0:Model>
											<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
											<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
											<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
											<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
											<v2.0:RRCDeclared>0.0055</v2.0:RRCDeclared>
											<v2.0:FzISO>31300</v2.0:FzISO>
										</v2.0:Data>
										<v2.0:Signature>
											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
												<di:Transforms>
													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
												</di:Transforms>
												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
												<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
											</di:Reference>
										</v2.0:Signature>
									</v2.0:Tyre>
								</Axle>
								<Axle axleNumber="2" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
									<v2.0:AxleType>VehicleDriven</v2.0:AxleType>
									<v2.0:TwinTyres>true</v2.0:TwinTyres>
									<v2.0:Steered>false</v2.0:Steered>
									<v2.0:Tyre>
										<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
											<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
											<v2.0:Model>Generic Wheel</v2.0:Model>
											<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
											<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
											<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
											<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
											<v2.0:RRCDeclared>0.0063</v2.0:RRCDeclared>
											<v2.0:FzISO>31300</v2.0:FzISO>
										</v2.0:Data>
										<v2.0:Signature>
											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
												<di:Transforms>
													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
												</di:Transforms>
												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
												<di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
											</di:Reference>
										</v2.0:Signature>
									</v2.0:Tyre>
								</Axle>
								<Axle axleNumber="3" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
									<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
									<v2.0:TwinTyres>false</v2.0:TwinTyres>
									<v2.0:Steered>false</v2.0:Steered>
									<v2.0:Tyre>
										<v2.0:Data id="WHL-5432198760-315-70-R22.5" xsi:type="v2.0:TyreDataDeclarationType">
											<v2.0:Manufacturer>Generic Wheels Manufacturer</v2.0:Manufacturer>
											<v2.0:Model>Generic Wheel</v2.0:Model>
											<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
											<v2.0:Date>2017-01-11T14:00:00Z</v2.0:Date>
											<v2.0:AppVersion>Tyre Generation App 1.0</v2.0:AppVersion>
											<v2.0:Dimension>315/70 R22.5</v2.0:Dimension>
											<v2.0:RRCDeclared>0.0055</v2.0:RRCDeclared>
											<v2.0:FzISO>31300</v2.0:FzISO>
										</v2.0:Data>
										<v2.0:Signature>
											<di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
												<di:Transforms>
													<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
													<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
												</di:Transforms>
												<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
												<di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
											</di:Reference>
										</v2.0:Signature>
									</v2.0:Tyre>
								</Axle>
							</Axles>
						</Data>
					</AxleWheels>
					<Auxiliaries>
						<Data xsi:type="AuxiliaryDataPIFType">
							<Fan>
								<Technology>Hydraulic driven - Constant displacement pump</Technology>
							</Fan>
							<SteeringPump>
								<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
							</SteeringPump>
							<ElectricSystem>
								<AlternatorTechnology>smart</AlternatorTechnology>
								<SmartAlternator>
									<RatedCurrent>10</RatedCurrent>
									<RatedVoltage>12</RatedVoltage>
									</SmartAlternator>
									<Battery>
									<BatteryTechnology>lead-acid battery – conventional</BatteryTechnology>
									<RatedCapacity>50</RatedCapacity>
									<NominalVoltage>12</NominalVoltage>
									</Battery>
									<Capacitor>
										<CapacitorTechnology></CapacitorTechnology>
										<RatedCapacitance>30</RatedCapacitance>
										<RatedVoltage>3</RatedVoltage>
									</Capacitor>
								<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
							</ElectricSystem>
							<PneumaticSystem>
								<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
								<CompressorDrive>electrically</CompressorDrive>
								<Clutch>none</Clutch>
								<CompressorRatio>1.000</CompressorRatio>
								<SmartCompressionSystem>true</SmartCompressionSystem>
								<SmartRegenerationSystem>false</SmartRegenerationSystem>
								<AirsuspensionControl>electronically</AirsuspensionControl>
								<PneumaticSCRReagentDosing>true</PneumaticSCRReagentDosing>
							</PneumaticSystem>
							<HVAC>
								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
								<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
							</HVAC>
						</Data>
					</Auxiliaries>
				</Components>
			</Vehicle>
			<InputDataSignature>
				<di:Reference URI="#VEH-PrimaryBus_SmartPS">
					<di:Transforms>
						<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
						<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
					</di:Transforms>
					<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
					<di:DigestValue>uqcFIXtDYxvl513ruiYYJCrV1fIiyw37t8vJhg4xxoo=</di:DigestValue>
				</di:Reference>
			</InputDataSignature>
			<ManufacturerRecordSignature>
				<di:Reference URI="#RESULT-5f30c7fe665a47938f6b">
					<di:Transforms>
						<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
						<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
					</di:Transforms>
					<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
					<di:DigestValue>KUpFCKh1bu/YPwYj36kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
				</di:Reference>
			</ManufacturerRecordSignature>
			<Results>
				<Status>success</Status>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
						<Payload unit="kg">1352.52</Payload>
						<PassengerCount>19.89</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">21.22359</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1555.73</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
						<Payload unit="kg">6762.60</Payload>
						<PassengerCount>99.45</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">25.40945</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1862.57</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
						<Payload unit="kg">1352.52</Payload>
						<PassengerCount>19.89</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">16.74101</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1227.15</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
						<Payload unit="kg">6762.60</Payload>
						<PassengerCount>99.45</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">20.24221</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1483.80</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
						<Payload unit="kg">1352.52</Payload>
						<PassengerCount>19.89</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">14.34578</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1051.58</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
						<Payload unit="kg">6762.60</Payload>
						<PassengerCount>99.45</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">17.60016</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1290.13</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">15469.51</TotalVehicleMass>
						<Payload unit="kg">1294.51</Payload>
						<PassengerCount>18.23</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">11.82313</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">866.66</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">18411.57</TotalVehicleMass>
						<Payload unit="kg">4236.57</Payload>
						<PassengerCount>59.67</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">13.24283</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">970.73</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
						<Payload unit="kg">1578.29</Payload>
						<PassengerCount>23.21</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">22.72091</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1665.49</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Heavy Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
						<Payload unit="kg">7891.43</Payload>
						<PassengerCount>116.05</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">27.95930</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">2049.48</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
						<Payload unit="kg">1578.29</Payload>
						<PassengerCount>23.21</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">17.90756</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1312.66</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Urban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
						<Payload unit="kg">7891.43</Payload>
						<PassengerCount>116.05</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">22.23796</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1630.09</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
						<Payload unit="kg">1578.29</Payload>
						<PassengerCount>23.21</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">15.28035</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1120.08</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P33DD</VehicleGroup>
					<Mission>Suburban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
						<Payload unit="kg">7891.43</Payload>
						<PassengerCount>116.05</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">19.26201</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1411.95</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16467.68</TotalVehicleMass>
						<Payload unit="kg">1254.68</Payload>
						<PassengerCount>17.67</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">11.93701</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">875.01</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
						<Payload unit="kg">4106.21</Payload>
						<PassengerCount>57.83</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">13.32341</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">976.63</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">16490.49</TotalVehicleMass>
						<Payload unit="kg">1277.49</Payload>
						<PassengerCount>17.99</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">8.71847</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">639.08</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34SD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">18406.72</TotalVehicleMass>
						<Payload unit="kg">3193.72</Payload>
						<PassengerCount>44.98</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">9.20255</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">674.57</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">19588.08</TotalVehicleMass>
						<Payload unit="kg">1738.08</Payload>
						<PassengerCount>24.48</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">13.58335</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">995.69</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Interurban</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
						<Payload unit="kg">5793.60</Payload>
						<PassengerCount>81.60</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">15.56740</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">1141.12</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">19703.95</TotalVehicleMass>
						<Payload unit="kg">1853.95</Payload>
						<PassengerCount>26.11</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">9.82937</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">720.51</CO2>
				</Result>
				<Result status="success">
					<VehicleGroup>P34DD</VehicleGroup>
					<Mission>Coach</Mission>
					<SimulationParameters>
						<TotalVehicleMass unit="kg">22484.88</TotalVehicleMass>
						<Payload unit="kg">4634.88</Payload>
						<PassengerCount>65.28</PassengerCount>
						<FuelMode>single fuel mode</FuelMode>
					</SimulationParameters>
					<Fuel type="Diesel CI">
						<EnergyConsumption unit="MJ/km">10.56728</EnergyConsumption>
					</Fuel>
					<CO2 unit="g/km">774.60</CO2>
				</Result>
			</Results>
			<ApplicationInformation>
				<SimulationToolVersion>String</SimulationToolVersion>
				<Date>2017-01-01T00:00:00Z</Date>
			</ApplicationInformation>
		</Data>
		<Signature>
			<di:Reference URI="#PIF-d10aff76c5d149948046">
				<di:Transforms>
					<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
					<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
				</di:Transforms>
				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
			</di:Reference>
		</Signature>
	</PrimaryVehicle>
</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 b164a8f8f048591b8bd24c8888bc574184d3b4e6..5c9f0960a006e5eb7ce855e2c77fd55f2cbfdea7 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
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" 
-xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" 
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -651,12 +651,12 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-1-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 1</v2.8:Manufacturer>
-				<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:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
+			<Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle">
+				<v2.10.2:Manufacturer>Intermediate Manufacturer 1</v2.10.2:Manufacturer>
+				<v2.10.2:ManufacturerAddress>Intermediate Manufacturer Address 1</v2.10.2:ManufacturerAddress>
+				<v2.10.2:VIN>VEH-1234567890</v2.10.2:VIN>
+				<v2.10.2:Date>2018-02-15T11:00:00Z</v2.10.2:Date>
+				<v2.10.2:VehicleDeclarationType>interim</v2.10.2:VehicleDeclarationType>
 			</Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
@@ -686,48 +686,49 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-2-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 2</v2.8:Manufacturer>
-				<v2.8:ManufacturerAddress>Intermediate Manufacturer Address 2</v2.8:ManufacturerAddress>
-				<v2.8:VIN>VEH-2234567890</v2.8:VIN>
-				<v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date>			
-				<v2.8:VehicleDeclarationType>final</v2.8:VehicleDeclarationType>
-				<v2.8: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.8:ADAS>	
-				<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">
-							<v2.8:ElectricSystem>
-								<v2.8:LEDLights>
-									<v2.8:Interiorlights>true</v2.8:Interiorlights>	
-									<v2.8:Dayrunninglights>true</v2.8:Dayrunninglights>
-									<v2.8:Positionlights>false</v2.8:Positionlights>
-									<v2.8:Brakelights>false</v2.8:Brakelights>
-									<v2.8:Headlights>true</v2.8:Headlights>														
-								</v2.8:LEDLights>
-							</v2.8:ElectricSystem>
-							<v2.8:HVAC>
-								<v2.8:SystemConfiguration>1</v2.8:SystemConfiguration>
-								<v2.8:HeatPumpTypeDriverCompartment>non R-744 2-stage</v2.8:HeatPumpTypeDriverCompartment>
-								<v2.8:HeatPumpModeDriverCompartment>heating</v2.8:HeatPumpModeDriverCompartment>
-								<v2.8:HeatPumpTypePassengerCompartment>non R-744 3-stage</v2.8:HeatPumpTypePassengerCompartment>
-								<v2.8:HeatPumpModePassengerCompartment>cooling</v2.8:HeatPumpModePassengerCompartment>
-								<v2.8:AuxiliaryHeaterPower>50</v2.8:AuxiliaryHeaterPower>
-								<v2.8:DoubleGlazing>false</v2.8:DoubleGlazing>
-								<v2.8:AdjustableAuxiliaryHeater>true</v2.8:AdjustableAuxiliaryHeater>
-								<v2.8:SeparateAirDistributionDucts>false</v2.8:SeparateAirDistributionDucts>
-								<v2.8:WaterElectricHeater>false</v2.8:WaterElectricHeater>
-								<v2.8:AirElectricHeater>false</v2.8:AirElectricHeater>
-								<v2.8:OtherHeatingTechnology>true</v2.8:OtherHeatingTechnology>
-							</v2.8:HVAC>
-						</v2.8:Data>
-					</v2.8:Auxiliaries>
-				</v2.8:Components>		
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
+				<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
+				<VIN>VEH-2234567890</VIN>
+				<Date>2021-02-13T07:20:08.0187663Z</Date>			
+				<VehicleDeclarationType>final</VehicleDeclarationType>
+				<ADAS xsi:type="ADAS_Conventional_Type">
+					<EngineStopStart>true</EngineStopStart>
+					<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+					<EcoRollWithEngineStop>true</EcoRollWithEngineStop>
+					<PredictiveCruiseControl>1,2</PredictiveCruiseControl>
+				</ADAS>	
+				<Components xsi:type="Components_Conventional_CompletedBusType">					
+					<Auxiliaries>
+						<Data xsi:type="AUX_Conventional_CompletedBusType">
+							<ElectricSystem>
+								<LEDLights>
+									<Interiorlights>true</Interiorlights>	
+									<Dayrunninglights>true</Dayrunninglights>
+									<Positionlights>false</Positionlights>
+									<Brakelights>false</Brakelights>
+									<Headlights>true</Headlights>														
+								</LEDLights>
+							</ElectricSystem>
+							<HVAC>
+								<SystemConfiguration>1</SystemConfiguration>
+								<HeatPumpTypeDriverCompartment>
+									<Cooling>non R-744 2-stage</Cooling>
+									<Heating>none</Heating>
+								</HeatPumpTypeDriverCompartment>
+								<HeatPumpTypePassengerCompartment>
+									<Cooling>non R-744 3-stage</Cooling>
+									<Heating>none</Heating>
+								</HeatPumpTypePassengerCompartment>
+								<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
+								<DoubleGlazing>false</DoubleGlazing>
+								<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+								<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
+							</HVAC>
+						</Data>
+					</Auxiliaries>
+				</Components>		
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!!</SimulationToolVersion>
 				<Date>2021-03-13T07:20:08.0187663Z</Date>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
index f0f066339b43de5d3a864f4febd9f54cda2edc02..d5df6890b211e8dbd8695d19b536bf6f4959ffe1 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
@@ -2,11 +2,11 @@
 <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:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" 
-xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" 
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -584,13 +584,13 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-1-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 1</v2.8:Manufacturer>
-				<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:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
+				<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
+				<VIN>VEH-1234567890</VIN>
+				<Date>2018-02-15T11:00:00Z</Date>
+				<VehicleDeclarationType>interim</VehicleDeclarationType>
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-01-12T07:20:08.0187663Z</Date>
@@ -619,13 +619,13 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-2-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 2</v2.8:Manufacturer>
-				<v2.8:ManufacturerAddress></v2.8:ManufacturerAddress>
-				<v2.8:VIN>VEH-2234567890</v2.8:VIN>
-				<v2.8:Date>2021-02-13T07:20:08.0187663Z</v2.8:Date>			
-				<v2.8:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>	
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
+				<ManufacturerAddress></ManufacturerAddress>
+				<VIN>VEH-2234567890</VIN>
+				<Date>2021-02-13T07:20:08.0187663Z</Date>			
+				<VehicleDeclarationType>interim</VehicleDeclarationType>	
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-02-13T07:20:08.0187663Z</Date>
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 d1bba98489c9ad108d4b3fa37dff3ed714c95227..a4acbb33bc14fa7723ea2ee2da2739de1c168220 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
@@ -2,11 +2,11 @@
 <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:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" 
-xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" 
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -651,38 +651,38 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+67QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-1-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 1</v2.8:Manufacturer>
-				<v2.8:ManufacturerAddress>Intermediate Manufacturer Address 1</v2.8:ManufacturerAddress>
-				<v2.8:VIN>VIN-132564</v2.8:VIN>
-				<v2.8:Date>2018-01-15T11:00:00Z</v2.8:Date>
-				<v2.8:Model>Intermediate Model 1</v2.8:Model>
-				<v2.8:LegislativeCategory>M3</v2.8:LegislativeCategory>
-				<v2.8:CorrectedActualMass>25000</v2.8:CorrectedActualMass>
-				<v2.8:TechnicalPermissibleMaximumLadenMass>30000</v2.8:TechnicalPermissibleMaximumLadenMass>
-				<v2.8:NgTankSystem>Liquefied</v2.8:NgTankSystem>
-				<v2.8:ClassBus>B</v2.8:ClassBus>
-				<v2.8:NumberPassengerSeatsLowerDeck>24</v2.8:NumberPassengerSeatsLowerDeck>
-				<v2.8:NumberPassengersStandingLowerDeck>7</v2.8:NumberPassengersStandingLowerDeck>
-				<v2.8:NumberPassengerSeatsUpperDeck>30</v2.8:NumberPassengerSeatsUpperDeck>
-				<v2.8:NumberPassengersStandingUpperDeck>4</v2.8:NumberPassengersStandingUpperDeck>
-				<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:VehicleDeclarationType>final</v2.8:VehicleDeclarationType>
-				<v2.8:ADAS>
-					<v2.3:EngineStopStart>false</v2.3:EngineStopStart>
-					<v2.3:EcoRollWithoutEngineStop>true</v2.3:EcoRollWithoutEngineStop>
-					<v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop>
-					<v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl>
-					<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>	
-				</v2.8:ADAS>
-				<v2.8:Components xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xsi:type="v2.8:CompletedVehicleComponentsDeclarationType">
-				<v2.8:AirDrag>
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
+				<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
+				<VIN>VIN-132564</VIN>
+				<Date>2018-01-15T11:00:00Z</Date>
+				<Model>Intermediate Model 1</Model>
+				<LegislativeCategory>M3</LegislativeCategory>
+				<CorrectedActualMass>25000</CorrectedActualMass>
+				<TechnicalPermissibleMaximumLadenMass>30000</TechnicalPermissibleMaximumLadenMass>
+				<NgTankSystem>Liquefied</NgTankSystem>
+				<ClassBus>B</ClassBus>
+				<NumberPassengerSeatsLowerDeck>24</NumberPassengerSeatsLowerDeck>
+				<NumberPassengersStandingLowerDeck>7</NumberPassengersStandingLowerDeck>
+				<NumberPassengerSeatsUpperDeck>30</NumberPassengerSeatsUpperDeck>
+				<NumberPassengersStandingUpperDeck>4</NumberPassengersStandingUpperDeck>
+				<BodyworkCode>CA</BodyworkCode>
+				<LowEntry>true</LowEntry>
+				<HeightIntegratedBody>2500</HeightIntegratedBody>				
+				<VehicleLength>12000</VehicleLength>				
+				<VehicleWidth>2000</VehicleWidth>				
+				<EntranceHeight>2050</EntranceHeight>
+				<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
+				<VehicleDeclarationType>final</VehicleDeclarationType>
+				<ADAS xsi:type="ADAS_Conventional_Type">
+					<EngineStopStart>false</EngineStopStart>
+					<EcoRollWithoutEngineStop>true</EcoRollWithoutEngineStop>
+					<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+					<PredictiveCruiseControl>none</PredictiveCruiseControl>
+					<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>	
+				</ADAS>
+				<Components xsi:type="Components_Conventional_CompletedBusType">
+				<AirDrag>
 					<v2.0:Data xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX23h">
 						<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
 						<v2.0:Model>Generic Model</v2.0:Model>
@@ -703,36 +703,37 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 							<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
 						</di:Reference>
 					</v2.0:Signature>
-				</v2.8:AirDrag>
-					<v2.8:Auxiliaries>
-						<v2.8:Data xsi:type="v2.8:CompletedVehicleAuxiliaryDataDeclarationType">
-							<v2.8:ElectricSystem>
-							<v2.8:LEDLights>
-								<v2.8:Interiorlights>true</v2.8:Interiorlights>
-								<v2.8:Dayrunninglights>false</v2.8:Dayrunninglights>
-								<v2.8:Positionlights>true</v2.8:Positionlights>
-								<v2.8:Brakelights>true</v2.8:Brakelights>
-								<v2.8:Headlights>false</v2.8:Headlights>
-							</v2.8:LEDLights>							
-							</v2.8:ElectricSystem>	
-							<v2.8:HVAC>
-								<v2.8:SystemConfiguration>0</v2.8:SystemConfiguration>
-								<v2.8:HeatPumpTypeDriverCompartment>non R-744 3-stage</v2.8:HeatPumpTypeDriverCompartment>
-								<v2.8:HeatPumpModeDriverCompartment>heating</v2.8:HeatPumpModeDriverCompartment>
-								<v2.8:HeatPumpTypePassengerCompartment>non R-744 2-stage</v2.8:HeatPumpTypePassengerCompartment>
-								<v2.8:HeatPumpModePassengerCompartment>heating</v2.8:HeatPumpModePassengerCompartment>
-								<v2.8:AuxiliaryHeaterPower>40</v2.8:AuxiliaryHeaterPower>
-								<v2.8:DoubleGlazing>false</v2.8:DoubleGlazing>
-								<v2.8:AdjustableAuxiliaryHeater>false</v2.8:AdjustableAuxiliaryHeater>
-								<v2.8:SeparateAirDistributionDucts>true</v2.8:SeparateAirDistributionDucts>
-								<v2.8:WaterElectricHeater>false</v2.8:WaterElectricHeater>
-								<v2.8:AirElectricHeater>true</v2.8:AirElectricHeater>
-								<v2.8:OtherHeatingTechnology>false</v2.8:OtherHeatingTechnology>
-							</v2.8:HVAC>					
-						</v2.8:Data>
-					</v2.8:Auxiliaries>					
-				</v2.8:Components>
-			</Vehicle>
+				</AirDrag>
+					<Auxiliaries>
+						<Data xsi:type="AUX_Conventional_CompletedBusType">
+							<ElectricSystem>
+							<LEDLights>
+								<Interiorlights>true</Interiorlights>
+								<Dayrunninglights>false</Dayrunninglights>
+								<Positionlights>true</Positionlights>
+								<Brakelights>true</Brakelights>
+								<Headlights>false</Headlights>
+							</LEDLights>							
+							</ElectricSystem>	
+							<HVAC>
+								<SystemConfiguration>0</SystemConfiguration>
+								<HeatPumpTypeDriverCompartment>
+									<Cooling>none</Cooling>
+									<Heating>non R-744 3-stage</Heating>
+								</HeatPumpTypeDriverCompartment>
+								<HeatPumpTypePassengerCompartment>
+									<Cooling>none</Cooling>
+									<Heating>non R-744 2-stage</Heating>
+								</HeatPumpTypePassengerCompartment>
+								<AuxiliaryHeaterPower>40</AuxiliaryHeaterPower>
+								<DoubleGlazing>false</DoubleGlazing>
+								<AdjustableAuxiliaryHeater>false</AdjustableAuxiliaryHeater>
+								<SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
+							</HVAC>					
+						</Data>
+					</Auxiliaries>					
+				</Components>
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-01-12T07:20:08.0187666Z</Date>
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 42bfe04f38b711a00cba4f9ad37a77005e22a25b..9ff878fa3eda3ade66d240c726940ad1a6216edd 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
@@ -2,11 +2,11 @@
 <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:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
 xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
 xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
-xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" 
-xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" 
+xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" 
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 v:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
 	<PrimaryVehicle>
 		<Data id="text" xsi:type="PrimaryVehicleDataType">
@@ -651,13 +651,13 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:InterimStageInputType" id="MSTG-1-Vehicle">
-				<v2.8:Manufacturer>Intermediate Manufacturer 1</v2.8:Manufacturer>
-				<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:VehicleDeclarationType>interim</v2.8:VehicleDeclarationType>
-			</Vehicle>
+			<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
+				<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
+				<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
+				<VIN>adfas</VIN>
+				<Date>2018-02-15T11:00:00Z</Date>
+				<VehicleDeclarationType>interim</VehicleDeclarationType>
+			</vif0.1:Vehicle>
 			<ApplicationInformation>
 				<SimulationToolVersion>!!NOT FOR CERTIFICATION!!</SimulationToolVersion>
 				<Date>2021-01-12T07:20:08.0187663Z</Date>