diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.8_Stage.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.8_Stage.xsd
index 73cd8a8a2c23052634b1fb197b5a15603d4b0a9c..bee1d5c3a46f613f3d63d107a9d09838b40d7c3e 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.8_Stage.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.8_Stage.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Franz Kober (Technische Universität Graz) -->
+<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Franz Josef Kober (Technische Universität Graz) -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.4" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
 	<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
@@ -148,7 +148,7 @@
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
-	<xs:complexType name="ExemptedVectoStageInputType">
+	<xs:complexType name="ExemptedInterimStageInputType">
 		<xs:annotation>
 			<xs:documentation>Exempted vehicle stage input parts</xs:documentation>
 		</xs:annotation>
@@ -231,7 +231,7 @@
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
-	<xs:complexType name="VectoStageInputType">
+	<xs:complexType name="InterimStageInputType">
 		<xs:annotation>
 			<xs:documentation>Vehicle stage input parts</xs:documentation>
 		</xs:annotation>
@@ -315,26 +315,28 @@
 							<xs:documentation>P286 - bool</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="HeightIntegratedBody" type="v2.8:VehicleDimensionType" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>P287 - [mm]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="VehicleLength" type="v2.8:VehicleDimensionType" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>P288 - [mm]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="VehicleWidth" type="v2.8:VehicleDimensionType" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>P289 - [mm]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="EntranceHeight" type="v2.8:VehicleDimensionType" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>P290 - [mm]</xs:documentation>
-						</xs:annotation>
-					</xs:element>
+					<xs:sequence minOccurs="0">
+						<xs:element name="HeightIntegratedBody" type="v2.8:VehicleDimensionType">
+							<xs:annotation>
+								<xs:documentation>P287 - [mm]</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="VehicleLength" type="v2.8:VehicleDimensionType">
+							<xs:annotation>
+								<xs:documentation>P288 - [mm]</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="VehicleWidth" type="v2.8:VehicleDimensionType">
+							<xs:annotation>
+								<xs:documentation>P289 - [mm]</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="EntranceHeight" type="v2.8:VehicleDimensionType">
+							<xs:annotation>
+								<xs:documentation>P290 - [mm]</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+					</xs:sequence>
 					<xs:element name="DoorDriveTechnology" type="v2.6:DoorDriveTechnologyType" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>P291 - enum</xs:documentation>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_full-sample.xml
index 9140ce353017d8f361dc8441e2838c5ccbdecb07..a99f5e9ae1789a37f9739a48f2d30e531580933a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_full-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedVectoStageInputType">
		<Manufacturer>Some Manufacturer</Manufacturer>
		<ManufacturerAddress>Infinite Loop</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model 2</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>7000</CorrectedActualMass>
		<TechniclaPermissibleMaximumLadenMass>10000</TechniclaPermissibleMaximumLadenMass>
		<ClassBus>A</ClassBus>
		<NumberPassengersLowerDeck>10</NumberPassengersLowerDeck>
		<NumberPassengersUpperDeck>20</NumberPassengersUpperDeck>
		<VehicleCode>CC</VehicleCode>
		<LowEntry>true</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>		
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType">
		<Manufacturer>Some Manufacturer</Manufacturer>
		<ManufacturerAddress>Infinite Loop</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model 2</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>7000</CorrectedActualMass>
		<TechniclaPermissibleMaximumLadenMass>10000</TechniclaPermissibleMaximumLadenMass>
		<ClassBus>A</ClassBus>
		<NumberPassengersLowerDeck>10</NumberPassengersLowerDeck>
		<NumberPassengersUpperDeck>20</NumberPassengersUpperDeck>
		<VehicleCode>CC</VehicleCode>
		<LowEntry>true</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>		
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
index 11c8527ec96a5aef63b43538862c91868dcf34c2..a19ed34bb4a604bbc7f8d3b054c788d341ddc10a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries01-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedVectoStageInputType">
		<Manufacturer>Some Manufacturer 1</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>7000</CorrectedActualMass>
		<TechniclaPermissibleMaximumLadenMass>10000</TechniclaPermissibleMaximumLadenMass>
		<VehicleCode>CC</VehicleCode>
		<LowEntry>false</LowEntry>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType">
		<Manufacturer>Some Manufacturer 1</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>7000</CorrectedActualMass>
		<TechniclaPermissibleMaximumLadenMass>10000</TechniclaPermissibleMaximumLadenMass>
		<VehicleCode>CC</VehicleCode>
		<LowEntry>false</LowEntry>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
