diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd
index eb4db2f62008514f6e38d572078374c2f89a8148..6dea0c1d8e45b014bc41b809df7860e23ec84a8f 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 
-xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"  xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" xmlns:common="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
+<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" xmlns:common="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" schemaLocation="VectoOutputDefinitions.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
@@ -9,28 +8,35 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" schemaLocation="VectoDeclarationDefinitions.2.4.xsd"/>
+	<xs:element name="VectoMockResults">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="Results" type="vif:ResultsPrimaryVehicleType"/>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
 	<xs:element name="VectoOutputMultistep" type="vif:VectoOutputMultistepType">
 		<xs:annotation>
 			<xs:documentation>Comment describing your root element</xs:documentation>
 		</xs:annotation>
 	</xs:element>
-	<xs:complexType name="AbstractAngledriveDataPIFType" abstract="true"/>
-	<xs:complexType name="AbstractAuxiliaryDataPIFType" abstract="true"/>
-	<xs:complexType name="AbstractAxlegearDataPIFType" abstract="true"/>
-	<xs:complexType name="AbstractAxleWheelsComponentPIFType" abstract="true"/>
-	<xs:complexType name="AbstractAxleWheelsDataPIFType" abstract="true"/>
-	<xs:complexType name="AbstractEngineDataPIFType" abstract="true"/>
+	<xs:complexType name="AbstractAngledriveDataVIFType" abstract="true"/>
+	<xs:complexType name="AbstractAuxiliaryDataVIFType" abstract="true"/>
+	<xs:complexType name="AbstractAxlegearDataVIFType" abstract="true"/>
+	<xs:complexType name="AbstractAxleWheelsComponentVIFType" abstract="true"/>
+	<xs:complexType name="AbstractAxleWheelsDataVIFType" abstract="true"/>
+	<xs:complexType name="AbstractEngineDataVIFType" abstract="true"/>
 	<xs:complexType name="AbstractManufacturingStepDataType" abstract="true">
 		<xs:attribute name="id" type="xs:NCName" use="required"/>
 	</xs:complexType>
 	<xs:complexType name="AbstractPrimaryVehicleType" abstract="true"/>
-	<xs:complexType name="AbstractTorqueConverterDataPIFType" abstract="true"/>
-	<xs:complexType name="AbstractTransmissionDataPIFType" abstract="true"/>
-	<xs:complexType name="AbstractTransmissionGearsPIFType" abstract="true"/>
-	<xs:complexType name="AbstractVehicleComponentsPIFType" abstract="true"/>
-	<xs:complexType name="AngledriveDataPIFType">
+	<xs:complexType name="AbstractTorqueConverterDataVIFType" abstract="true"/>
+	<xs:complexType name="AbstractTransmissionDataVIFType" abstract="true"/>
+	<xs:complexType name="AbstractTransmissionGearsVIFType" abstract="true"/>
+	<xs:complexType name="AbstractVehicleComponentsVIFType" abstract="true"/>
+	<xs:complexType name="AngledriveDataVIFType">
 		<xs:complexContent>
-			<xs:extension base="vif:AbstractAngledriveDataPIFType">
+			<xs:extension base="vif:AbstractAngledriveDataVIFType">
 				<xs:sequence>
 					<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
 						<xs:annotation>
@@ -67,9 +73,9 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
-	<xs:complexType name="AngledrivePIFType">
+	<xs:complexType name="AngledriveVIFType">
 		<xs:sequence>
-			<xs:element name="Data" type="vif:AbstractAngledriveDataPIFType"/>
+			<xs:element name="Data" type="vif:AbstractAngledriveDataVIFType"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="ApplicationInformationPrimaryVehicleType">
@@ -86,14 +92,14 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
-	<xs:complexType name="AuxiliaryComponentPIFType">
+	<xs:complexType name="AuxiliaryComponentVIFType">
 		<xs:sequence>
-			<xs:element name="Data" type="vif:AbstractAuxiliaryDataPIFType"/>
+			<xs:element name="Data" type="vif:AbstractAuxiliaryDataVIFType"/>
 		</xs:sequence>
 	</xs:complexType>
-	<xs:complexType name="AuxiliaryDataPIFType">
+	<xs:complexType name="AuxiliaryDataVIFType">
 		<xs:complexContent>
-			<xs:extension base="vif:AbstractAuxiliaryDataPIFType">
+			<xs:extension base="vif:AbstractAuxiliaryDataVIFType">
 				<xs:sequence>
 					<xs:element name="Fan">
 						<xs:complexType>
@@ -295,14 +301,14 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
-	<xs:complexType name="AxlegearComponentPIFType">
+	<xs:complexType name="AxlegearComponentVIFType">
 		<xs:sequence>
-			<xs:element name="Data" type="vif:AbstractAxlegearDataPIFType"/>
+			<xs:element name="Data" type="vif:AbstractAxlegearDataVIFType"/>
 		</xs:sequence>
 	</xs:complexType>
-	<xs:complexType name="AxlegearDataPIFType">
+	<xs:complexType name="AxlegearDataVIFType">
 		<xs:complexContent>
-			<xs:extension base="vif:AbstractAxlegearDataPIFType">
+			<xs:extension base="vif:AbstractAxlegearDataVIFType">
 				<xs:sequence>
 					<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
 						<xs:annotation>
@@ -340,21 +346,21 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
-	<xs:complexType name="AxleWheelsComponentPIFType">
+	<xs:complexType name="AxleWheelsComponentVIFType">
 		<xs:complexContent>
-			<xs:extension base="vif:AbstractAxleWheelsComponentPIFType">
+			<xs:extension base="vif:AbstractAxleWheelsComponentVIFType">
 				<xs:sequence>
-					<xs:element name="Data" type="vif:AbstractAxleWheelsDataPIFType"/>
+					<xs:element name="Data" type="vif:AbstractAxleWheelsDataVIFType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
-	<xs:complexType name="AxleWheelsDataPIFType">
+	<xs:complexType name="AxleWheelsDataVIFType">
 		<xs:annotation>
 			<xs:documentation>Axles &amp; Wheels Component</xs:documentation>
 		</xs:annotation>
 		<xs:complexContent>
-			<xs:extension base="vif:AbstractAxleWheelsDataPIFType">
+			<xs:extension base="vif:AbstractAxleWheelsDataVIFType">
 				<xs:sequence>
 					<xs:element name="Axles">
 						<xs:complexType>
@@ -385,14 +391,14 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
-	<xs:complexType name="EngineComponentPIFType">
+	<xs:complexType name="EngineComponentVIFType">
 		<xs:sequence>
-			<xs:element name="Data" type="vif:AbstractEngineDataPIFType"/>
+			<xs:element name="Data" type="vif:AbstractEngineDataVIFType"/>
 		</xs:sequence>
 	</xs:complexType>
-	<xs:complexType name="EngineDataPIFType">
+	<xs:complexType name="EngineDataVIFType">
 		<xs:complexContent>
-			<xs:extension base="vif:AbstractEngineDataPIFType">
+			<xs:extension base="vif:AbstractEngineDataVIFType">
 				<xs:sequence>
 					<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
 						<xs:annotation>
@@ -465,7 +471,7 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
-	<xs:complexType name="FuelConsumptionType">
+	<xs:complexType name="EnergyConsumptionType">
 		<xs:simpleContent>
 			<xs:extension base="xs:double">
 				<xs:attribute name="unit" type="vif:EnergyConsumptionUnitType" use="required"/>
@@ -525,7 +531,7 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn
 					<xs:element name="Fuel" maxOccurs="unbounded">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="EnergyConsumption" type="vif:FuelConsumptionType" maxOccurs="unbounded">
+								<xs:element name="EnergyConsumption" type="vif:EnergyConsumptionType" maxOccurs="unbounded">
 									<xs:annotation>
 										<xs:documentation>I.2.3.1 - I.2.3.12 / #69</xs:documentation>
 									</xs:annotation>
@@ -592,7 +598,7 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn
 					</xs:restriction>
 				</xs:simpleType>
 			</xs:element>
-			<xs:element name="FuelMode">
+			<xs:element name="FuelMode" minOccurs="0">
 				<xs:simpleType>
 					<xs:restriction base="xs:string">
 						<xs:enumeration value="dual fuel mode"/>
