diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
index 4bc021eb60efaf7522a10221a5c0d0a4dfabb465..2dd95a6b3acb483cb8dba30d3a1253633d8cbe98 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
@@ -5,113 +5,158 @@
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/>
+	<xs:complexType name="AbstractCompletedVehicleAuxiliaryDataDeclarationType" abstract="true"/>
+	<xs:complexType name="AbstractCompletedVehicleComponentsDeclarationType" abstract="true"/>
 	<xs:complexType name="AbstractPrimaryVehicleAuxiliaryDataDeclarationType" abstract="true"/>
 	<xs:complexType name="AbstractPrimaryVehicleComponentsDeclarationType" abstract="true"/>
-	<xs:complexType name="AuxiliariesComponentHeavyBusDeclarationType">
+	<xs:complexType name="CompletedVehicleAuxiliariesComponentDeclarationType">
 		<xs:sequence>
-			<xs:element name="Data" type="tns:AbstractPrimaryVehicleAuxiliaryDataDeclarationType"/>
+			<xs:element name="Data" type="tns:AbstractCompletedVehicleAuxiliaryDataDeclarationType"/>
 		</xs:sequence>
 	</xs:complexType>
-	<xs:complexType name="CompletedVehicleDeclarationType">
+	<xs:complexType name="CompletedVehicleAuxiliaryDataDeclarationType">
 		<xs:complexContent>
-			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
+			<xs:extension base="tns:AbstractCompletedVehicleAuxiliaryDataDeclarationType">
 				<xs:sequence>
-					<xs:element name="ManufacturerCompletedVehicle"/>
-					<xs:element name="ManufacturerAddressCompletedVehicle"/>
-					<xs:element name="Model"/>
-					<xs:element name="VIN"/>
-					<xs:element name="Date"/>
-					<xs:element name="LegislativeClass"/>
-					<xs:element name="CurbMassChassis"/>
-					<xs:element name="TechnicalPermissibleMaximumLadenMass"/>
-					<xs:element name="NgTankSystem" type="v1.0:NgTankSystemType" minOccurs="0"/>
-					<xs:element name="RegisteredClass"/>
-					<xs:element name="VehicleCode"/>
-					<xs:element name="RegisteredPassengers">
+					<xs:element name="ElectricSystem">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="LowerDeck"/>
-								<xs:element name="UpperDeck"/>
+								<xs:element name="AlternatorTechnology" minOccurs="0" maxOccurs="unbounded">
+									<xs:annotation>
+										<xs:documentation>PXXX</xs:documentation>
+									</xs:annotation>
+									<xs:complexType>
+										<xs:simpleContent>
+											<xs:extension base="tns:AlternatorTechnologyType">
+												<xs:attribute name="ratio" type="v1.0:Double3" use="required"/>
+											</xs:extension>
+										</xs:simpleContent>
+									</xs:complexType>
+								</xs:element>
+								<xs:element name="LEDLights">
+									<xs:complexType>
+										<xs:sequence>
+											<xs:element name="Dayrunninglights" type="xs:boolean"/>
+											<xs:element name="Headlights" type="xs:boolean"/>
+											<xs:element name="Positionlights" type="xs:boolean"/>
+											<xs:element name="Brakelights" type="xs:boolean"/>
+											<xs:element name="Interiorlights" type="xs:boolean"/>
+										</xs:sequence>
+									</xs:complexType>
+								</xs:element>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
-					<xs:element name="LowEntry"/>
-					<xs:element name="HeightIntegratedBod"/>
-					<xs:element name="VehicleLength"/>
-					<xs:element name="VehicleWidth"/>
-					<xs:element name="EntranceHeight"/>
-					<xs:element name="Components">
+					<xs:element name="HVAC">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType"/>
-								<xs:element name="Auxiliaries">
+								<xs:element name="SystemConfiguration">
+									<xs:simpleType>
+										<xs:restriction base="xs:int">
+											<xs:minInclusive value="1"/>
+											<xs:maxInclusive value="9"/>
+										</xs:restriction>
+									</xs:simpleType>
+								</xs:element>
+								<xs:element name="CompressorType">
 									<xs:complexType>
 										<xs:sequence>