index 87c1c842efaddba77930d191b5371f3239371d51..6404f3d41e9b2c384697e1762cc46bf9a919d79a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedVectoStageInputType">
		<Manufacturer>Some Manufacturer 2</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<NumberPassengersLowerDeck>10</NumberPassengersLowerDeck>
		<NumberPassengersUpperDeck>20</NumberPassengersUpperDeck>	
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType">
		<Manufacturer>Some Manufacturer 2</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<NumberPassengersLowerDeck>10</NumberPassengersLowerDeck>
		<NumberPassengersUpperDeck>20</NumberPassengersUpperDeck>	
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_mandatory_entries.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_mandatory_entries.xml
index f1f25b0cf78e91d550cc6440cb591ec0312c5444..89d0e3a818a2bde6ebfc8e6eb48203b84edd29ca 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_mandatory_entries.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_mandatory_entries.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedVectoStageInputType" >
		<Manufacturer>Some Manufacturer 3</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType" >
		<Manufacturer>Some Manufacturer 3</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml
index f09f6aa2c69524c109c81357a4183f8fec656715..0f3fba3a8393cefac56c933ff5681ac77b7c0a16 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="VectoStageInputType">
		<Manufacturer>Some Manufacturer</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>500</CorrectedActualMass>
		<TechniclaPermissibleMaximumLadenMass>3500</TechniclaPermissibleMaximumLadenMass>
		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
		<NgTankSystem>Compressed</NgTankSystem>
		<ClassBus>II+III</ClassBus>
		<NumberPassengersLowerDeck>0</NumberPassengersLowerDeck>
		<NumberPassengersUpperDeck>10</NumberPassengersUpperDeck>
		<VehicleCode>CB</VehicleCode>
		<LowEntry>false</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>9500</VehicleLength>
		<VehicleWidth>2500</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<DoorDriveTechnology>electric</DoorDriveTechnology>
		<StateOfCompletion>incomplete</StateOfCompletion>
		<ADAS>
			<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
			<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
			<v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop>
			<v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl>
			<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
			<AirDrag>
				<v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX23h">
					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
					<v2.0:Model>Generic Model</v2.0:Model>
					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<di:Transforms>
							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
						</di:Transforms>
						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
						<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
			<Auxiliaries>
				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
					<ElectricSystem>
						<LEDLights>
							<Interiorlights>false</Interiorlights>
							<Dayrunninglights>true</Dayrunninglights>
							<Positionlights>true</Positionlights>
							<Brakelights>true</Brakelights>
							<Headlights>false</Headlights>
						</LEDLights>		
					</ElectricSystem>
					<HVAC>
						<SystemConfiguration>0</SystemConfiguration>
						<HeatPumpTypeDriverCompartment>none</HeatPumpTypeDriverCompartment>
						<HeatPumpModeDriverCompartment>heating</HeatPumpModeDriverCompartment>
						<HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
						<HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
						<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
						<DoubleGlasing>false</DoubleGlasing>
						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
						<WaterElectricHeater>true</WaterElectricHeater>
						<AirElectricHeater>false</AirElectricHeater>
						<OtherHeatingTechnology>false</OtherHeatingTechnology>			
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType">
		<Manufacturer>Some Manufacturer</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>500</CorrectedActualMass>
		<TechniclaPermissibleMaximumLadenMass>3500</TechniclaPermissibleMaximumLadenMass>
		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
		<NgTankSystem>Compressed</NgTankSystem>
		<ClassBus>II+III</ClassBus>
		<NumberPassengersLowerDeck>0</NumberPassengersLowerDeck>
		<NumberPassengersUpperDeck>10</NumberPassengersUpperDeck>
		<VehicleCode>CB</VehicleCode>
		<LowEntry>false</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>9500</VehicleLength>
		<VehicleWidth>2500</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<DoorDriveTechnology>electric</DoorDriveTechnology>
		<StateOfCompletion>incomplete</StateOfCompletion>
		<ADAS>
			<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
			<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
			<v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop>
			<v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl>
			<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
			<AirDrag>
				<v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX23h">
					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
					<v2.0:Model>Generic Model</v2.0:Model>
					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<di:Transforms>
							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
						</di:Transforms>
						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
						<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
			<Auxiliaries>
				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
					<ElectricSystem>
						<LEDLights>
							<Interiorlights>false</Interiorlights>
							<Dayrunninglights>true</Dayrunninglights>
							<Positionlights>true</Positionlights>
							<Brakelights>true</Brakelights>
							<Headlights>false</Headlights>
						</LEDLights>		
					</ElectricSystem>
					<HVAC>
						<SystemConfiguration>0</SystemConfiguration>
						<HeatPumpTypeDriverCompartment>none</HeatPumpTypeDriverCompartment>
						<HeatPumpModeDriverCompartment>heating</HeatPumpModeDriverCompartment>
						<HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
						<HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
						<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
						<DoubleGlasing>false</DoubleGlasing>
						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
						<WaterElectricHeater>true</WaterElectricHeater>
						<AirElectricHeater>false</AirElectricHeater>
						<OtherHeatingTechnology>false</OtherHeatingTechnology>			
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries01-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
index 1679e9d8c3a1898d258116f1f459e5515cbc426e..77651ba77cba8d0e0e30b38937ca0a2e44f47533 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="VectoStageInputType" >
		<Manufacturer>Some Manufacturer 1</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model 2</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>5000</CorrectedActualMass>
		<TechniclaPermissibleMaximumLadenMass>10000</TechniclaPermissibleMaximumLadenMass>
		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
		<NgTankSystem>Compressed</NgTankSystem>
		<ClassBus>A</ClassBus>
		<VehicleCode>CG</VehicleCode>
		<LowEntry>true</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>10000</VehicleLength>
		<VehicleWidth>2600</VehicleWidth>
		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
		<StateOfCompletion>incomplete</StateOfCompletion>
		<ADAS>
			<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
			<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
			<v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop>
			<v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl>
			<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
			<Auxiliaries>
				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
					<ElectricSystem>
						<LEDLights>
							<Interiorlights>false</Interiorlights>
							<Dayrunninglights>true</Dayrunninglights>
							<Headlights>false</Headlights>
						</LEDLights>		
					</ElectricSystem>
					<HVAC>
						<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
						<DoubleGlasing>false</DoubleGlasing>
						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
						<WaterElectricHeater>true</WaterElectricHeater>
						<OtherHeatingTechnology>false</OtherHeatingTechnology>			
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType" >
		<Manufacturer>Some Manufacturer 1</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model 2</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>5000</CorrectedActualMass>
		<TechniclaPermissibleMaximumLadenMass>10000</TechniclaPermissibleMaximumLadenMass>
		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
		<NgTankSystem>Compressed</NgTankSystem>
		<ClassBus>A</ClassBus>
		<VehicleCode>CG</VehicleCode>
		<LowEntry>true</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>10000</VehicleLength>
		<VehicleWidth>2600</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
		<StateOfCompletion>incomplete</StateOfCompletion>
		<ADAS>
			<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
			<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
			<v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop>
			<v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl>
			<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
			<Auxiliaries>
				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
					<ElectricSystem>
						<LEDLights>
							<Interiorlights>false</Interiorlights>
							<Dayrunninglights>true</Dayrunninglights>
							<Headlights>false</Headlights>
						</LEDLights>		
					</ElectricSystem>
					<HVAC>
						<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
						<DoubleGlasing>false</DoubleGlasing>
						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
						<WaterElectricHeater>true</WaterElectricHeater>
						<OtherHeatingTechnology>false</OtherHeatingTechnology>			
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries02-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
index c9ce429d64744c4afe2e6de5edbb63dd51581b3b..6f7c2fa5bf1e9b138157a02f4184c7c4397536bc 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_certain_entries02-sample.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="VectoStageInputType" >
		<Manufacturer>Some Manufacturer 2</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>500</CorrectedActualMass>
		<NgTankSystem>Compressed</NgTankSystem>
		<ClassBus>II+III</ClassBus>
		<NumberPassengersLowerDeck>0</NumberPassengersLowerDeck>
		<NumberPassengersUpperDeck>10</NumberPassengersUpperDeck>
		<VehicleCode>CB</VehicleCode>
		<LowEntry>false</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>9500</VehicleLength>
		<VehicleWidth>2500</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<StateOfCompletion>incomplete</StateOfCompletion>
		<ADAS>
			<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
			<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
			<v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop>
			<v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl>
			<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
			<AirDrag>
				<v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX23h">
					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
					<v2.0:Model>Generic Model</v2.0:Model>
					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<di:Transforms>
							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
						</di:Transforms>
						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
						<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
			<Auxiliaries>
				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
					<HVAC>
						<SystemConfiguration>0</SystemConfiguration>
						<HeatPumpTypeDriverCompartment>none</HeatPumpTypeDriverCompartment>
						<HeatPumpModeDriverCompartment>heating</HeatPumpModeDriverCompartment>
						<HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
						<HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType" >
		<Manufacturer>Some Manufacturer 2</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>500</CorrectedActualMass>
		<NgTankSystem>Compressed</NgTankSystem>
		<ClassBus>II+III</ClassBus>
		<NumberPassengersLowerDeck>0</NumberPassengersLowerDeck>
		<NumberPassengersUpperDeck>10</NumberPassengersUpperDeck>
		<VehicleCode>CB</VehicleCode>
		<LowEntry>false</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>9500</VehicleLength>
		<VehicleWidth>2500</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<StateOfCompletion>incomplete</StateOfCompletion>
		<ADAS>
			<v2.3:EngineStopStart>true</v2.3:EngineStopStart>
			<v2.3:EcoRollWithoutEngineStop>false</v2.3:EcoRollWithoutEngineStop>
			<v2.3:EcoRollWithEngineStop>false</v2.3:EcoRollWithEngineStop>
			<v2.3:PredictiveCruiseControl>none</v2.3:PredictiveCruiseControl>
			<v2.3:APTEcoRollReleaseLockupClutch>true</v2.3:APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
			<AirDrag>
				<v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX23h">
					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
					<v2.0:Model>Generic Model</v2.0:Model>
					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<di:Transforms>
							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
						</di:Transforms>
						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
						<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
			<Auxiliaries>
				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
					<HVAC>
						<SystemConfiguration>0</SystemConfiguration>
						<HeatPumpTypeDriverCompartment>none</HeatPumpTypeDriverCompartment>
						<HeatPumpModeDriverCompartment>heating</HeatPumpModeDriverCompartment>
						<HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
						<HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_mandatory_entries.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_mandatory_entries.xml
