diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6.xsd
index 245141932d0bd422fee98c79986e1592245e29d3..0c8650bf78c187dbecca111c3ab097979d46a6b6 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6.xsd
@@ -1104,4 +1104,901 @@
 		</xs:annotation>
 		<xs:restriction base="v1.0:Double2"/>
 	</xs:simpleType>
+
+	<!-- New regulation updated components -->
+	<!-- abstract types -->
+	<xs:complexType name="Abstract_AUX_IEPC_LorryDeclarationType" abstract="true"/>
+	<xs:complexType name="Abstract_AUX_PEV_LorryDeclarationType" abstract="true"/>
+	<xs:complexType name="Abstract_AUX_HEV-P_LorryDeclarationType" abstract="true"/>
+	<xs:complexType name="Abstract_AUX_HEV-S_LorryDeclarationType" abstract="true"/>
+	<xs:complexType name="AUX_Component_IEPC_Lorry_Type">
+		<xs:sequence>
+			<xs:element name="Data" type="v2.6:Abstract_AUX_IEPC_LorryDeclarationType"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="AUX_Component_PEV_Lorry_Type">
+		<xs:sequence>
+			<xs:element name="Data" type="v2.6:Abstract_AUX_PEV_LorryDeclarationType"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="AUX_Component_Conventional_Lorry_Type">
+		<xs:sequence>
+			<xs:element name="Data" type="v2.0:AbstractAuxiliaryDataDeclarationType"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="AUX_Component_HEV-P_Lorry_Type">
+		<xs:sequence>
+			<xs:element name="Data" type="v2.6:Abstract_AUX_HEV-P_LorryDeclarationType"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="AUX_Component_HEV-S_Lorry_Type">
+		<xs:sequence>
+			<xs:element name="Data" type="v2.6:Abstract_AUX_HEV-S_LorryDeclarationType"/>
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="Abstract_Components_Conventional_LorryDeclarationType" abstract="true"/>
+	<xs:complexType name="Abstract_Components_IEPC_LorryDeclarationType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="v2.0:AbstractVehicleComponentsDeclarationType"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Abstract_Components_PEV_LorryDeclarationType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="v2.0:AbstractVehicleComponentsDeclarationType"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Abstract_Components_HEV-Px_LorryDeclarationType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="v2.0:AbstractVehicleComponentsDeclarationType"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Abstract_Components_HEV-IEPC-S_LorryDeclarationType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="v2.0:AbstractVehicleComponentsDeclarationType"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Abstract_Components_HEV-Sx_LorryDeclarationType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="v2.0:AbstractVehicleComponentsDeclarationType"/>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<!-- vehicles -->
+
+	<xs:complexType name="Vehicle_IEPC_HeavyLorryDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
+				<xs:sequence>
+					<xs:group ref="v2.4:Vehicle_HeavyLorryParametersSequenceGroup_1"/>
+					<xs:group ref="v2.4:Vehicle_HeavyLorryPEVParametersSequenceGroup_2"/>
+					<xs:element name="ArchitectureID" type="v2.4:ArchitectureID_IEPC_Type">
+						<xs:annotation>
+							<xs:documentation>P400 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ADAS" type="v2.4:Abstract_ADAS_IEPCType"/>
+					<xs:element name="Components" type="v2.6:Abstract_Components_IEPC_LorryDeclarationType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Vehicle_IEPC_MediumLorryDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
+				<xs:sequence>
+					<xs:group ref="v2.4:Vehicle_MediumLorryParametersSequenceGroup_1"/>
+					<xs:group ref="v2.4:Vehicle_MediumLorryPEVParametersSequenceGroup_2"/>
+					<xs:element name="ArchitectureID" type="v2.4:ArchitectureID_IEPC_Type">
+						<xs:annotation>
+							<xs:documentation>P400 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ADAS" type="v2.4:Abstract_ADAS_IEPCType"/>
+					<xs:element name="Components" type="v2.6:Abstract_Components_IEPC_LorryDeclarationType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Vehicle_PEV_HeavyLorryDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
+				<xs:sequence>
+					<xs:group ref="v2.4:Vehicle_HeavyLorryParametersSequenceGroup_1"/>
+					<xs:group ref="v2.4:Vehicle_HeavyLorryPEVParametersSequenceGroup_2"/>
+					<xs:element name="ArchitectureID" type="v2.4:ArchitectureID_PEV_Type">
+						<xs:annotation>
+							<xs:documentation>P400 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<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.6:Abstract_Components_PEV_LorryDeclarationType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Vehicle_PEV_MediumLorryDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
+				<xs:sequence>
+					<xs:group ref="v2.4:Vehicle_MediumLorryParametersSequenceGroup_1"/>
+					<xs:group ref="v2.4:Vehicle_MediumLorryPEVParametersSequenceGroup_2"/>
+					<xs:element name="ArchitectureID" type="v2.4:ArchitectureID_PEV_Type">
+						<xs:annotation>
+							<xs:documentation>P400 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<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.6:Abstract_Components_PEV_LorryDeclarationType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Vehicle_Conventional_HeavyLorryDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
+				<xs:sequence>
+					<xs:group ref="v2.4:Vehicle_HeavyLorryParametersSequenceGroup_1"/>
+					<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_HeavyLorryParametersSequenceGroup_2"/>
+					<xs:element name="ADAS" type="v2.4:Abstract_ADAS_ConventionalType"/>
+					<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
+					<xs:element name="Components" type="v2.6:Abstract_Components_Conventional_LorryDeclarationType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Vehicle_Conventional_MediumLorryDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
+				<xs:sequence>
+					<xs:group ref="v2.4:Vehicle_MediumLorryParametersSequenceGroup_1"/>
+					<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_MediumLorryParametersSequenceGroup_2"/>
+					<xs:element name="ADAS" type="v2.4:Abstract_ADAS_ConventionalType"/>
+					<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
+					<xs:element name="Components" type="v2.6:Abstract_Components_Conventional_LorryDeclarationType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Vehicle_HEV-Px_HeavyLorryDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
+				<xs:sequence>
+					<xs:group ref="v2.4:Vehicle_HeavyLorryParametersSequenceGroup_1"/>
+					<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_HeavyLorryParametersSequenceGroup_2"/>
+					<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="v2.4:Vehicle_HEV-Parameters_SequenceGroup"/>
+					<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.6:Abstract_Components_HEV-Px_LorryDeclarationType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Vehicle_HEV-Px_MediumLorryDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
+				<xs:sequence>
+					<xs:group ref="v2.4:Vehicle_MediumLorryParametersSequenceGroup_1"/>
+					<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_MediumLorryParametersSequenceGroup_2"/>
+					<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="v2.4:Vehicle_HEV-Parameters_SequenceGroup"/>
+					<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.6:Abstract_Components_HEV-Px_LorryDeclarationType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Vehicle_HEV-IEPC-S_HeavyLorryDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
+				<xs:sequence>
+					<xs:group ref="v2.4:Vehicle_HeavyLorryParametersSequenceGroup_1"/>
+					<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_HeavyLorryParametersSequenceGroup_2"/>
+					<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="v2.4:Vehicle_HEV-Parameters_SequenceGroup"/>
+					<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.6:Abstract_Components_HEV-IEPC-S_LorryDeclarationType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Vehicle_HEV-IEPC-S_MediumLorryDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
+				<xs:sequence>
+					<xs:group ref="v2.4:Vehicle_MediumLorryParametersSequenceGroup_1"/>
+					<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_MediumLorryParametersSequenceGroup_2"/>
+					<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="v2.4:Vehicle_HEV-Parameters_SequenceGroup"/>
+					<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.6:Abstract_Components_HEV-IEPC-S_LorryDeclarationType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Vehicle_HEV-Sx_HeavyLorryDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
+				<xs:sequence>
+					<xs:group ref="v2.4:Vehicle_HeavyLorryParametersSequenceGroup_1"/>
+					<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_HeavyLorryParametersSequenceGroup_2"/>
+					<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="v2.4:Vehicle_HEV-Parameters_SequenceGroup"/>
+					<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.6:Abstract_Components_HEV-Sx_LorryDeclarationType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Vehicle_HEV-Sx_MediumLorryDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
+				<xs:sequence>
+					<xs:group ref="v2.4:Vehicle_MediumLorryParametersSequenceGroup_1"/>
+					<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_MediumLorryParametersSequenceGroup_2"/>
+					<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="v2.4:Vehicle_HEV-Parameters_SequenceGroup"/>
+					<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.6:Abstract_Components_HEV-Sx_LorryDeclarationType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<!-- components -->
+
+	<xs:complexType name="Components_IEPC_LorryType">
+		<xs:complexContent>
+			<xs:extension base="v2.6:Abstract_Components_IEPC_LorryDeclarationType">
+				<xs:sequence>
+					<xs:element name="IEPC" type="v2.3:IEPCComponentDeclarationType"/>
+					<xs:element name="ElectricEnergyStorage" type="v2.4:ElectricEnergyStorageType"/>
+					<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
+					<xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType" minOccurs="0"/>
+					<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
+					<xs:element name="Auxiliaries" type="v2.6:AUX_Component_IEPC_Lorry_Type"/>
+					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Components_PEV-E2_LorryType">
+		<xs:complexContent>
+			<xs:extension base="v2.6:Abstract_Components_PEV_LorryDeclarationType">
+				<xs:sequence>
+					<xs:element name="ElectricMachine" type="v2.4:ElectricMachineType"/>
+					<xs:element name="ElectricEnergyStorage" type="v2.4:ElectricEnergyStorageType"/>
+					<xs:element name="Gearbox" type="v2.0:GearboxComponentDeclarationType"/>
+					<xs:element name="TorqueConverter" type="v2.0:TorqueConverterComponentDeclarationType" minOccurs="0"/>
+					<xs:element name="Angledrive" type="v2.0:AngledriveComponentDeclarationType" minOccurs="0"/>
+					<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="v2.6:AUX_Component_PEV_Lorry_Type"/>
+					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Components_PEV-E3_LorryType">
+		<xs:complexContent>
+			<xs:extension base="v2.4:Abstract_Components_PEV_LorryDeclarationType">
+				<xs:sequence>
+					<xs:element name="ElectricMachine" type="v2.4:ElectricMachineType"/>
+					<xs:element name="ElectricEnergyStorage" type="v2.4:ElectricEnergyStorageType"/>
+					<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="v2.6:AUX_Component_PEV_Lorry_Type"/>
+					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Components_PEV-E4_LorryType">
+		<xs:complexContent>
+			<xs:extension base="v2.4:Abstract_Components_PEV_LorryDeclarationType">
+				<xs:sequence>
+					<xs:element name="ElectricMachine" type="v2.4:ElectricMachineType"/>
+					<xs:element name="ElectricEnergyStorage" type="v2.4:ElectricEnergyStorageType"/>
+					<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
+					<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
+					<xs:element name="Auxiliaries" type="v2.6:AUX_Component_PEV_Lorry_Type"/>
+					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Components_Conventional_LorryType">
+		<xs:complexContent>
+			<xs:extension base="v2.6:Abstract_Components_Conventional_LorryDeclarationType">
+				<xs:sequence>
+					<xs:element name="Engine" type="v2.0:EngineComponentDeclarationType"/>
+					<xs:element name="Gearbox" type="v2.0:GearboxComponentDeclarationType"/>
+					<xs:element name="TorqueConverter" type="v2.0:TorqueConverterComponentDeclarationType" minOccurs="0"/>
+					<xs:element name="Angledrive" type="v2.0:AngledriveComponentDeclarationType" minOccurs="0"/>
+					<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="v2.6:AUX_Component_Conventional_Lorry_Type"/>
+					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Components_HEV-Px_LorryType">
+		<xs:complexContent>
+			<xs:extension base="v2.6:Abstract_Components_HEV-Px_LorryDeclarationType">
+				<xs:sequence>
+					<xs:element name="Engine" type="v2.0:EngineComponentDeclarationType"/>
+					<xs:element name="ElectricMachine" type="v2.4:ElectricMachineType"/>
+					<xs:element name="ElectricEnergyStorage" type="v2.4:ElectricEnergyStorageType"/>
+					<xs:element name="Gearbox" type="v2.0:GearboxComponentDeclarationType"/>
+					<xs:element name="TorqueConverter" type="v2.0:TorqueConverterComponentDeclarationType" minOccurs="0"/>
+					<xs:element name="Angledrive" type="v2.0:AngledriveComponentDeclarationType" minOccurs="0"/>
+					<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="v2.6:AUX_Component_HEV-P_Lorry_Type"/>
+					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Components_HEV-IEPC-S_LorryType">
+		<xs:complexContent>
+			<xs:extension base="v2.6:Abstract_Components_HEV-IEPC-S_LorryDeclarationType">
+				<xs:sequence>
+					<xs:group ref="v2.4:Components_HEV-IEPC-S_GenSetSequenceGroup"/>
+					<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
+					<xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType" minOccurs="0"/>
+					<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
+					<xs:element name="Auxiliaries" type="v2.6:AUX_Component_HEV-S_Lorry_Type"/>
+					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Components_HEV-S2_LorryType">
+		<xs:complexContent>
+			<xs:extension base="v2.6:Abstract_Components_HEV-Sx_LorryDeclarationType">
+				<xs:sequence>
+					<xs:group ref="v2.4:Components_HEV-Sx_GenSetSequenceGroup"/>
+					<xs:element name="Gearbox" type="v2.0:GearboxComponentDeclarationType"/>
+					<xs:element name="TorqueConverter" type="v2.0:TorqueConverterComponentDeclarationType" minOccurs="0"/>
+					<xs:element name="Angledrive" type="v2.0:AngledriveComponentDeclarationType" minOccurs="0"/>
+					<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="v2.6:AUX_Component_HEV-S_Lorry_Type"/>
+					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Components_HEV-S3_LorryType">
+		<xs:complexContent>
+			<xs:extension base="v2.6:Abstract_Components_HEV-Sx_LorryDeclarationType">
+				<xs:sequence>
+					<xs:group ref="v2.4:Components_HEV-Sx_GenSetSequenceGroup"/>
+					<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="v2.6:AUX_Component_HEV-S_Lorry_Type"/>
+					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="Components_HEV-S4_LorryType">
+		<xs:complexContent>
+			<xs:extension base="v2.6:Abstract_Components_HEV-Sx_LorryDeclarationType">
+				<xs:sequence>
+					<xs:group ref="v2.4:Components_HEV-Sx_GenSetSequenceGroup"/>
+					<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
+					<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
+					<xs:element name="Auxiliaries" type="v2.6:AUX_Component_HEV-S_Lorry_Type"/>
+					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<!-- aux component -->
+
+	<xs:complexType name="AUX_IEPC_LorryDataType">
+		<xs:complexContent>
+			<xs:extension base="v2.6:Abstract_AUX_IEPC_LorryDeclarationType">
+				<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_LorryType">
+												<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="Technology" type="v2.4:AuxESTechnologyLorryType">
+									<xs:annotation>
+										<xs:documentation>P183 - enum</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="PneumaticSystem">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Technology" type="v2.6:AuxPSTechnology_PEV_LorryType">
+									<xs:annotation>
+										<xs:documentation>P184 - enum</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="HVAC">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Technology" type="v2.4:AuxHVACTechnologyLorryType">
+									<xs:annotation>
+										<xs:documentation>P185 - enum</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="AUX_PEV_LorryDataType">
+		<xs:complexContent>
+			<xs:extension base="v2.6:Abstract_AUX_PEV_LorryDeclarationType">
+				<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_LorryType">
+												<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="Technology" type="v2.4:AuxESTechnologyLorryType">
+									<xs:annotation>
+										<xs:documentation>P183 - enum</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="PneumaticSystem">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Technology" type="v2.6:AuxPSTechnology_PEV_LorryType">
+									<xs:annotation>
+										<xs:documentation>P184 - enum</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="HVAC">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Technology" type="v2.4:AuxHVACTechnologyLorryType">
+									<xs:annotation>
+										<xs:documentation>P185 - enum</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="AUX_Conventional_LorryDataType">
+		<xs:complexContent>
+			<xs:extension base="v2.0:AbstractAuxiliaryDataDeclarationType">
+				<xs:sequence>
+					<xs:element name="Fan">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Technology" type="v2.4:AuxFanTechnologyLorryType">
+									<xs:annotation>
+										<xs:documentation>P181 - [-]</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 - [-]</xs:documentation>
+									</xs:annotation>
+									<xs:complexType>
+										<xs:simpleContent>
+											<xs:extension base="v2.4:AuxSPTechnologyLorryType">
+												<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="Technology" type="v2.4:AuxESTechnologyLorryType">
+									<xs:annotation>
+										<xs:documentation>P183 - [-]</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="PneumaticSystem">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Technology" type="v2.6:AuxPSTechnologyLorryType">
+									<xs:annotation>
+										<xs:documentation>P184 - [-]</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="HVAC">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Technology" type="v2.4:AuxHVACTechnologyLorryType">
+									<xs:annotation>
+										<xs:documentation>P185</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_LorryDataType">
+		<xs:complexContent>
+			<xs:extension base="v2.6:Abstract_AUX_HEV-P_LorryDeclarationType">
+				<xs:sequence>
+					<xs:element name="Fan">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Technology" type="v2.4:AuxFanTechnologyLorryType">
+									<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:AuxSPTechnologyLorryType">
+												<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="Technology" type="v2.4:AuxESTechnologyLorryType">
+									<xs:annotation>
+										<xs:documentation>P183 - enum</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="PneumaticSystem">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Technology" type="v2.6:AuxPSTechnologyLorryType">
+									<xs:annotation>
+										<xs:documentation>P184 - enum</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="HVAC">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Technology" type="v2.4:AuxHVACTechnologyLorryType">
+									<xs:annotation>
+										<xs:documentation>P185 - enum</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_LorryDataType">
+		<xs:complexContent>
+			<xs:extension base="v2.6:Abstract_AUX_HEV-S_LorryDeclarationType">
+				<xs:sequence>
+					<xs:element name="Fan">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Technology" type="v2.4:AuxFanTechnologyLorryType">
+									<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_LorryType">
+												<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="Technology" type="v2.4:AuxESTechnologyLorryType">
+									<xs:annotation>
+										<xs:documentation>P183 - enum</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="PneumaticSystem">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Technology" type="v2.6:AuxPSTechnologyLorryType">
+									<xs:annotation>
+										<xs:documentation>P184 - enum</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="HVAC">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Technology" type="v2.4:AuxHVACTechnologyLorryType">
+									<xs:annotation>
+										<xs:documentation>P185 - enum</xs:documentation>
+									</xs:annotation>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:simpleType name="AuxPSTechnology_PEV_LorryType">
+		<xs:restriction base="v2.4:AuxPSTechnologyLorryType">
+            <xs:enumeration value="Small + elec. driven"/>
+            <xs:enumeration value="Small + ESS AMS + elec. driven"/>
+            <xs:enumeration value="Medium Supply 1-stage + elec. driven"/>
+            <xs:enumeration value="Medium Supply 1-stage + AMS + elec. driven"/>
+            <xs:enumeration value="Medium Supply 2-stage + elec. driven"/>
+            <xs:enumeration value="Medium Supply 2-stage + AMS + elec. driven"/>
+            <xs:enumeration value="Large Supply + elec. driven"/>
+            <xs:enumeration value="Large Supply + AMS + elec. driven"/>
+            <xs:enumeration value="Vacuum pump + elec. driven"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="AuxPSTechnologyLorryType">
+		<xs:restriction base="xs:string">
+            <xs:enumeration value="Small"/>
+            <xs:enumeration value="Small + ESS"/>
+            <xs:enumeration value="Small + visco clutch"/>
+            <xs:enumeration value="Small + mech. clutch"/>
+            <xs:enumeration value="Small + ESS + AMS"/>
+            <xs:enumeration value="Small + visco clutch + AMS"/>
+            <xs:enumeration value="Small + mech. clutch + AMS"/>
+            <xs:enumeration value="Medium Supply 1-stage"/>
+            <xs:enumeration value="Medium Supply 1-stage + ESS"/>
+            <xs:enumeration value="Medium Supply 1-stage + visco clutch"/>
+            <xs:enumeration value="Medium Supply 1-stage + mech. clutch"/>
+            <xs:enumeration value="Medium Supply 1-stage + ESS + AMS"/>
+            <xs:enumeration value="Medium Supply 1-stage + visco clutch + AMS"/>
+            <xs:enumeration value="Medium Supply 1-stage + mech. clutch + AMS"/>
+            <xs:enumeration value="Medium Supply 2-stage"/>
+            <xs:enumeration value="Medium Supply 2-stage + ESS"/>
+            <xs:enumeration value="Medium Supply 2-stage + visco clutch"/>
+            <xs:enumeration value="Medium Supply 2-stage + mech. clutch"/>
+            <xs:enumeration value="Medium Supply 2-stage + ESS + AMS"/>
+            <xs:enumeration value="Medium Supply 2-stage + visco clutch + AMS"/>
+            <xs:enumeration value="Medium Supply 2-stage + mech. clutch + AMS"/>
+            <xs:enumeration value="Large Supply"/>
+            <xs:enumeration value="Large Supply + ESS"/>
+            <xs:enumeration value="Large Supply + visco clutch"/>
+            <xs:enumeration value="Large Supply + mech. clutch"/>
+            <xs:enumeration value="Large Supply + ESS + AMS"/>
+            <xs:enumeration value="Large Supply + visco clutch + AMS"/>
+            <xs:enumeration value="Large Supply + mech. clutch + AMS"/>
+            <xs:enumeration value="Vacuum pump"/>
+            <xs:enumeration value="Small + elec. driven"/>
+            <xs:enumeration value="Small + ESS AMS + elec. driven"/>
+            <xs:enumeration value="Medium Supply 1-stage + elec. driven"/>
+            <xs:enumeration value="Medium Supply 1-stage + AMS + elec. driven"/>
+            <xs:enumeration value="Medium Supply 2-stage + elec. driven"/>
+            <xs:enumeration value="Medium Supply 2-stage + AMS + elec. driven"/>
+            <xs:enumeration value="Large Supply + elec. driven"/>
+            <xs:enumeration value="Large Supply + AMS + elec. driven"/>
+            <xs:enumeration value="Vacuum pump + elec. driven"/>
+			<!--fully electric-->
+		</xs:restriction>
+	</xs:simpleType>
 </xs:schema>