-											<xs:element name="Data">
-												<xs:complexType>
-													<xs:sequence>
-														<xs:element name="ElectricSystem">
-															<xs:complexType>
-																<xs:sequence>
-																	<xs:element name="AlternatorTechnology" minOccurs="0" maxOccurs="unbounded">
-																		<xs:annotation>
-																			<xs:documentation>PXXX</xs:documentation>
-																		</xs:annotation>
-																		<xs:complexType>
-																			<xs:simpleContent>
-																				<xs:extension base="xs:string">
-																					<xs:attribute name="ratio" type="v1.0:Double3" use="required"/>
-																				</xs:extension>
-																			</xs:simpleContent>
-																		</xs:complexType>
-																	</xs:element>
-																	<xs:element name="LEDLights">
-																		<xs:complexType>
-																			<xs:sequence>
-																				<xs:element name="Dayrunninglights" type="xs:boolean"/>
-																				<xs:element name="Headlights" type="xs:boolean"/>
-																				<xs:element name="Positionlights" type="xs:boolean"/>
-																				<xs:element name="Brakelights" type="xs:boolean"/>
-																				<xs:element name="Interiorlights" type="xs:boolean"/>
-																			</xs:sequence>
-																		</xs:complexType>
-																	</xs:element>
-																</xs:sequence>
-															</xs:complexType>
-														</xs:element>
-														<xs:element name="HVAC">
-															<xs:complexType>
-																<xs:sequence>
-																	<xs:element name="SystemConfiguration" type="xs:int"/>
-																	<xs:element name="CompressorType">
-																		<xs:complexType>
-																			<xs:sequence>
-																				<xs:element name="DriverAC" type="tns:HVACTechnology"/>
-																				<xs:element name="PassengerAC" type="tns:HVACTechnology"/>
-																			</xs:sequence>
-																		</xs:complexType>
-																	</xs:element>
-																	<xs:element name="AuxiliaryHeaterPower" type="xs:int"/>
-																	<xs:element name="DoubleGlasing" type="xs:boolean"/>
-																	<xs:element name="HeatPump" type="xs:boolean"/>
-																	<xs:element name="AdjustableAuxiliaryHeater" type="xs:boolean"/>
-																	<xs:element name="SeparateAirDistributionDucts" type="xs:boolean"/>
-																</xs:sequence>
-															</xs:complexType>
-														</xs:element>
-													</xs:sequence>
-												</xs:complexType>
-											</xs:element>
+											<xs:element name="DriverAC" type="tns:HVACTechnology"/>
+											<xs:element name="PassengerAC" type="tns:HVACTechnology"/>
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
+								<xs:element name="AuxiliaryHeaterPower">
+									<xs:simpleType>
+										<xs:restriction base="xs:int">
+											<xs:minInclusive value="0"/>
+										</xs:restriction>
+									</xs:simpleType>
+								</xs:element>
+								<xs:element name="DoubleGlasing" type="xs:boolean"/>
+								<xs:element name="HeatPump" type="xs:boolean"/>
+								<xs:element name="AdjustableAuxiliaryHeater" type="xs:boolean"/>
+								<xs:element name="SeparateAirDistributionDucts" type="xs:boolean"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="CompletedVehicleComponentsDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="tns:AbstractCompletedVehicleComponentsDeclarationType">
+				<xs:sequence>
+					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType"/>
+					<xs:element name="Auxiliaries" type="tns:CompletedVehicleAuxiliariesComponentDeclarationType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="CompletedVehicleDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
+				<xs:sequence>
+					<xs:element name="ManufacturerCompletedVehicle" type="v1.0:ManufacturerType"/>
+					<xs:element name="ManufacturerAddressCompletedVehicle" type="v1.0:ManufacturerAddressType"/>
+					<xs:element name="Model" type="v1.0:ModelType"/>
+					<xs:element name="VIN" type="v1.0:VINType"/>
+					<xs:element name="Date" type="v1.0:DateTimeWithTimezone"/>
+					<xs:element name="LegislativeClass" type="tns:LegislativeClassDeclarationType"/>
+					<xs:element name="RegisteredClass">
+						<xs:simpleType>
+							<xs:restriction base="tns:RegisteredClassType">
+								<xs:enumeration value="I"/>
+								<xs:enumeration value="II"/>
+								<xs:enumeration value="III"/>
+								<xs:enumeration value="A"/>
+								<xs:enumeration value="B"/>
+								<xs:enumeration value="I+II"/>
+								<xs:enumeration value="II+III"/>
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+					<xs:element name="VehicleCode" type="tns:VehicleCodeType"/>
+					<xs:element name="CurbMassChassis" type="v1.0:VehicleCurbMassChassisType"/>
+					<xs:element name="TechnicalPermissibleMaximumLadenMass" type="v1.0:VehicleGrossVehicleMassType"/>
+					<xs:element name="NgTankSystem" type="v1.0:NgTankSystemType" minOccurs="0"/>
+					<xs:element name="RegisteredPassengers">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="LowerDeck">
+									<xs:simpleType>
+										<xs:restriction base="xs:int">
+											<xs:minInclusive value="0"/>
+										</xs:restriction>
+									</xs:simpleType>
+								</xs:element>
+								<xs:element name="UpperDeck">
+									<xs:simpleType>
+										<xs:restriction base="xs:int">
+											<xs:minInclusive value="0"/>
+										</xs:restriction>
+									</xs:simpleType>
+								</xs:element>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
+					<xs:element name="LowEntry" type="xs:boolean"/>
+					<xs:element name="HeightIntegratedBody" type="v1.0:Double3"/>
+					<xs:element name="VehicleLength" type="v1.0:Double3"/>
+					<xs:element name="VehicleWidth" type="v1.0:Double3"/>
+					<xs:element name="EntranceHeight" type="v1.0:Double3"/>
+					<xs:element name="DoorDriveTechnology" type="tns:DoorDriveTechnologyType"/>
+					<xs:element name="Components" type="tns:AbstractCompletedVehicleComponentsDeclarationType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
+	<xs:complexType name="PrimaryVehicleAuxiliariesComponentDeclarationType">
+		<xs:sequence>
+			<xs:element name="Data" type="tns:AbstractPrimaryVehicleAuxiliaryDataDeclarationType"/>
+		</xs:sequence>
+	</xs:complexType>
 	<xs:complexType name="PrimaryVehicleAuxiliaryDataDeclarationType">
 		<xs:complexContent>
 			<xs:extension base="tns:AbstractPrimaryVehicleAuxiliaryDataDeclarationType">