index 5a96bb0d6230f15a9dd5db7a3e118d4e328e736c..4aacbe05c474c42a256799dfea8b4861a8d4ec4e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_mandatory_entries.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_only_mandatory_entries.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="VectoStageInputType" >
		<Manufacturer>Some Manufacturer 3</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<StateOfCompletion>incomplete</StateOfCompletion>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType" >
		<Manufacturer>Some Manufacturer 3</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 3</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<StateOfCompletion>incomplete</StateOfCompletion>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ 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 831ca2492f472e8f2cc40ea7b068869d488368b4..3e98cf89576123ed0197839733fa23bc95a2fb9a 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
@@ -623,7 +623,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:VectoStageInputType" id="MSTG-1-Vehicle">
+			<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>
@@ -658,7 +658,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:VectoStageInputType" id="MSTG-2-Vehicle">
+			<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>
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 8b7752cf36359bba8db1c32e3e06f449ed2679ab..99dc9d59760efecd92e72d258ddc73890c9d3070 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
@@ -623,7 +623,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:VectoStageInputType" id="MSTG-1-Vehicle">
+			<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>
@@ -641,6 +641,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<v2.8:LowEntry>false</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>2000</v2.8:EntranceHeight>
 				<v2.8:DoorDriveTechnology>pneumatic</v2.8:DoorDriveTechnology>
 				<v2.8:StateOfCompletion>incomplete</v2.8:StateOfCompletion>
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 7ab9ab663df74f873f8b6e147e6e3e26471b9e61..fb7d20358fc817353ef1caf3033aecf899c5621e 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
@@ -623,7 +623,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
 			</di:Reference>
 			</HashPreviousStage>
-			<Vehicle xsi:type="v2.8:VectoStageInputType" id="MSTG-1-Vehicle">
+			<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>