@@ -602,9 +608,9 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
-	<xs:complexType name="TorqueConverterDataPIFType">
+	<xs:complexType name="TorqueConverterDataVIFType">
 		<xs:complexContent>
-			<xs:extension base="vif:AbstractTorqueConverterDataPIFType">
+			<xs:extension base="vif:AbstractTorqueConverterDataVIFType">
 				<xs:sequence>
 					<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
 						<xs:annotation>
@@ -647,19 +653,19 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
-	<xs:complexType name="TorqueConverterPIFType">
+	<xs:complexType name="TorqueConverterVIFType">
 		<xs:sequence>
-			<xs:element name="Data" type="vif:AbstractTorqueConverterDataPIFType"/>
+			<xs:element name="Data" type="vif:AbstractTorqueConverterDataVIFType"/>
 		</xs:sequence>
 	</xs:complexType>
-	<xs:complexType name="TransmissionComponentPIFType">
+	<xs:complexType name="TransmissionComponentVIFType">
 		<xs:sequence>
-			<xs:element name="Data" type="vif:AbstractTransmissionDataPIFType"/>
+			<xs:element name="Data" type="vif:AbstractTransmissionDataVIFType"/>
 		</xs:sequence>
 	</xs:complexType>
-	<xs:complexType name="TransmissionDataPIFType">
+	<xs:complexType name="TransmissionDataVIFType">
 		<xs:complexContent>
-			<xs:extension base="vif:AbstractTransmissionDataPIFType">
+			<xs:extension base="vif:AbstractTransmissionDataVIFType">
 				<xs:sequence>
 					<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
 						<xs:annotation>
@@ -692,12 +698,12 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="TransmissionType"/>
-					<xs:element name="Gears" type="vif:AbstractTransmissionGearsPIFType"/>
+					<xs:element name="Gears" type="vif:AbstractTransmissionGearsVIFType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
-	<xs:complexType name="TransmissionGearPIFType">
+	<xs:complexType name="TransmissionGearVIFType">
 		<xs:sequence>
 			<xs:element name="Ratio"/>
 			<xs:element name="MaxTorque" type="v1.0:GearboxGearMaxTorqueType" minOccurs="0">
@@ -713,11 +719,11 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn
 		</xs:sequence>
 		<xs:attribute name="number" use="required"/>
 	</xs:complexType>
-	<xs:complexType name="TransmissionGearsPIFType">
+	<xs:complexType name="TransmissionGearsVIFType">
 		<xs:complexContent>
-			<xs:extension base="vif:AbstractTransmissionGearsPIFType">
+			<xs:extension base="vif:AbstractTransmissionGearsVIFType">
 				<xs:sequence>
-					<xs:element name="Gear" type="vif:TransmissionGearPIFType" maxOccurs="unbounded"/>
+					<xs:element name="Gear" type="vif:TransmissionGearVIFType" maxOccurs="unbounded"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -728,21 +734,146 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn
 			<xs:element name="ManufacturingStep" type="vif:ManufacturingStepType" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
-	<xs:complexType name="VehicleComponentsPIFType">
+	<!--Components-->
+	<xs:complexType name="Vehicle_Conventional_ComponentsVIFType">
+		<xs:complexContent>
+			<xs:extension base="vif:AbstractVehicleComponentsVIFType">
+				<xs:sequence>
+					<xs:element name="Engine" type="vif:EngineComponentVIFType"/>
+					<xs:element name="Transmission" type="vif:TransmissionComponentVIFType"/>
+					<xs:element name="TorqueConverter" type="vif:TorqueConverterVIFType" minOccurs="0"/>
+					<xs:element name="Angledrive" type="vif:AngledriveVIFType" minOccurs="0"/>
+					<xs:element name="Axlegear" type="vif:AxlegearComponentVIFType"/>
+					<xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
+					<xs:element name="Auxiliaries" type="vif:AuxiliaryComponentVIFType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Vehicle_HEV-Px_ComponentsVIFType">
+		<xs:complexContent>
+			<xs:extension base="vif:AbstractVehicleComponentsVIFType">
+				<xs:sequence>
+					<xs:element name="Engine" type="vif:EngineComponentVIFType"/>
+					<xs:element name="IEPC" type="vif:IEPCType"/>
+					<xs:element name="ElectricEnergyStorage" type="vif:ElectricEnergyStorageType"/>
+					<xs:element name="ElectricMachineGEN" type="vif:ElectricMachineGENType"/>
+					<xs:element name="ElectricMachine" type="vif:ElectricMachineType"/>
+					<xs:element name="Transmission" type="vif:TransmissionComponentVIFType"/>
+					<xs:element name="TorqueConverter" type="vif:TorqueConverterVIFType" minOccurs="0"/>
+					<xs:element name="Angledrive" type="vif:AngledriveVIFType" minOccurs="0"/>
+					<xs:element name="Axlegear" type="vif:AxlegearComponentVIFType"/>
+					<xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
+					<xs:element name="Auxiliaries" type="vif:HEV-P_PrimaryAuxiliariesVIFType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Vehicle_HEV-IEPC-S_ComponentsVIFType">
+		<xs:complexContent>
+			<xs:extension base="vif:AbstractVehicleComponentsVIFType">
+				<xs:sequence>
+					<xs:element name="Engine" type="vif:EngineComponentVIFType"/>
+					<xs:element name="ElectricMachineGEN" type="vif:ElectricMachineGENType"/>
+					<xs:element name="ElectricEnergyStorage" type="vif:ElectricEnergyStorageType"/>
+					<xs:element name="IEPC" type="vif:IEPCType"/>
+					<xs:element name="Axlegear" type="vif:AxlegearComponentVIFType" minOccurs="0"/>
+					<xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
+					<xs:element name="Auxiliaries" type="vif:HEV-S_PrimaryAuxiliariesVIFType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Vehicle-IEPC_ComponentsVIFType">
+		<xs:complexContent>
+			<xs:extension base="vif:AbstractVehicleComponentsVIFType">
+				<xs:sequence>
+					<xs:element name="IEPC" type="vif:IEPCType"/>
+					<xs:element name="ElectricEnergyStorage" type="vif:ElectricEnergyStorageType"/>
+					<xs:element name="Axlegear" type="vif:AxlegearComponentVIFType" minOccurs="0"/>
+					<xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
+					<xs:element name="Auxiliaries" type="vif:HEV-S_PrimaryAuxiliariesVIFType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Vehicle_HEV-S2_ComponentsVIFType">
+		<xs:complexContent>
+			<xs:extension base="vif:AbstractVehicleComponentsVIFType">
+				<xs:sequence>
+					<xs:group ref="vif:Vehicle_HEV-Sx_ComponentsVIFTypeSequenceGroup"/>
+					<xs:element name="Axlegear" type="vif:AxlegearComponentVIFType" minOccurs="0"/>
+					<xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
+					<xs:element name="Auxiliaries" type="vif:HEV-S_PrimaryAuxiliariesVIFType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Vehicle_HEV-S3_ComponentsVIFType">
+		<xs:complexContent>
+			<xs:extension base="vif:AbstractVehicleComponentsVIFType">
+				<xs:sequence>
+					<xs:group ref="vif:Vehicle_HEV-Sx_ComponentsVIFTypeSequenceGroup"/>
+					<xs:element name="Axlegear" type="vif:AxlegearComponentVIFType" minOccurs="0"/>
+					<xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
+					<xs:element name="Auxiliaries" type="vif:HEV-S_PrimaryAuxiliariesVIFType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Vehicle_HEV-S4_ComponentsVIFType">
+		<xs:complexContent>
+			<xs:extension base="vif:AbstractVehicleComponentsVIFType">
+				<xs:sequence>
+					<xs:group ref="vif:Vehicle_HEV-Sx_ComponentsVIFTypeSequenceGroup"/>
+					<xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
+					<xs:element name="Auxiliaries" type="vif:HEV-S_PrimaryAuxiliariesVIFType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Vehicle_PEV-E2_ComponentsVIFType">
+		<xs:complexContent>
+			<xs:extension base="vif:AbstractVehicleComponentsVIFType">
+				<xs:sequence>
+					<xs:element name="ElectricMachine" type="vif:ElectricMachineType"/>
+					<xs:element name="ElectricEnergyStorage" type="vif:ElectricEnergyStorageType"/>
+					<xs:element name="Transmission" type="vif:TransmissionComponentVIFType"/>
+					<xs:element name="TorqueConverter" type="vif:TorqueConverterVIFType" minOccurs="0"/>
+					<xs:element name="Angledrive" type="vif:AngledriveVIFType" minOccurs="0"/>
+					<xs:element name="Axlegear" type="vif:AxlegearComponentVIFType"/>
+					<xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
+					<xs:element name="Auxiliaries" type="vif:PEV_PrimaryAuxiliairesVIFType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Vehicle_PEV-E3_ComponentsVIFType">
+		<xs:complexContent>
+			<xs:extension base="vif:AbstractVehicleComponentsVIFType">
+				<xs:sequence>
+					<xs:element name="ElectricMachine" type="vif:ElectricMachineType"/>
+					<xs:element name="ElectricEnergyStorage" type="vif:ElectricEnergyStorageType"/>
+					<xs:element name="Axlegear" type="vif:AxlegearComponentVIFType"/>
+					<xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
+					<xs:element name="Auxiliaries" type="vif:PEV_PrimaryAuxiliairesVIFType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Vehicle_PEV-E4_ComponentsVIFType">
 		<xs:complexContent>