@@ -161,7 +206,7 @@
 									</xs:annotation>
 									<xs:complexType>
 										<xs:simpleContent>
-											<xs:extension base="xs:string">
+											<xs:extension base="tns:AlternatorTechnologyType">
 												<xs:attribute name="ratio" type="v1.0:Double3" use="required"/>
 											</xs:extension>
 										</xs:simpleContent>
@@ -208,7 +253,7 @@
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
-	<xs:complexType name="PrimaryVehicleComponentsType">
+	<xs:complexType name="PrimaryVehicleComponentsDeclarationType">
 		<xs:complexContent>
 			<xs:extension base="tns:AbstractPrimaryVehicleComponentsDeclarationType">
 				<xs:sequence>
@@ -219,7 +264,7 @@
 					<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
 					<xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType"/>
 					<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
-					<xs:element name="Auxiliaries" type="tns:AuxiliariesComponentHeavyBusDeclarationType"/>
+					<xs:element name="Auxiliaries" type="tns:PrimaryVehicleAuxiliariesComponentDeclarationType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -288,6 +333,12 @@
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
+	<xs:simpleType name="AlternatorTechnologyType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Sample Alternator Technology 1"/>
+			<xs:enumeration value="Sample Alternator Technology 2"/>
+		</xs:restriction>
+	</xs:simpleType>
 	<xs:simpleType name="AuxFanTechnologyType">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="Crankshaft mounted - Electronically controlled visco clutch"/>
@@ -327,8 +378,15 @@
 			<xs:enumeration value="Full electric steering gear"/>
 		</xs:restriction>
 	</xs:simpleType>
+	<xs:simpleType name="DoorDriveTechnologyType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="electric"/>
+			<xs:enumeration value="pneumatic"/>
+		</xs:restriction>
+	</xs:simpleType>
 	<xs:simpleType name="HVACTechnology">
 		<xs:restriction base="xs:string">
+			<xs:enumeration value="none"/>
 			<xs:enumeration value="sample tech 1"/>
 			<xs:enumeration value="sample tech 2"/>
 		</xs:restriction>
@@ -354,4 +412,21 @@
 			<xs:enumeration value="Bus"/>
 		</xs:restriction>
 	</xs:simpleType>
+	<xs:simpleType name="RegisteredClassType">
+		<xs:restriction base="xs:string"/>
+	</xs:simpleType>
+	<xs:simpleType name="VehicleCodeType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="CA"/>
+			<xs:enumeration value="CB"/>
+			<xs:enumeration value="CC"/>
+			<xs:enumeration value="CD"/>
+			<xs:enumeration value="CE"/>
+			<xs:enumeration value="CF"/>
+			<xs:enumeration value="CG"/>
+			<xs:enumeration value="CH"/>
+			<xs:enumeration value="CI"/>
+			<xs:enumeration value="CJ"/>
+		</xs:restriction>
+	</xs:simpleType>
 </xs:schema>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-sample_LNG.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-sample_LNG.xml
index ae6a392cdffa05f20c84ab0187fa52d13a412af3..253d56c891f6cb2c3b0b4dc12b7ded3a438a4ec3 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-sample_LNG.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.0/vecto_vehicle-sample_LNG.xml
@@ -2589,7 +2589,7 @@
 				</Signature>
 				</Gearbox>
 				<TorqueConverter>
-					<Data id="tc-123xyz" xsi:type="TorqueConverterDeclarationDataType">
+					<Data id="tc-123xyz" xsi:type="TorqueConverterDataDeclarationType">
 						<Manufacturer>Some Manufacturer</Manufacturer>
 						<Model>Some Model</Model>
 						<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-completed_heavyBus.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-completed_heavyBus.xml
new file mode 100644
index 0000000000000000000000000000000000000000..aae208dd43476e6547a13f02ff9c444ac3c2ba21
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-completed_heavyBus.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+	<v2.0:Vehicle id="VEH-1234567890" xsi:type="CompletedVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+		<ManufacturerCompletedVehicle>Some Manufacturer</ManufacturerCompletedVehicle>
+		<ManufacturerAddressCompletedVehicle>Infinite Loop 1</ManufacturerAddressCompletedVehicle>
+		<Model>Sample Bus Model</Model>
+		<VIN>VEH-1234567890</VIN>
+		<Date>2020-01-09T11:00:00Z</Date>
+		<LegislativeClass>N2</LegislativeClass>
+		<RegisteredClass>II+III</RegisteredClass>
+		<VehicleCode>CD</VehicleCode>
+		<CurbMassChassis>8300</CurbMassChassis>
+		<TechnicalPermissibleMaximumLadenMass>15400</TechnicalPermissibleMaximumLadenMass>
+		<RegisteredPassengers>
+			<LowerDeck>50</LowerDeck>
+			<UpperDeck>0</UpperDeck>
+		</RegisteredPassengers>
+		<LowEntry>true</LowEntry>
+		<HeightIntegratedBody>2.700</HeightIntegratedBody>
+		<VehicleLength>11.830</VehicleLength>
+		<VehicleWidth>2.550</VehicleWidth>
+		<EntranceHeight>0.120</EntranceHeight>
+		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
+		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
+			<v2.6:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+				<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
+					<Manufacturer>Generic Manufacturer</Manufacturer>
+					<Model>Generic Model</Model>
+					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+					<Date>2017-03-24T15:00:00Z</Date>
+					<AppVersion>Vecto AirDrag x.y</AppVersion>
+					<CdxA_0>6.31</CdxA_0>
+					<TransferredCdxA>6.32</TransferredCdxA>
+					<DeclaredCdxA>6.34</DeclaredCdxA>
+				</Data>
+				<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>
+				</Signature>
+			</v2.6:AirDrag>
+			<Auxiliaries>
+				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
+					<ElectricSystem>
+						<AlternatorTechnology ratio="1.000">Sample Alternator Technology 1</AlternatorTechnology>
+						<LEDLights>
+							<Dayrunninglights>false</Dayrunninglights>
+							<Headlights>false</Headlights>
+							<Positionlights>false</Positionlights>
+							<Brakelights>false</Brakelights>
+							<Interiorlights>false</Interiorlights>
+						</LEDLights>
+					</ElectricSystem>
+					<HVAC>
+						<SystemConfiguration>7</SystemConfiguration>
+						<CompressorType>
+							<DriverAC>sample tech 2</DriverAC>
+							<PassengerAC>sample tech 1</PassengerAC>
+						</CompressorType>
+						<AuxiliaryHeaterPower>0</AuxiliaryHeaterPower>
+						<DoubleGlasing>true</DoubleGlasing>
+						<HeatPump>false</HeatPump>
+						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+						<SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
+					</HVAC>
+				</Data>
+			</Auxiliaries>
+		</Components>
+	</v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus.xml
index 7e51f92aa3e36d4dc384128cd40f1d3e65916a5d..9a09583a50d1494676fed68b717a03e0e335b8d8 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-primary_heavyBus.xml
@@ -10,7 +10,7 @@
 	xmlns:di="http://www.w3.org/2000/09/xmldsig#"
 	xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 