-			<xs:extension base="vif:AbstractVehicleComponentsPIFType">
+			<xs:extension base="vif:AbstractVehicleComponentsVIFType">
 				<xs:sequence>
-					<xs:element name="Engine" type="vif:EngineComponentPIFType"/>
-					<xs:element name="Transmission" type="vif:TransmissionComponentPIFType"/>
-					<xs:element name="TorqueConverter" type="vif:TorqueConverterPIFType" minOccurs="0"/>
-					<xs:element name="Angledrive" type="vif:AngledrivePIFType" minOccurs="0"/>
-					<xs:element name="Axlegear" type="vif:AxlegearComponentPIFType"/>
-					<xs:element name="AxleWheels" type="vif:AxleWheelsComponentPIFType"/>
-					<xs:element name="Auxiliaries" type="vif:AuxiliaryComponentPIFType"/>
+					<xs:element name="ElectricMachine" type="vif:ElectricMachineType"/>
+					<xs:element name="ElectricEnergyStorage" type="vif:ElectricEnergyStorageType"/>
+					<xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
+					<xs:element name="Auxiliaries" type="vif:PEV_PrimaryAuxiliairesVIFType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
+	<!--VehicleVIFType-->
 	<xs:complexType name="VehicleExemptedPrimaryBusType">
 		<xs:complexContent>
 			<xs:extension base="vif:AbstractPrimaryVehicleType">
@@ -839,7 +970,7 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
-	<xs:complexType name="VehiclePIFType">
+	<xs:complexType name="ConventionalVehicleVIFType">
 		<xs:complexContent>
 			<xs:extension base="vif:AbstractPrimaryVehicleType">
 				<xs:sequence>
@@ -872,7 +1003,169 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn
 					<xs:element name="ZeroEmissionVehicle" type="xs:boolean"/>
 					<xs:element name="ADAS" type="v2.1:AbstractAdvancedDriverAssistantSystemsType"/>
 					<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
-					<xs:element name="Components" type="vif:AbstractVehicleComponentsPIFType"/>
+					<xs:element name="Components" type="vif:AbstractVehicleComponentsVIFType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="HEV-IEPC-S_VehicleVIFType">
+		<xs:complexContent>
+			<xs:extension base="vif:AbstractPrimaryVehicleType">
+				<xs:sequence>
+					<xs:group ref="vif:Vehicle_PrimaryBusParametersSequenceGroup"/>
+					<xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType">
+						<xs:annotation>
+							<xs:documentation>P198 - [1/min]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:group ref="v2.4:Vehicle_RetarderSequenceGroup"/>
+					<xs:group ref="vif:Vehicle_PrimaryBus_Retarder_ParametersSequenceGroup"/>
+					<xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
+						<xs:annotation>
+							<xs:documentation>P180 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ZeroEmissionVehicle" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P269 - bool</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ArchitectureID" type="v2.4:ArchitectureID_HEV-IEPC-S_Type">
+						<xs:annotation>
+							<xs:documentation>P400 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:group ref="vif:Vehicle_PrimaryBus_xEV_ParametersSequenceGroup"/>
+					<xs:element name="ADAS" type="v2.4:Abstract_ADAS_HEVType"/>
+					<xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
+					<xs:element name="Components" type="v2.4:Abstract_Components_HEV-IEPC-S_PrimaryBusDeclarationType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="HEV-Sx_VehicleVIFType">
+		<xs:complexContent>
+			<xs:extension base="vif:AbstractPrimaryVehicleType">
+				<xs:sequence>
+					<xs:group ref="vif:Vehicle_PrimaryBusParametersSequenceGroup"/>
+					<xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType">
+						<xs:annotation>
+							<xs:documentation>P198 - [1/min]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:group ref="vif:Vehicle_PrimaryBus_Retarder_ParametersSequenceGroup"/>
+					<xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
+						<xs:annotation>
+							<xs:documentation>P180 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ZeroEmissionVehicle" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P269 - bool</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ArchitectureID" type="v2.4:ArchitectureID_HEV-Sx_Type">
+						<xs:annotation>
+							<xs:documentation>P400 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:group ref="vif:Vehicle_PrimaryBus_xEV_ParametersSequenceGroup"/>
+					<xs:element name="ADAS" type="v2.4:Abstract_ADAS_HEVType"/>
+					<xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsSerialHybridDeclarationType" minOccurs="0"/>
+					<xs:element name="Components" type="v2.4:Abstract_Components_HEV-Sx_PrimaryBusDeclarationType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="HEV-Px_VehicleVIFType">
+		<xs:complexContent>
+			<xs:extension base="vif:AbstractPrimaryVehicleType">
+				<xs:sequence>
+					<xs:group ref="vif:Vehicle_PrimaryBusParametersSequenceGroup"/>
+					<xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType">
+						<xs:annotation>
+							<xs:documentation>P198 - [1/min]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:group ref="vif:Vehicle_PrimaryBus_Retarder_ParametersSequenceGroup"/>
+					<xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
+						<xs:annotation>
+							<xs:documentation>P180 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ZeroEmissionVehicle" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P269 - bool</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ArchitectureID" type="v2.4:ArchitectureID_HEV-Px_Type">
+						<xs:annotation>
+							<xs:documentation>P400 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:group ref="vif:Vehicle_PrimaryBus_xEV_ParametersSequenceGroup"/>
+					<xs:element name="ADAS" type="v2.4:Abstract_ADAS_HEVType"/>
+					<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
+					<xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
+					<xs:element name="BoostingLimitations" type="v2.4:AbstractBoostingLimitationsDeclarationType" minOccurs="0"/>
+					<xs:element name="Components" type="v2.4:Abstract_Components_HEV-Px_PrimaryBusDeclarationType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="IEPC_VehicleVIFType">
+		<xs:complexContent>
+			<xs:extension base="vif:AbstractPrimaryVehicleType">
+				<xs:sequence>
+					<xs:group ref="vif:Vehicle_PrimaryBusParametersSequenceGroup"/>
+					<xs:group ref="vif:Vehicle_PrimaryBus_Retarder_ParametersSequenceGroup"/>
+					<xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
+						<xs:annotation>
+							<xs:documentation>P180 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ZeroEmissionVehicle" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P269 - bool</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ArchitectureID" type="v2.4:ArchitectureID_IEPC_Type">
+						<xs:annotation>
+							<xs:documentation>P400 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:group ref="vif:Vehicle_PrimaryBus_xEV_ParametersSequenceGroup"/>
+					<xs:element name="ADAS" type="v2.4:Abstract_ADAS_IEPCType"/>
+					<xs:element name="Components" type="v2.4:Abstract_Components_IEPC_PrimaryBusDeclarationType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="PEV_VehicleVIFType">
+		<xs:complexContent>
+			<xs:extension base="vif:PrimaryVehicleDataType">
+				<xs:sequence>
+					<xs:group ref="vif:Vehicle_PrimaryBusParametersSequenceGroup"/>
+					<xs:group ref="vif:Vehicle_PrimaryBus_Retarder_ParametersSequenceGroup"/>
+					<xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
+						<xs:annotation>
+							<xs:documentation>P180 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ZeroEmissionVehicle" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P269 - bool</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ArchitectureID" type="v2.4:ArchitectureID_PEV_Type">
+						<xs:annotation>
+							<xs:documentation>P400 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:group ref="vif:Vehicle_PrimaryBus_xEV_ParametersSequenceGroup"/>
+					<xs:element name="ADAS" type="v2.4:Abstract_ADAS_PEVType"/>
+					<xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
+					<xs:element name="Components" type="v2.4:Abstract_Components_PEV_PrimaryBusDeclarationType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -912,4 +1205,1432 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn
 			<xs:enumeration value="Coach"/>
 		</xs:restriction>
 	</xs:simpleType>