-<v2.0:Vehicle id="VEH-1234567890" xsi:type="v2.6:HeavyBusPrimaryVehicleDeclarationType"  xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+<v2.0:Vehicle id="VEH-1234567890" xsi:type="PrimaryVehicleDeclarationType"  xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
 		<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
 		<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
 		<Model>Generic Model</Model>
@@ -35,7 +35,7 @@
 			<Entry gear="1" maxTorque="2500" />
 			<Entry gear="12" maxTorque="1900" />
 		</v2.6:TorqueLimits>
-		<Components xsi:type="VehicleComponentsType">
+		<Components xsi:type="PrimaryVehicleComponentsDeclarationType">
 			<v2.6:Engine xsi:type="v2.0:EngineComponentDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 				<v2.0:Data id="ENG-gooZah3D" xsi:type="v2.1:EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1">
 					<Manufacturer>Generic Engine Manufacturer</Manufacturer>
@@ -3265,8 +3265,8 @@
 					</Axles>
 				</Data>
 			</v2.6:AxleWheels>
-			<v2.6:Auxiliaries xsi:type="v2.6:AuxiliariesComponentHeavyBusDeclarationType">
-				<Data xsi:type="AuxiliaryDataHeavyBusDeclarationType">
+			<v2.6:Auxiliaries xsi:type="PrimaryVehicleAuxiliariesComponentDeclarationType">
+				<Data xsi:type="PrimaryVehicleAuxiliaryDataDeclarationType">
 					<Fan>
 						<Technology>Hydraulic driven - Constant displacement pump</Technology>
 					</Fan>
@@ -3274,11 +3274,12 @@
 						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
 					</SteeringPump>
 					<ElectricSystem>
-						<AlternatorTechnology ratio="1.000">Standard technology - LED headlights, all</AlternatorTechnology>
+						<AlternatorTechnology ratio="1.000">Sample Alternator Technology 1</AlternatorTechnology>
 						<SmartElectrics>false</SmartElectrics>
 						<ResultCards></ResultCards>
 					</ElectricSystem>
 					<PneumaticSystem>
+						<SizeOfAirSupply>500</SizeOfAirSupply>
 						<AirsuspensionControl>mechanically</AirsuspensionControl>
 						<AdBlueDosing>true</AdBlueDosing>
 						<DoorDriveTechnology>pneumatic</DoorDriveTechnology>