+	<xs:group name="Vehicle_PrimaryBusParametersSequenceGroup">
+		<xs:sequence>
+			<xs:group ref="vif:Vehicle_PrimaryBusGeneralParametersSequence"/>
+			<xs:group ref="vif:Vehicle_PrimaryBusChassisBusParameters"/>
+		</xs:sequence>
+	</xs:group>
+	<xs:group name="Vehicle_PrimaryBusGeneralParametersSequence">
+		<xs:sequence>
+			<xs:element name="ManufacturerAddress" type="v1.0:ManufacturerAddressType">
+				<xs:annotation>
+					<xs:documentation>P252 - [-]</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Model" type="v1.0:ModelType">
+				<xs:annotation>
+					<xs:documentation>P236 - [-]</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="VIN" type="v1.0:VINType">
+				<xs:annotation>
+					<xs:documentation>P238 - [-]</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+				<xs:annotation>
+					<xs:documentation>P239 - [-]</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+				<xs:annotation>
+					<xs:documentation>P235 - [-]</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:group>
+	<xs:group name="Vehicle_PrimaryBusChassisBusParameters">
+		<xs:sequence>
+			<xs:sequence>
+				<xs:element name="LegislativeCategory" type="v2.4:LegislativeCategoryPrimaryBusDeclarationType">
+					<xs:annotation>
+						<xs:documentation>P251 - enum</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="ChassisConfiguration" type="v2.4:ChassisConfigurationPrimaryBusDeclarationType">
+					<xs:annotation>
+						<xs:documentation>P036 - enum</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="AxleConfiguration" type="v2.4:AxleConfigurationPrimaryBusLorryDeclarationType">
+					<xs:annotation>
+						<xs:documentation>P037 - enum</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="Articulated" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>P281 - bool</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="TechnicalPermissibleMaximumLadenMass" type="v1.0:VehicleGrossVehicleMassType">
+					<xs:annotation>
+						<xs:documentation>P041 - [kg]</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:sequence>
+	</xs:group>
+	<xs:group name="Vehicle_PrimaryBus_Retarder_ParametersSequenceGroup">
+		<xs:sequence>
+			<xs:sequence>
+				<xs:element name="RetarderType" type="v2.4:RetarderTypeType">
+					<xs:annotation>
+						<xs:documentation>P052 - enum</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="RetarderRatio" type="v1.0:RetarderRatioType" minOccurs="0">
+					<xs:annotation>
+						<xs:documentation>P053 - [-]</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+			</xs:sequence>
+		</xs:sequence>
+	</xs:group>
+	<xs:group name="Vehicle_PrimaryBus_xEV_ParametersSequenceGroup">
+		<xs:sequence>
+			<xs:sequence>
+				<xs:element name="OvcHev" type="xs:boolean">
+					<xs:annotation>
+						<xs:documentation>P401 - bool</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="MaxChargingPower" minOccurs="0">
+					<xs:annotation>
+						<xs:documentation>P402 - [W]</xs:documentation>
+					</xs:annotation>
+					<xs:simpleType>
+						<xs:restriction base="xs:int">
+							<xs:minExclusive value="0"/>
+						</xs:restriction>
+					</xs:simpleType>
+				</xs:element>
+			</xs:sequence>
+		</xs:sequence>
+	</xs:group>
+	<xs:complexType name="HEV-S_PrimaryAuxiliariesVIFType">
+		<xs:sequence>
+			<xs:element name="Data" type="vif:Abstract_AUX_HEV-S_PrimaryBusDeclarationType"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="HEV-P_PrimaryAuxiliariesVIFType">
+		<xs:sequence>
+			<xs:element name="Data" type="vif:Abstract_AUX_HEV-P_PrimaryBusDeclarationType"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="PEV_PrimaryAuxiliairesVIFType">
+		<xs:sequence>
+			<xs:element name="Data" type="vif:Abstract_AUX_PEV_PrimaryBusDeclarationType"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="IEPC_PrimaryAuxiliairesVIFType">
+		<xs:sequence>
+			<xs:element name="Data" type="vif:Abstract_AUX_IEPC_PrimaryBusDeclarationType"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="ElectricMachineGENType">
+		<xs:sequence>
+			<xs:element name="PowertrainPosition" type="v2.4:PowertrainPositionGENType">
+				<xs:annotation>
+					<xs:documentation>P403 - enum</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Count">
+				<xs:annotation>
+					<xs:documentation>P404 - [-]</xs:documentation>
+				</xs:annotation>
+				<xs:simpleType>
+					<xs:restriction base="xs:int">
+						<xs:minInclusive value="1"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="ADC" type="vif:ADCComponentDeclarationType" minOccurs="0"/>
+			<xs:element name="ElectricMachineSystem" type="vif:ElectricMachineSystemType"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="ElectricEnergyStorageType">
+		<xs:choice>
+			<xs:element name="Capacitor" type="vif:REESSCapacitorType"/>
+			<xs:element name="Battery" type="vif:REESSBatteryType" maxOccurs="unbounded"/>
+		</xs:choice>
+	</xs:complexType>
+	<xs:complexType name="REESSCapacitorType">
+		<xs:sequence>
+			<xs:element name="Data" type="vif:AbstractCapacitorSystemDataType"/>
+			<xs:element name="Signature" type="v2.0:SignatureType"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="AbstractCapacitorSystemDataType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="vif:AbstractREESSDataType"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="AbstractREESSDataType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="v1.0:VectoSimulationComponent"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="CapacitorSystemDataType">
+		<xs:complexContent>
+			<xs:extension base="vif:AbstractCapacitorSystemDataType">
+				<xs:sequence>
+					<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+						<xs:annotation>
+							<xs:documentation>P532 - [-]</xs:documentation>
+							<xs:appinfo>
+								<!-- <vectoParam:description>
+									<vectoParam:parameterId component="CapacitorSystem">532</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description> -->
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Model" type="v1.0:ModelType">
+						<xs:annotation>
+							<xs:documentation>P533 - [-]</xs:documentation>
+							<xs:appinfo>
+								<!-- <vectoParam:description>
+									<vectoParam:parameterId component="CapacitorSystem">533</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description> -->
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+						<xs:annotation>
+							<xs:documentation>P534 - [-]</xs:documentation>
+							<xs:appinfo>
+								<!-- <vectoParam:description>
+									<vectoParam:parameterId component="CapacitorSystem">534</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description> -->
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+						<xs:annotation>
+							<xs:documentation>P535 - [-]</xs:documentation>
+							<xs:appinfo>
+								<!-- <vectoParam:description>
+									<vectoParam:parameterId component="CapacitorSystem">535</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description> -->
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="AppVersion" type="v1.0:AppVersionType">
+						<xs:annotation>
+							<xs:documentation>P536 - [-]</xs:documentation>
+							<xs:appinfo>
+								<!-- <vectoParam:description>
+									<vectoParam:parameterId component="CapacitorSystem">536</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description> -->
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="CertificationMethod" type="v2.3:CertificationMethodType">
+						<xs:annotation>
+							<xs:documentation>P537 - enum</xs:documentation>
+							<xs:appinfo>
+								<!-- <vectoParam:description>
+									<vectoParam:parameterId component="CapacitorSystem">537</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description> -->
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Capacitance" type="v2.3:CapacitanceType">
+						<xs:annotation>
+							<xs:documentation>P538 - [F]</xs:documentation>
+							<xs:appinfo>
+								<!-- <vectoParam:description>
+									<vectoParam:parameterId component="CapacitorSystem">538</vectoParam:parameterId>
+									<vectoParam:unit>F</vectoParam:unit>
+								</vectoParam:description> -->
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="InternalResistance" type="v2.3:InternalResistanceType">
+						<xs:annotation>
+							<xs:documentation>P539 - [mOhm]</xs:documentation>
+							<xs:appinfo>
+								<!-- <vectoParam:description>
+									<vectoParam:parameterId component="CapacitorSystem">539</vectoParam:parameterId>
+									<vectoParam:unit>mOhm</vectoParam:unit>
+								</vectoParam:description> -->
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MinVoltage" type="v2.3:CapacitorVoltageType">
+						<xs:annotation>
+							<xs:documentation>P540 - [V]</xs:documentation>
+							<xs:appinfo>
+								<!-- <vectoParam:description>
+									<vectoParam:parameterId component="CapacitorSystem">540</vectoParam:parameterId>
+									<vectoParam:unit>V</vectoParam:unit>
+								</vectoParam:description> -->
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MaxVoltage" type="v2.3:CapacitorVoltageType">
+						<xs:annotation>
+							<xs:documentation>P541 - [V]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MaxChargingCurrent" type="v2.3:CapacitorMaxCurrentType">
+						<xs:annotation>
+							<xs:documentation>P542 - [A]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MaxDischargingCurrent" type="v2.3:CapacitorMaxCurrentType">
+						<xs:annotation>
+							<xs:documentation>P543 - [A]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TestingTemperature" type="xs:int" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>P544 - [°C]</xs:documentation>
+							<xs:appinfo>
+								<!-- <vectoParam:description>
+									<vectoParam:parameterId component="CapacitorSystem">544</vectoParam:parameterId>
+									<vectoParam:unit>°C</vectoParam:unit>
+								</vectoParam:description> -->
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="BatterySystemDataType">
+		<xs:complexContent>
+			<xs:extension base="v2.3:AbstractBatterySystemDataType">
+				<xs:sequence>
+					<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+						<!-- <xs:annotation>
+							<xs:documentation>P511 - [-]</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="BatterySystem">511</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation> -->
+					</xs:element>
+					<xs:element name="Model" type="v1.0:ModelType">
+						<!-- <xs:annotation>
+							<xs:documentation>P512 - [-]</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="BatterySystem">512</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation> -->
+					</xs:element>
+					<xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+						<xs:annotation>
+							<xs:documentation>P513 - [-]</xs:documentation>
+							<xs:appinfo>
+								<!-- <vectoParam:description>
+									<vectoParam:parameterId component="BatterySystem">513</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description> -->
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+						<xs:annotation>
+							<xs:documentation>P514 - [-]</xs:documentation>
+							<xs:appinfo>
+								<!-- <vectoParam:description>
+									<vectoParam:parameterId component="BatterySystem">514</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description> -->
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="AppVersion" type="v1.0:AppVersionType">
+						<xs:annotation>
+							<xs:documentation>P515 - [-]</xs:documentation>
+							<xs:appinfo>
+								<!-- <vectoParam:description>
+									<vectoParam:parameterId component="BatterySystem">515</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description> -->
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="CertificationMethod" type="v2.3:CertificationMethodType">
+						<xs:annotation>
+							<xs:documentation>P516 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="BatteryType" type="v2.3:BatteryTypeType">
+						<xs:annotation>
+							<xs:documentation>P517 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="RatedCapacity">
+						<xs:annotation>
+							<xs:documentation>P518 - [Ah]</xs:documentation>
+							<xs:appinfo>
+								<!-- <vectoParam:description>
+									<vectoParam:parameterId component="BatterySystem">518</vectoParam:parameterId>
+									<vectoParam:unit>Ah</vectoParam:unit>
+								</vectoParam:description> -->
+							</xs:appinfo>
+						</xs:annotation>
+						<xs:simpleType>
+							<xs:restriction base="v1.0:Double2">
+								<xs:minExclusive value="0.00"/>
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+					<xs:element name="ConnectorsSubsystemsIncluded" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P519 - bool</xs:documentation>
+							<xs:appinfo>
+								<!-- <vectoParam:description>
+									<vectoParam:parameterId component="BatterySystem">519</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description> -->
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="JunctionboxIncluded" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P520 - bool</xs:documentation>
+							<xs:appinfo>
+								<!-- <vectoParam:description>
+									<vectoParam:parameterId component="BatterySystem">520</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description> -->
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TestingTemperature" type="xs:int" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>P521 - [°C]</xs:documentation>
+							<xs:appinfo>
+								<!-- <vectoParam:description>
+									<vectoParam:parameterId component="BatterySystem">521</vectoParam:parameterId>
+									<vectoParam:unit>°C</vectoParam:unit>
+								</vectoParam:description> -->
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="OCV">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Entry" type="vif:BatterySystemOCVEntryType" minOccurs="2" maxOccurs="unbounded"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="InternalResistance">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Entry" type="vif:BatterySystemInternalResistanceEntryType" minOccurs="2" maxOccurs="unbounded"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="CurrentLimits">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Entry" type="vif:BatterySystemCurrentLimitsEntryType" minOccurs="2" maxOccurs="unbounded"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="BatterySystemCurrentLimitsEntryType">
+		<xs:attribute name="SoC" type="v2.3:BatterySoCType" use="required">
+			<xs:annotation>
+				<xs:documentation>P529 - [%]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="maxChargingCurrent" type="v2.3:BatteryMaxCurrentType" use="required">
+			<xs:annotation>
+				<xs:documentation>P530 - [A]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="maxDischargingCurrent" type="v2.3:BatteryMaxCurrentType" use="required">
+			<xs:annotation>
+				<xs:documentation>P531 - [A]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="BatterySystemInternalResistanceEntryType">
+		<xs:attribute name="SoC" type="v2.3:BatterySoCType" use="required">
+			<xs:annotation>
+				<xs:documentation>P524 - [%]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="R_2" type="v2.3:InternalResistanceType" use="required">
+			<xs:annotation>
+				<xs:documentation>P525 - [mOhm]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="R_10" type="v2.3:InternalResistanceType" use="required">
+			<xs:annotation>
+				<xs:documentation>P526 - [mOhm]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="R_20" type="v2.3:InternalResistanceType" use="required">
+			<xs:annotation>
+				<xs:documentation>P527 - [mOhm]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="R_120" type="v2.3:InternalResistanceType">
+			<xs:annotation>
+				<xs:documentation>P528 - [mOhm]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="BatterySystemOCVEntryType">
+		<xs:attribute name="SoC" type="v2.3:BatterySoCType" use="required">
+			<xs:annotation>
+				<xs:documentation>P522 - [%]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="OCV" type="v2.3:BatteryOCVType" use="required">
+			<xs:annotation>
+				<xs:documentation>P523 - [V]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="AbstractBatterySystemDataType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="vif:AbstractREESSDataType"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="REESSBatteryType">
+		<xs:sequence>
+			<xs:element name="StringID">
+				<xs:annotation>
+					<xs:documentation>P411 - [-]</xs:documentation>
+				</xs:annotation>
+				<xs:simpleType>
+					<xs:restriction base="xs:int">
+						<xs:minInclusive value="0"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="REESS">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Data" type="vif:AbstractBatterySystemDataType"/>
+						<xs:element name="Signature" type="v2.0:SignatureType"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:sequence minOccurs="0">
+				<xs:element name="SOCmin">
+					<xs:annotation>
+						<xs:documentation>P413 - [%]</xs:documentation>
+					</xs:annotation>
+					<xs:simpleType>
+						<xs:restriction base="xs:int">
+							<xs:minInclusive value="0"/>
+							<xs:maxInclusive value="100"/>
+						</xs:restriction>
+					</xs:simpleType>
+				</xs:element>
+				<xs:element name="SOCmax">
+					<xs:annotation>
+						<xs:documentation>P414 - [%]</xs:documentation>
+					</xs:annotation>
+					<xs:simpleType>
+						<xs:restriction base="xs:int">
+							<xs:minInclusive value="0"/>
+							<xs:maxInclusive value="100"/>
+						</xs:restriction>
+					</xs:simpleType>
+				</xs:element>
+			</xs:sequence>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:group name="IEPCCommonParametersSequenceGroup">
+		<xs:sequence>
+			<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+				<xs:annotation>
+					<xs:documentation>P478 - [-]</xs:documentation>
+					<xs:appinfo>
+						<!-- <vectoParam:description>
+							<vectoParam:parameterId component="IEPC">478</vectoParam:parameterId>
+							<vectoParam:unit>-</vectoParam:unit>
+						</vectoParam:description> -->
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Model" type="v1.0:ModelType">
+				<xs:annotation>
+					<xs:documentation>P479 - [-]</xs:documentation>
+					<xs:appinfo>
+						<!-- <vectoParam:description>
+							<vectoParam:parameterId component="IEPC">479</vectoParam:parameterId>
+							<vectoParam:unit>-</vectoParam:unit>
+						</vectoParam:description> -->
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+				<xs:annotation>
+					<xs:documentation>P480 - [-]</xs:documentation>
+					<xs:appinfo>
+						<!-- <vectoParam:description>
+							<vectoParam:parameterId component="IEPC">480</vectoParam:parameterId>
+							<vectoParam:unit>-</vectoParam:unit>
+						</vectoParam:description> -->
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+				<xs:annotation>
+					<xs:documentation>P481 - [-]</xs:documentation>
+					<xs:appinfo>
+						<!-- <vectoParam:description>
+							<vectoParam:parameterId component="IEPC">481</vectoParam:parameterId>
+							<vectoParam:unit>-</vectoParam:unit>
+						</vectoParam:description> -->
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AppVersion" type="v1.0:AppVersionType">
+				<xs:annotation>
+					<xs:documentation>P482 - [-]</xs:documentation>
+					<xs:appinfo>
+						<!-- <vectoParam:description>
+							<vectoParam:parameterId component="IEPC">482</vectoParam:parameterId>
+							<vectoParam:unit>-</vectoParam:unit>
+						</vectoParam:description> -->
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ElectricMachineType" type="v2.3:ElectricMachineTypeType">
+				<xs:annotation>
+					<xs:documentation>P483 - enum</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:group>
+	<xs:group name="IEPCPowerRatingsSequenceGroup">
+		<xs:sequence>
+			<xs:element name="R85RatedPower" type="v2.3:R85RatedPowerType">
+				<xs:annotation>
+					<xs:documentation>P485 - [W]</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RotationalInertia" type="v2.3:RotationalInertiaType">
+				<xs:annotation>
+					<xs:documentation>P486 [ kgm2]</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:group>
+	<xs:complexType name="IEPCGearDeclarationType">
+		<xs:sequence>
+			<xs:element name="Ratio" type="v1.0:GearboxGearRatioType">
+				<xs:annotation>
+					<xs:documentation>P497 - [-]</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaxOutShaftTorque" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>P498 - [Nm]</xs:documentation>
+				</xs:annotation>
+				<xs:simpleType>
+					<xs:restriction base="xs:int">
+						<xs:minExclusive value="0"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="MaxOutShaftSpeed" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>P499 - [1/min]</xs:documentation>
+				</xs:annotation>
+				<xs:simpleType>
+					<xs:restriction base="xs:int">
+						<xs:minExclusive value="0"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+		</xs:sequence>
+		<xs:attribute name="number" type="v1.0:GearboxGearNumberType" use="required">
+			<xs:annotation>
+				<xs:documentation>P496 - [-]</xs:documentation>
+				<xs:appinfo>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="AbstractIEPCGearsDeclarationType" abstract="true"/>
+	<xs:complexType name="IEPCGearsDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="vif:AbstractIEPCGearsDeclarationType">
+				<xs:sequence>
+					<xs:element name="Gear" type="vif:IEPCGearDeclarationType" maxOccurs="unbounded"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="AbstractElectricMachineSystemVoltageLevelType" abstract="true"/>
+	<xs:complexType name="IEPCSystemVoltageLevelMeasuredType">
+		<xs:complexContent>
+			<xs:extension base="vif:AbstractElectricMachineSystemVoltageLevelType">
+				<xs:sequence>
+					<xs:element name="Voltage" type="v2.3:VoltageLevelVoltageType">
+						<xs:annotation>
+							<xs:documentation>P500 - [V]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ContinuousTorque" type="v2.3:MaxTorqueType">
+						<xs:annotation>
+							<xs:documentation>P487 - [Nm]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TestSpeedContinuousTorque" type="v2.3:TestSpeedType">
+						<xs:annotation>
+							<xs:documentation>P488 - [1/min]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="OverloadTorque" type="v2.3:MaxTorqueType">
+						<xs:annotation>
+							<xs:documentation>P489 - [Nm]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TestSpeedOverloadTorque" type="v2.3:TestSpeedType">
+						<xs:annotation>
+							<xs:documentation>P490 - [1/min]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="OverloadDuration" type="v2.3:OverloadDurationType">
+						<xs:annotation>
+							<xs:documentation>P491 - [s]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MaxTorqueCurve" type="v2.3:ElectricMachineSystemMaxTorqueCurveType"/>
+					<xs:element name="PowerMap" maxOccurs="unbounded">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Entry" type="v2.3:IEPCSystemPowerMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
+							</xs:sequence>
+							<xs:attribute name="gear" use="required">
+								<xs:simpleType>
+									<xs:restriction base="xs:int">
+										<xs:minInclusive value="1"/>
+									</xs:restriction>
+								</xs:simpleType>
+							</xs:attribute>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="IEPCSystemDragTorqueEntryType">
+		<xs:attribute name="outShaftSpeed" type="v2.3:OutShaftSpeedType" use="required">
+			<xs:annotation>
+				<xs:documentation>P504 - [rpm]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="dragTorque" type="v2.3:DragTorqueType" use="required">
+			<xs:annotation>
+				<xs:documentation>P505 - [Nm]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="IEPCSystemConditioningEntryType">
+		<xs:attribute name="coolantTempInlet" type="v2.3:CoolantTempInletType" use="required">
+			<xs:annotation>
+				<xs:documentation>P509 - [°C]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="coolingPower" type="v2.3:CoolingPowerType" use="required">
+			<xs:annotation>
+				<xs:documentation>P510 - [W]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="AbstractVIFIEPCDataType" abstract="true"/>
+	<xs:complexType name="IEPCType">
+		<xs:sequence>
+			<xs:element name="Data" type="vif:AbstractVIFIEPCDataType"/>
+			<xs:element name="Signature" type="v2.0:SignatureType"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="IEPCMeasuredDataDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="vif:AbstractVIFIEPCDataType">
+				<xs:sequence>
+					<xs:group ref="vif:IEPCCommonParametersSequenceGroup"/>
+					<xs:element name="CertificationMethod">
+						<xs:annotation>
+							<xs:documentation>P484 - enum</xs:documentation>
+						</xs:annotation>
+						<xs:simpleType>
+							<xs:restriction base="v2.3:IEPCCertificationMethodType">
+								<xs:enumeration value="Measured for complete component"/>
+								<xs:enumeration value="Measured for EM and standard values for other components"/>
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+					<xs:group ref="vif:IEPCPowerRatingsSequenceGroup"/>
+					<xs:element name="DifferentialIncluded" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P493 - bool</xs:documentation>
+							<!-- <xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="IEPC">493</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo> -->
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DesignTypeWheelMotor" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P494 - bool</xs:documentation>
+							<xs:appinfo>
+								<!-- <vectoParam:description>
+									<vectoParam:parameterId component="IEPC">494</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description> -->
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="NrOfDesignTypeWheelMotorMeasured" type="v2.3:NrOfDesignTypeWheelMotorMeasuredType" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>P495 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Gears" type="vif:AbstractIEPCGearsDeclarationType"/>
+					<xs:element name="VoltageLevel" type="vif:IEPCSystemVoltageLevelMeasuredType" minOccurs="2" maxOccurs="unbounded"/>
+					<xs:element name="DragCurve" maxOccurs="unbounded">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Entry" type="vif:IEPCSystemDragTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
+							</xs:sequence>
+							<xs:attribute name="gear" use="required">
+								<xs:simpleType>
+									<xs:restriction base="xs:int">
+										<xs:minInclusive value="1"/>
+									</xs:restriction>
+								</xs:simpleType>
+							</xs:attribute>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="Conditioning" minOccurs="0">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Entry" type="vif:IEPCSystemConditioningEntryType"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="ElectricMachineSystemComponentDeclarationType">
+		<xs:sequence>
+			<xs:element name="Data" type="vif:AbstractElectricMachineSystemDataType"/>
+			<xs:element name="Signature" type="v2.0:SignatureType"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="ElectricMachineType">
+		<xs:sequence>
+			<xs:element name="Count">
+				<xs:annotation>
+					<xs:documentation>P404 - [-]</xs:documentation>
+				</xs:annotation>
+				<xs:simpleType>
+					<xs:restriction base="xs:int">
+						<xs:minInclusive value="1"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="ElectricMachineSystem" type="vif:ElectricMachineSystemComponentDeclarationType"/>
+			<xs:element name="ADC" type="vif:ADCComponentDeclarationType" minOccurs="0"/>
+			<xs:element name="P2.5GearRatios" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>P407 - [-]</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Ratio" maxOccurs="unbounded">
+							<xs:complexType>
+								<xs:simpleContent>
+									<xs:extension base="v1.0:Double3">
+										<xs:attribute name="gear" use="required"/>
+									</xs:extension>
+								</xs:simpleContent>
+							</xs:complexType>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="PowertrainPosition" type="v2.4:PowertrainPositionDriveType">
+				<xs:annotation>
+					<xs:documentation>P403 - enum</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:group name="Vehicle_HEV-Sx_ComponentsVIFTypeSequenceGroup">
+		<xs:sequence>
+			<xs:element name="Engine" type="vif:EngineComponentVIFType"/>
+			<xs:element name="ElectricMachineGEN" type="vif:ElectricMachineGENType"/>
+			<xs:element name="ElectricEnergyStorage" type="vif:ElectricEnergyStorageType"/>
+			<xs:element name="ElectricMachine" type="vif:ElectricMachineType"/>
+		</xs:sequence>
+	</xs:group>
+	<xs:complexType name="ElectricMachineSystemType">
+		<xs:sequence>
+			<xs:element name="Data" type="v2.3:AbstractElectricMachineSystemDataType"/>
+			<xs:element name="Signature" type="v2.0:SignatureType"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="ADCComponentDeclarationType">
+		<xs:sequence>
+			<xs:element name="Data" type="vif:AbstractADCDataDeclarationType"/>
+			<xs:element name="Signature" type="v2.0:SignatureType"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="AbstractADCDataDeclarationType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="v1.0:AbstractAngledriveDataDeclarationType"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="ADCDataDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="vif:AbstractADCDataDeclarationType">
+				<xs:sequence>
+					<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+						<xs:annotation>
+							<xs:documentation>P220 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Model" type="v1.0:ModelType">
+						<xs:annotation>
+							<xs:documentation>P221 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+						<xs:annotation>
+							<xs:documentation>P265 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+						<xs:annotation>
+							<xs:documentation>P223 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="AppVersion" type="v1.0:AppVersionType">
+						<xs:annotation>
+							<xs:documentation>P224 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Ratio" type="v1.0:AngledriveRatioType">
+						<xs:annotation>
+							<xs:documentation>P176 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="CertificationMethod" type="v1.0:AngledriveCertificationOptionType">
+						<xs:annotation>
+							<xs:documentation>P258 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TorqueLossMap">
+						<xs:complexType>
+							<xs:sequence minOccurs="4" maxOccurs="unbounded">
+								<xs:element name="Entry" type="v2.0:AngledriveLossMapEntryType"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="AbstractElectricMachineSystemDataType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="v1.0:VectoSimulationComponent"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:group name="ElectricMachineSystemCommonParametersSequenceGroup">
+		<xs:sequence>
+			<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+				<xs:annotation>
+					<xs:documentation>P450 - [-]</xs:documentation>
+					<xs:appinfo>
+						<!-- <vectoParam:description>
+							<vectoParam:parameterId component="ElectricMachine">450</vectoParam:parameterId>
+							<vectoParam:unit>-</vectoParam:unit>
+						</vectoParam:description> -->
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Model" type="v1.0:ModelType">
+				<xs:annotation>
+					<xs:documentation>P451 - [-]</xs:documentation>
+					<xs:appinfo>
+						<!-- <vectoParam:description>
+							<vectoParam:parameterId component="ElectricMachine">451</vectoParam:parameterId>
+							<vectoParam:unit>-</vectoParam:unit>
+						</vectoParam:description> -->
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+				<xs:annotation>
+					<xs:documentation>P452 - [-]</xs:documentation>
+					<xs:appinfo>
+						<!-- <vectoParam:description>
+							<vectoParam:parameterId component="ElectricMachine">452</vectoParam:parameterId>
+							<vectoParam:unit>-</vectoParam:unit>
+						</vectoParam:description> -->
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+				<xs:annotation>
+					<xs:documentation>P453 - [-]</xs:documentation>
+					<xs:appinfo>
+						<!-- <vectoParam:description>
+							<vectoParam:parameterId component="ElectricMachine">453</vectoParam:parameterId>
+							<vectoParam:unit>-</vectoParam:unit>
+						</vectoParam:description> -->
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AppVersion" type="v1.0:AppVersionType">
+				<xs:annotation>
+					<xs:documentation>P454 - [-]</xs:documentation>
+					<xs:appinfo>
+						<!-- <vectoParam:description>
+							<vectoParam:parameterId component="ElectricMachine">454</vectoParam:parameterId>
+							<vectoParam:unit>-</vectoParam:unit>
+						</vectoParam:description> -->
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ElectricMachineType" type="v2.3:ElectricMachineTypeType">
+				<xs:annotation>
+					<xs:documentation>P455 - enum</xs:documentation>
+					<xs:appinfo>
+						<!-- <vectoParam:description>
+							<vectoParam:parameterId component="ElectricMachine">455</vectoParam:parameterId>
+							<vectoParam:unit>-</vectoParam:unit>
+						</vectoParam:description> -->
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:group>
+	<xs:complexType name="ElectricMachineSystemIHPCMeasuredDataDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="vif:AbstractElectricMachineSystemDataType">
+				<xs:sequence>
+					<xs:group ref="vif:ElectricMachineSystemCommonParametersSequenceGroup"/>
+					<xs:element name="CertificationMethod">
+						<xs:annotation>
+							<xs:documentation>P456 - enum</xs:documentation>
+							<xs:appinfo>
+								<!-- <vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">456</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description> -->
+							</xs:appinfo>
+						</xs:annotation>
+						<xs:simpleType>
+							<xs:restriction base="v2.3:CertificationMethodType">
+								<xs:enumeration value="Measured"/>
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+					<xs:group ref="v2.3:ElectricMachineSystemPowerRatingsSequenceGroup"/>
+					<xs:element name="DcDcConverterIncluded" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P465 - bool</xs:documentation>
+							<xs:appinfo>
+								<!-- <vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">465</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description> -->
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="IHPCType">
+						<xs:annotation>
+							<xs:documentation>P466 - enum</xs:documentation>
+							<xs:appinfo>
+								<!-- <vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">466</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description> -->
+							</xs:appinfo>
+						</xs:annotation>
+						<xs:simpleType>
+							<xs:restriction base="v2.3:IHPCTypeType">
+								<xs:enumeration value="IHPC Type 1"/>
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+					<xs:element name="VoltageLevel" type="v2.3:ElectricMachineSystemIHPCVoltageLevelMeasuredType" minOccurs="2" maxOccurs="unbounded"/>
+					<xs:element name="DragCurve">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Entry" type="v2.3:ElectricMachineSystemDragTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="Conditioning" minOccurs="0">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Entry" type="v2.3:ElectricMachineSystemConditioningEntryType" maxOccurs="unbounded"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="ElectricMachineSystemIHPCVoltageLevelMeasuredType">
+		<xs:complexContent>
+			<xs:extension base="vif:AbstractElectricMachineSystemVoltageLevelType">
+				<xs:sequence>
+					<xs:element name="Voltage" type="v2.3:VoltageLevelVoltageType">
+						<xs:annotation>
+							<xs:documentation>P467 - [V]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ContinuousTorque" type="v2.3:MaxTorqueType">
+						<xs:annotation>
+							<xs:documentation>P459 - [Nm]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TestSpeedContinuousTorque" type="v2.3:TestSpeedType">
+						<xs:annotation>
+							<xs:documentation>P460 - [1/min]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="OverloadTorque" type="v2.3:MaxTorqueType">
+						<xs:annotation>
+							<xs:documentation>P461 - [Nm]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TestSpeedOverloadTorque" type="v2.3:TestSpeedType">
+						<xs:annotation>
+							<xs:documentation>P462 - [1/min]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="OverloadDuration" type="v2.3:OverloadDurationType">
+						<xs:annotation>
+							<xs:documentation>P463 - [s]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MaxTorqueCurve">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Entry" type="v2.3:ElectricMachineSystemMaxTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="PowerMap" maxOccurs="unbounded">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Entry" type="v2.3:ElectricMachineSystemPowerMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
+							</xs:sequence>
+							<xs:attribute name="gear" use="required">
+								<xs:simpleType>
+									<xs:restriction base="xs:int">
+										<xs:minInclusive value="1"/>
+									</xs:restriction>
+								</xs:simpleType>
+							</xs:attribute>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Abstract_AUX_HEV-P_PrimaryBusDeclarationType" abstract="true"/>
+	<xs:complexType name="Abstract_AUX_HEV-S_PrimaryBusDeclarationType" abstract="true"/>
+	<xs:complexType name="Abstract_AUX_IEPC_PrimaryBusDeclarationType" abstract="true"/>
+	<xs:complexType name="Abstract_AUX_PEV_PrimaryBusDeclarationType" abstract="true"/>
+	<xs:complexType name="AUX_PEV_PrimaryBusType">
+		<xs:complexContent>
+			<xs:extension base="vif:Abstract_AUX_PEV_PrimaryBusDeclarationType">
+				<xs:sequence>
+					<xs:element name="SteeringPump">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Technology" maxOccurs="4">
+									<xs:annotation>
+										<xs:documentation>P182</xs:documentation>
+									</xs:annotation>
+									<xs:complexType>
+										<xs:simpleContent>
+											<xs:extension base="v2.4:AuxSPTechnology_PEV_PrimaryBusType">
+												<xs:attribute name="axleNumber" use="required">
+													<xs:simpleType>
+														<xs:restriction base="xs:int">
+															<xs:minInclusive value="1"/>
+															<xs:maxInclusive value="4"/>
+														</xs:restriction>
+													</xs:simpleType>
+												</xs:attribute>
+											</xs:extension>
+										</xs:simpleContent>
+									</xs:complexType>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="PneumaticSystem">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:group ref="v2.4:BusAuxPneumaticSystemGen_PEV_SequenceGroup"/>
+								<xs:group ref="v2.4:BusAuxPneumaticSystemConsumerSequenceGroup"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="HVAC">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="AdjustableCoolantThermostat" type="xs:boolean">
+									<xs:annotation>
+										<xs:documentation>P324 - bool</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="AUX_IEPC_PrimaryBusType">
+		<xs:complexContent>
+			<xs:extension base="v2.4:Abstract_AUX_IEPC_PrimaryBusDeclarationType">
+				<xs:sequence>
+					<xs:element name="SteeringPump">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Technology" maxOccurs="4">
+									<xs:annotation>
+										<xs:documentation>P182 - enum</xs:documentation>
+									</xs:annotation>
+									<xs:complexType>
+										<xs:simpleContent>
+											<xs:extension base="v2.4:AuxSPTechnology_PEV_PrimaryBusType">
+												<xs:attribute name="axleNumber" use="required">
+													<xs:simpleType>
+														<xs:restriction base="xs:int">
+															<xs:minInclusive value="1"/>
+															<xs:maxInclusive value="4"/>
+														</xs:restriction>
+													</xs:simpleType>
+												</xs:attribute>
+											</xs:extension>
+										</xs:simpleContent>
+									</xs:complexType>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="PneumaticSystem">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:group ref="v2.4:BusAuxPneumaticSystemGen_IEPC_SequenceGroup"/>
+								<xs:group ref="v2.4:BusAuxPneumaticSystemConsumerSequenceGroup"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="HVAC">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="AdjustableCoolantThermostat" type="xs:boolean">
+									<xs:annotation>
+										<xs:documentation>P324 - bool</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="AUX_HEV-S_PrimaryBusType">
+		<xs:complexContent>
+			<xs:extension base="v2.4:Abstract_AUX_HEV-S_PrimaryBusDeclarationType">
+				<xs:sequence>
+					<xs:element name="Fan">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Technology" type="v2.4:AuxFanTechnologyPrimaryBusType">
+									<xs:annotation>
+										<xs:documentation>P181 - enum</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="SteeringPump">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Technology" maxOccurs="4">
+									<xs:annotation>
+										<xs:documentation>P182 - enum</xs:documentation>
+									</xs:annotation>
+									<xs:complexType>
+										<xs:simpleContent>
+											<xs:extension base="v2.4:AuxSPTechnology_HEV-S_PrimaryBusType">
+												<xs:attribute name="axleNumber" use="required">
+													<xs:simpleType>
+														<xs:restriction base="xs:int">
+															<xs:minInclusive value="1"/>
+															<xs:maxInclusive value="4"/>
+														</xs:restriction>
+													</xs:simpleType>
+												</xs:attribute>
+											</xs:extension>
+										</xs:simpleContent>
+									</xs:complexType>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="ElectricSystem">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="AlternatorTechnology" type="v2.4:AlternatorTechnology_HEV-S_Type">
+									<xs:annotation>
+										<xs:documentation>P294 - enum</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+								<xs:element name="SupplyFromHEVPossible" type="xs:boolean">
+									<xs:annotation>
+										<xs:documentation>P303 - bool</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="PneumaticSystem">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:group ref="v2.4:BusAuxPneumaticSystemGen_HEV-S_SequenceGroup"/>
+								<xs:group ref="v2.4:BusAuxPneumaticSystemConsumerSequenceGroup"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="HVAC">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="AdjustableCoolantThermostat" type="xs:boolean">
+									<xs:annotation>
+										<xs:documentation>P324 - bool</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+								<xs:element name="EngineWasteGasHeatExchanger" type="xs:boolean">
+									<xs:annotation>
+										<xs:documentation>P326 - bool</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="AUX_HEV-P_PrimaryBusType">
+		<xs:complexContent>
+			<xs:extension base="v2.4:Abstract_AUX_HEV-P_PrimaryBusDeclarationType">
+				<xs:sequence>
+					<xs:element name="Fan">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Technology" type="v2.4:AuxFanTechnologyPrimaryBusType">
+									<xs:annotation>
+										<xs:documentation>P181 - enum</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="SteeringPump">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Technology" maxOccurs="4">
+									<xs:annotation>
+										<xs:documentation>P182 - enum</xs:documentation>
+									</xs:annotation>
+									<xs:complexType>
+										<xs:simpleContent>
+											<xs:extension base="v2.4:AuxSPTechnologyPrimaryBusType">
+												<xs:attribute name="axleNumber" use="required">
+													<xs:simpleType>
+														<xs:restriction base="xs:int">
+															<xs:minInclusive value="1"/>
+															<xs:maxInclusive value="4"/>
+														</xs:restriction>
+													</xs:simpleType>
+												</xs:attribute>
+											</xs:extension>
+										</xs:simpleContent>
+									</xs:complexType>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="ElectricSystem">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="AlternatorTechnology" type="v2.4:AlternatorTechnology_HEV_Type">
+									<xs:annotation>
+										<xs:documentation>P294 - enum</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+								<xs:group ref="v2.4:BusAuxElectricSystemSupplySequenceGroup" minOccurs="0"/>
+								<xs:element name="SupplyFromHEVPossible" type="xs:boolean">
+									<xs:annotation>
+										<xs:documentation>P303 - bool</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="PneumaticSystem">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:group ref="v2.4:BusAuxPneumaticSystemGen_HEV-Px_SequenceGroup"/>
+								<xs:group ref="v2.4:BusAuxPneumaticSystemConsumerSequenceGroup"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="HVAC">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="AdjustableCoolantThermostat" type="xs:boolean">
+									<xs:annotation>
+										<xs:documentation>P324 - bool</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+								<xs:element name="EngineWasteGasHeatExchanger" type="xs:boolean">
+									<xs:annotation>
+										<xs:documentation>P326 - bool</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
 </xs:schema>