From d8bd86547003005f842c469d28c150da9c4bdfac Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 24 Jan 2022 15:34:00 +0100
Subject: [PATCH] renaming XML schema for 2nd amendment to official namespace

---
 ...ponent.2.10.xsd => VectoComponent.2.1.xsd} |  14 +-
 .../XSD/VectoDeclarationComponent.xsd         |   2 +-
 ...sd => VectoDeclarationDefinitions.2.3.xsd} | 806 +++++++++++++----
 ...sd => VectoDeclarationDefinitions.2.4.xsd} | 821 +++++++++---------
 .../XSD/VectoDeclarationDefinitions.xsd       |   7 +-
 VectoCore/VectoXML.spp                        |   9 +-
 6 files changed, 1081 insertions(+), 578 deletions(-)
 rename VectoCore/VectoCore/Resources/XSD/{VectoComponent.2.10.xsd => VectoComponent.2.1.xsd} (69%)
 rename VectoCore/VectoCore/Resources/XSD/{VectoDeclarationDefinitions.2.10.1_xEV_Components.xsd => VectoDeclarationDefinitions.2.3.xsd} (66%)
 rename VectoCore/VectoCore/Resources/XSD/{VectoDeclarationDefinitions.2.10.2_JobInputData.xsd => VectoDeclarationDefinitions.2.4.xsd} (77%)

diff --git a/VectoCore/VectoCore/Resources/XSD/VectoComponent.2.10.xsd b/VectoCore/VectoCore/Resources/XSD/VectoComponent.2.1.xsd
similarity index 69%
rename from VectoCore/VectoCore/Resources/XSD/VectoComponent.2.10.xsd
rename to VectoCore/VectoCore/Resources/XSD/VectoComponent.2.1.xsd
index c16bf19c43..636aa3ed2c 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoComponent.2.10.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoComponent.2.1.xsd
@@ -1,9 +1,9 @@
 <?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:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:vdecdef1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:vdecdef2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:ns1="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:vdecdef1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:vdecdef2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:ns1="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/>
-	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" schemaLocation="VectoDeclarationDefinitions.2.10.1_xEV_Components.xsd"/>
+	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3.xsd"/>
 	<xs:element name="VectoInputDeclaration">
 		<xs:annotation>
 			<xs:documentation>Root Node Declaration Data</xs:documentation>
@@ -18,11 +18,11 @@
 				<xs:element name="Tyre" type="vdecdef2.0:TyreComponentDeclarationType"/>
 				<xs:element name="Angledrive" type="vdecdef2.0:AngledriveComponentDeclarationType"/>
 				<xs:element name="AirDrag" type="vdecdef2.0:AirDragComponentDeclarationType"/>
-				<xs:element name="ElectricMachineSystem" type="v2.10.1:ElectricMachineSystemComponentDeclarationType"/>
-				<xs:element name="IEPC" type="v2.10.1:IEPCComponentDeclarationType"/>
-				<xs:element name="BatterySystem" type="v2.10.1:BatteryComponentDeclarationType"/>
-				<xs:element name="CapacitorSystem" type="v2.10.1:CapacitorSystemComponentDeclarationType"/>
-				<xs:element name="ADC" type="v2.10.1:ADCComponentDeclarationType"/>
+				<xs:element name="ElectricMachineSystem" type="v2.3:ElectricMachineSystemComponentDeclarationType"/>
+				<xs:element name="IEPC" type="v2.3:IEPCComponentDeclarationType"/>
+				<xs:element name="BatterySystem" type="v2.3:BatteryComponentDeclarationType"/>
+				<xs:element name="CapacitorSystem" type="v2.3:CapacitorSystemComponentDeclarationType"/>
+				<xs:element name="ADC" type="v2.3:ADCComponentDeclarationType"/>
 			</xs:choice>
 			<xs:attribute name="schemaVersion" use="required">
 				<xs:simpleType>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd
index 4acb4f92bc..4dd2a0fac2 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd
@@ -8,6 +8,6 @@
  -->
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0" schemaLocation="VectoComponent.1.0.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" schemaLocation="VectoComponent.2.0.xsd"/>
-	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" schemaLocation="VectoComponent.2.10.xsd"/>
+	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" schemaLocation="VectoComponent.2.1.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
 </xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.1_xEV_Components.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3.xsd
similarity index 66%
rename from VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.1_xEV_Components.xsd
rename to VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3.xsd
index 4edfaf8568..7bb858edef 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.1_xEV_Components.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3.xsd
@@ -1,11 +1,521 @@
 <?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:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.4" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
+xmlns: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" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
 	<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/>
-	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3_DEV.xsd"/>
+	<xs:complexType name="EngineDataDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="v1.0:AbstractCombustionEngineDataDeclarationType">
+				<xs:sequence>
+					<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+						<xs:annotation>
+							<xs:documentation>P200 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Model" type="v1.0:ModelType">
+						<xs:annotation>
+							<xs:documentation>P201 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+						<xs:annotation>
+							<xs:documentation>P261 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+						<xs:annotation>
+							<xs:documentation>P203 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="AppVersion" type="v1.0:AppVersionType">
+						<xs:annotation>
+							<xs:documentation>P204 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Displacement" type="v1.0:EngineDisplacementType" nillable="false">
+						<xs:annotation>
+							<xs:documentation>P061 - [cm³]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="RatedSpeed" type="v1.0:EngineDeclaredSpeedType">
+						<xs:annotation>
+							<xs:documentation>P249 - [1/min]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="RatedPower" type="v1.0:EngineRatedPower">
+						<xs:annotation>
+							<xs:documentation>P250 - [W]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MaxEngineTorque" type="v1.0:EngineMaxTorque">
+						<xs:annotation>
+							<xs:documentation>P259 - [Nm]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="WHRType" type="v2.3:WHRTypeType"/>
+					<xs:element name="Mode" type="v2.3:EngineFuelModeType" maxOccurs="unbounded"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="EngineFuelModeType">
+		<xs:sequence>
+			<xs:element name="IdlingSpeed" type="v1.0:EngineDeclaredSpeedType">
+				<xs:annotation>
+					<xs:documentation>P063 - [1/min]</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="FullLoadAndDragCurve">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Entry" type="v1.0:FullLoadAndDragCurveEntryType" minOccurs="2" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Fuel" type="v2.3:EngineFuelType" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="EngineFuelType">
+		<xs:sequence>
+			<xs:element name="WHTCUrban" type="v1.0:EngineWHTCType">
+				<xs:annotation>
+					<xs:documentation>P109 - [-]</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WHTCRural" type="v1.0:EngineWHTCType">
+				<xs:annotation>
+					<xs:documentation>P110 - [-]</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WHTCMotorway" type="v1.0:EngineWHTCType">
+				<xs:annotation>
+					<xs:documentation>P111 - [-]</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="BFColdHot" type="v1.0:EngineColdHotBalancingFactorType">
+				<xs:annotation>
+					<xs:documentation>P159 - [-]</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CFRegPer" type="v1.0:EngineCFRegPerType">
+				<xs:annotation>
+					<xs:documentation>P192 [-]</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CFNCV" type="v1.0:EngineNCVCFType">
+				<xs:annotation>
+					<xs:documentation>P260 - [-]</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="WHRCorrectionFactors" minOccurs="0">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Electrical" type="v2.3:WHRElectricalCorrectionFactorsType" minOccurs="0"/>
+						<xs:element name="Mechanical" type="v2.3:WHRMechanicalCorrectionFactorsType" minOccurs="0"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="FuelConsumptionMap">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Entry" type="v2.3:FuelConsumptionEntryType" minOccurs="4" maxOccurs="unbounded"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
+		<xs:attribute name="type" type="v1.0:FuelTypeType" use="required">
+			<xs:annotation>
+				<xs:documentation>P193 [enum]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="FuelConsumptionEntryType">
+		<xs:attribute name="engineSpeed" type="v1.0:EngineSpeedType" use="required">
+			<xs:annotation>
+				<xs:documentation>P072 - [1/min]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="torque" type="v1.0:EngineFuelConsumptionMapTorqueType" use="required">
+			<xs:annotation>
+				<xs:documentation>P073 - [Nm]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="fuelConsumption" type="v1.0:EngineFuelConsumptionMapFuelConsumptionType" use="required">
+			<xs:annotation>
+				<xs:documentation>P074 - [g/h]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="electricPower" type="v1.0:Double2">
+			<xs:annotation>
+				<xs:documentation>P348 - [W]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="mechanicalPower" type="v1.0:Double2">
+			<xs:annotation>
+				<xs:documentation>P349 - [W]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="TyreDataDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="v1.0:AbstractTyreDataDeclarationType">
+				<xs:sequence>
+					<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+						<xs:annotation>
+							<xs:documentation>P230 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Model" type="v1.0:ModelType">
+						<xs:annotation>
+							<xs:documentation>P231 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+						<xs:annotation>
+							<xs:documentation>P267 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+						<xs:annotation>
+							<xs:documentation>P233 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="AppVersion" type="v1.0:AppVersionType">
+						<xs:annotation>
+							<xs:documentation>P234 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Dimension" type="v2.3:TyreDimensionType">
+						<xs:annotation>
+							<xs:documentation>P108 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TyreClass">
+						<xs:annotation>
+							<xs:documentation>P370 - enum</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="Tyre">370</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+						<xs:simpleType>
+							<xs:restriction base="xs:string">
+								<xs:minLength value="1"/>
+								<xs:enumeration value="C1"/>
+								<xs:enumeration value="C2"/>
+								<xs:enumeration value="C3"/>
+								<xs:enumeration value="N/A"/>
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+					<xs:element name="FuelEfficiencyClass">
+						<xs:annotation>
+							<xs:documentation>P371 - enum</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="Tyre">371</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+						<xs:simpleType>
+							<xs:restriction base="xs:string">
+								<xs:enumeration value="A"/>
+								<xs:enumeration value="B"/>
+								<xs:enumeration value="C"/>
+								<xs:enumeration value="D"/>
+								<xs:enumeration value="E"/>
+								<xs:enumeration value="F"/>
+								<xs:enumeration value="G"/>
+								<xs:enumeration value="N/A"/>
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+					<xs:element name="RRCDeclared" type="v1.0:TyreRRCISOType">
+						<xs:annotation>
+							<xs:documentation>P046 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="FzISO" type="v1.0:TyreFzISOType">
+						<xs:annotation>
+							<xs:documentation>P047 - [N]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="WHRElectricalCorrectionFactorsType">
+		<xs:sequence>
+			<xs:element name="Urban">
+				<xs:annotation>
+					<xs:documentation>P338 - [-]</xs:documentation>
+				</xs:annotation>
+				<xs:simpleType>
+					<xs:restriction base="v1.0:Double4">
+						<xs:minExclusive value="0.0"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="Rural">
+				<xs:annotation>
+					<xs:documentation>P339 - [-]</xs:documentation>
+				</xs:annotation>
+				<xs:simpleType>
+					<xs:restriction base="v1.0:Double4">
+						<xs:minExclusive value="0.0"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="Motorway">
+				<xs:annotation>
+					<xs:documentation>P340 - [-]</xs:documentation>
+				</xs:annotation>
+				<xs:simpleType>
+					<xs:restriction base="v1.0:Double4">
+						<xs:minExclusive value="0.0"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="BFColdHot">
+				<xs:annotation>
+					<xs:documentation>P341 - [-]</xs:documentation>
+				</xs:annotation>
+				<xs:simpleType>
+					<xs:restriction base="v1.0:Double4">
+						<xs:minExclusive value="0.0"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="CFRegPer">
+				<xs:annotation>
+					<xs:documentation>P342 - [-]</xs:documentation>
+				</xs:annotation>
+				<xs:simpleType>
+					<xs:restriction base="v1.0:Double4">
+						<xs:minExclusive value="0.0"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="WHRMechanicalCorrectionFactorsType">
+		<xs:sequence>
+			<xs:element name="Urban">
+				<xs:annotation>
+					<xs:documentation>P343 - [-]</xs:documentation>
+				</xs:annotation>
+				<xs:simpleType>
+					<xs:restriction base="v1.0:Double4">
+						<xs:minExclusive value="0.0"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="Rural">
+				<xs:annotation>
+					<xs:documentation>P344 - [-]</xs:documentation>
+				</xs:annotation>
+				<xs:simpleType>
+					<xs:restriction base="v1.0:Double4">
+						<xs:minExclusive value="0.0"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="Motorway">
+				<xs:annotation>
+					<xs:documentation>P345 - [-]</xs:documentation>
+				</xs:annotation>
+				<xs:simpleType>
+					<xs:restriction base="v1.0:Double4">
+						<xs:minExclusive value="0.0"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="BFColdHot">
+				<xs:annotation>
+					<xs:documentation>P346 - [-]</xs:documentation>
+				</xs:annotation>
+				<xs:simpleType>
+					<xs:restriction base="v1.0:Double4">
+						<xs:minExclusive value="0.0"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="CFRegPer">
+				<xs:annotation>
+					<xs:documentation>P347 - [-]</xs:documentation>
+				</xs:annotation>
+				<xs:simpleType>
+					<xs:restriction base="v1.0:Double4">
+						<xs:minExclusive value="0.0"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="WHRTypeType">
+		<xs:sequence>
+			<xs:element name="MechanicalOutputICE" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>P335 - bool</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MechanicalOutputDrivetrain" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>P336 - bool</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ElectricalOutput" type="xs:boolean">
+				<xs:annotation>
+					<xs:documentation>P337 - bool</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:simpleType name="AuxSPTechnologyType">
+		<xs:annotation>
+			<xs:documentation>P182</xs:documentation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Vehicle/Auxiliaries">182</vectoParam:parameterId>
+					<vectoParam:comment>Multiple entires allowed, one per steered axle</vectoParam:comment>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Fixed displacement"/>
+			<xs:enumeration value="Fixed displacement with elec. control"/>
+			<xs:enumeration value="Dual displacement with mech. control"/>
+			<xs:enumeration value="Dual displacement with elec. control"/>
+			<xs:enumeration value="Variable displacement mech. controlled"/>
+			<xs:enumeration value="Variable displacement elec. controlled"/>
+			<xs:enumeration value="Electric driven pump"/>
+			<xs:enumeration value="Full electric steering gear"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="TyreDimensionType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Tyre">108</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+			<xs:documentation>P108 - enum</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="9 R22.5"/>
+			<xs:enumeration value="9.00 R20"/>
+			<xs:enumeration value="9.5 R17.5"/>
+			<xs:enumeration value="10 R17.5"/>
+			<xs:enumeration value="10 R22.5"/>
+			<xs:enumeration value="10.00 R20"/>
+			<xs:enumeration value="11 R22.5"/>
+			<xs:enumeration value="11.00 R20"/>
+			<xs:enumeration value="12 R22.5"/>
+			<xs:enumeration value="12.00 R20"/>
+			<xs:enumeration value="12.00 R24"/>
+			<xs:enumeration value="12.5 R20"/>
+			<xs:enumeration value="13 R22.5"/>
+			<xs:enumeration value="14.00 R20"/>
+			<xs:enumeration value="14.5 R20"/>
+			<xs:enumeration value="16.00 R20"/>
+			<xs:enumeration value="205/75 R17.5"/>
+			<xs:enumeration value="215/75 R17.5"/>
+			<xs:enumeration value="225/70 R17.5"/>
+			<xs:enumeration value="225/75 R17.5"/>
+			<xs:enumeration value="235/75 R17.5"/>
+			<xs:enumeration value="245/70 R17.5"/>
+			<xs:enumeration value="245/70 R19.5"/>
+			<xs:enumeration value="255/70 R22.5"/>
+			<xs:enumeration value="265/70 R17.5"/>
+			<xs:enumeration value="265/70 R19.5"/>
+			<xs:enumeration value="275/70 R22.5"/>
+			<xs:enumeration value="275/80 R22.5"/>
+			<xs:enumeration value="285/60 R22.5"/>
+			<xs:enumeration value="285/70 R19.5"/>
+			<xs:enumeration value="295/55 R22.5"/>
+			<xs:enumeration value="295/60 R22.5"/>
+			<xs:enumeration value="295/80 R22.5"/>
+			<xs:enumeration value="305/60 R22.5"/>
+			<xs:enumeration value="305/70 R19.5"/>
+			<xs:enumeration value="305/70 R22.5"/>
+			<xs:enumeration value="305/75 R24.5"/>
+			<xs:enumeration value="315/45 R22.5"/>
+			<xs:enumeration value="315/60 R22.5"/>
+			<xs:enumeration value="315/70 R22.5"/>
+			<xs:enumeration value="315/80 R22.5"/>
+			<xs:enumeration value="325/95 R24"/>
+			<xs:enumeration value="335/80 R20"/>
+			<xs:enumeration value="355/50 R22.5"/>
+			<xs:enumeration value="365/70 R22.5"/>
+			<xs:enumeration value="365/80 R20"/>
+			<xs:enumeration value="365/85 R20"/>
+			<xs:enumeration value="375/45 R22.5"/>
+			<xs:enumeration value="375/50 R22.5"/>
+			<xs:enumeration value="375/90 R22.5"/>
+			<xs:enumeration value="385/55 R22.5"/>
+			<xs:enumeration value="385/65 R22.5"/>
+			<xs:enumeration value="395/85 R20"/>
+			<xs:enumeration value="425/65 R22.5"/>
+			<xs:enumeration value="495/45 R22.5"/>
+			<xs:enumeration value="525/65 R20.5"/>
+			<xs:enumeration value="11.00 R16"/>
+			<xs:enumeration value="6.00 R9"/>
+			<xs:enumeration value="205/65 R17.5"/>
+			<xs:enumeration value="225/75 R16C"/>
+			<xs:enumeration value="255/100 R16"/>
+			<xs:enumeration value="255/60 R19.5"/>
+			<xs:enumeration value="265/55 R19.5"/>
+			<xs:enumeration value="275/60 R19.5"/>
+			<xs:enumeration value="275/80 R20"/>
+			<xs:enumeration value="285/65 R16C"/>
+			<xs:enumeration value="295/75 R22.5"/>
+			<xs:enumeration value="325/85 R16"/>
+			<xs:enumeration value="435/50 R19.5"/>
+			<xs:enumeration value="435/50 R22.5"/>
+			<xs:enumeration value="445/40 R22.5"/>
+			<xs:enumeration value="445/45 R19.5"/>
+			<xs:enumeration value="445/65 R22.5"/>
+			<xs:enumeration value="445/75 R22.5"/>
+			<xs:enumeration value="455/40 R22.5"/>
+			<xs:enumeration value="455/45 R22.5"/>
+			<xs:enumeration value="475/80 R20"/>
+			<xs:enumeration value="7.00 R16C"/>
+			<xs:enumeration value="7.50 R15"/>
+			<xs:enumeration value="7.50 R16"/>
+			<xs:enumeration value="7.50 R16C"/>
+			<xs:enumeration value="8.25 R15"/>
+			<xs:enumeration value="8.25 R16C"/>
+			<xs:enumeration value="8.5 R17.5"/>
+			<xs:enumeration value="8 R17.5"/>
+			<xs:enumeration value="LT265/75 R16"/>
+			<xs:enumeration value="385/55 R19.5"/>
+			<xs:enumeration value="24 R21"/>
+			<xs:enumeration value="205/70 R15C"/>
+			<xs:enumeration value="215/70 R15C"/>
+			<xs:enumeration value="225/70 R15C"/>
+			<xs:enumeration value="185/75 R16C"/>
+			<xs:enumeration value="195/65 R16C"/>
+			<xs:enumeration value="195/75 R16C"/>
+			<xs:enumeration value="205/65 R16C"/>
+			<xs:enumeration value="205/75 R16C"/>
+			<xs:enumeration value="215/65 R16C"/>
+			<xs:enumeration value="215/75 R16C"/>
+			<xs:enumeration value="225/65 R16C"/>
+			<xs:enumeration value="235/65 R16C"/>
+			<xs:enumeration value="215/60 R17C"/>
+			<xs:enumeration value="235/60 R17C"/>
+		</xs:restriction>
+	</xs:simpleType>
 	<xs:complexType name="AbstractADCDataDeclarationType" abstract="true">
 		<xs:complexContent>
 			<xs:extension base="v1.0:AbstractAngledriveDataDeclarationType"/>
@@ -13,12 +523,12 @@
 	</xs:complexType>
 	<xs:complexType name="AbstractBatterySystemDataType" abstract="true">
 		<xs:complexContent>
-			<xs:extension base="v2.10.1:AbstractREESSDataType"/>
+			<xs:extension base="v2.3:AbstractREESSDataType"/>
 		</xs:complexContent>
 	</xs:complexType>
 	<xs:complexType name="AbstractCapacitorSystemDataType" abstract="true">
 		<xs:complexContent>
-			<xs:extension base="v2.10.1:AbstractREESSDataType"/>
+			<xs:extension base="v2.3:AbstractREESSDataType"/>
 		</xs:complexContent>
 	</xs:complexType>
 	<xs:complexType name="AbstractElectricMachineSystemDataType" abstract="true">
@@ -40,13 +550,13 @@
 	</xs:complexType>
 	<xs:complexType name="ADCComponentDeclarationType">
 		<xs:sequence>
-			<xs:element name="Data" type="v2.10.1:AbstractADCDataDeclarationType"/>
+			<xs:element name="Data" type="v2.3:AbstractADCDataDeclarationType"/>
 			<xs:element name="Signature" type="v2.0:SignatureType"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="ADCDataDeclarationType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.1:AbstractADCDataDeclarationType">
+			<xs:extension base="v2.3:AbstractADCDataDeclarationType">
 				<xs:sequence>
 					<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
 						<xs:annotation>
@@ -96,22 +606,22 @@
 	</xs:complexType>
 	<xs:complexType name="BatteryComponentDeclarationType">
 		<xs:sequence>
-			<xs:element name="Data" type="v2.10.1:AbstractBatterySystemDataType"/>
+			<xs:element name="Data" type="v2.3:AbstractBatterySystemDataType"/>
 			<xs:element name="Signature" type="v2.0:SignatureType"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="BatterySystemCurrentLimitsEntryType">
-		<xs:attribute name="SoC" type="v2.10.1:BatterySoCType" use="required">
+		<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.10.1:BatteryMaxCurrentType" use="required">
+		<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.10.1:BatteryMaxCurrentType" use="required">
+		<xs:attribute name="maxDischargingCurrent" type="v2.3:BatteryMaxCurrentType" use="required">
 			<xs:annotation>
 				<xs:documentation>P531 - [A]</xs:documentation>
 			</xs:annotation>
@@ -119,7 +629,7 @@
 	</xs:complexType>
 	<xs:complexType name="BatterySystemDataType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.1:AbstractBatterySystemDataType">
+			<xs:extension base="v2.3:AbstractBatterySystemDataType">
 				<xs:sequence>
 					<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
 						<xs:annotation>
@@ -176,12 +686,12 @@
 							</xs:appinfo>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="CertificationMethod" type="v2.10.1:CertificationMethodType">
+					<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.10.1:BatteryTypeType">
+					<xs:element name="BatteryType" type="v2.3:BatteryTypeType">
 						<xs:annotation>
 							<xs:documentation>P517 - enum</xs:documentation>
 						</xs:annotation>
@@ -238,21 +748,21 @@
 					<xs:element name="OCV">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Entry" type="v2.10.1:BatterySystemOCVEntryType" minOccurs="2" maxOccurs="unbounded"/>
+								<xs:element name="Entry" type="v2.3:BatterySystemOCVEntryType" minOccurs="2" maxOccurs="unbounded"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
 					<xs:element name="InternalResistance">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Entry" type="v2.10.1:BatterySystemInternalResistanceEntryType" minOccurs="2" maxOccurs="unbounded"/>
+								<xs:element name="Entry" type="v2.3:BatterySystemInternalResistanceEntryType" minOccurs="2" maxOccurs="unbounded"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
 					<xs:element name="CurrentLimits">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Entry" type="v2.10.1:BatterySystemCurrentLimitsEntryType" minOccurs="2" maxOccurs="unbounded"/>
+								<xs:element name="Entry" type="v2.3:BatterySystemCurrentLimitsEntryType" minOccurs="2" maxOccurs="unbounded"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
@@ -261,39 +771,39 @@
 		</xs:complexContent>
 	</xs:complexType>
 	<xs:complexType name="BatterySystemInternalResistanceEntryType">
-		<xs:attribute name="SoC" type="v2.10.1:BatterySoCType" use="required">
+		<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.10.1:InternalResistanceType" use="required">
+		<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.10.1:InternalResistanceType" use="required">
+		<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.10.1:InternalResistanceType" use="required">
+		<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.10.1:InternalResistanceType">
+		<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.10.1:BatterySoCType" use="required">
+		<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.10.1:BatteryOCVType" use="required">
+		<xs:attribute name="OCV" type="v2.3:BatteryOCVType" use="required">
 			<xs:annotation>
 				<xs:documentation>P523 - [V]</xs:documentation>
 			</xs:annotation>
@@ -301,13 +811,13 @@
 	</xs:complexType>
 	<xs:complexType name="CapacitorSystemComponentDeclarationType">
 		<xs:sequence>
-			<xs:element name="Data" type="v2.10.1:AbstractCapacitorSystemDataType"/>
+			<xs:element name="Data" type="v2.3:AbstractCapacitorSystemDataType"/>
 			<xs:element name="Signature" type="v2.0:SignatureType"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="CapacitorSystemDataType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.1:AbstractCapacitorSystemDataType">
+			<xs:extension base="v2.3:AbstractCapacitorSystemDataType">
 				<xs:sequence>
 					<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
 						<xs:annotation>
@@ -364,7 +874,7 @@
 							</xs:appinfo>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="CertificationMethod" type="v2.10.1:CertificationMethodType">
+					<xs:element name="CertificationMethod" type="v2.3:CertificationMethodType">
 						<xs:annotation>
 							<xs:documentation>P537 - enum</xs:documentation>
 							<xs:appinfo>
@@ -375,7 +885,7 @@
 							</xs:appinfo>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="Capacitance" type="v2.10.1:CapacitanceType">
+					<xs:element name="Capacitance" type="v2.3:CapacitanceType">
 						<xs:annotation>
 							<xs:documentation>P538 - [F]</xs:documentation>
 							<xs:appinfo>
@@ -386,7 +896,7 @@
 							</xs:appinfo>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="InternalResistance" type="v2.10.1:InternalResistanceType">
+					<xs:element name="InternalResistance" type="v2.3:InternalResistanceType">
 						<xs:annotation>
 							<xs:documentation>P539 - [mOhm]</xs:documentation>
 							<xs:appinfo>
@@ -397,7 +907,7 @@
 							</xs:appinfo>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="MinVoltage" type="v2.10.1:CapacitorVoltageType">
+					<xs:element name="MinVoltage" type="v2.3:CapacitorVoltageType">
 						<xs:annotation>
 							<xs:documentation>P540 - [V]</xs:documentation>
 							<xs:appinfo>
@@ -408,17 +918,17 @@
 							</xs:appinfo>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="MaxVoltage" type="v2.10.1:CapacitorVoltageType">
+					<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.10.1:CapacitorMaxCurrentType">
+					<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.10.1:CapacitorMaxCurrentType">
+					<xs:element name="MaxDischargingCurrent" type="v2.3:CapacitorMaxCurrentType">
 						<xs:annotation>
 							<xs:documentation>P543 - [A]</xs:documentation>
 						</xs:annotation>
@@ -440,17 +950,17 @@
 	</xs:complexType>
 	<xs:complexType name="ElectricMachineSystemComponentDeclarationType">
 		<xs:sequence>
-			<xs:element name="Data" type="v2.10.1:AbstractElectricMachineSystemDataType"/>
+			<xs:element name="Data" type="v2.3:AbstractElectricMachineSystemDataType"/>
 			<xs:element name="Signature" type="v2.0:SignatureType"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="IEPCSystemConditioningEntryType">
-		<xs:attribute name="coolantTempInlet" type="v2.10.1:CoolantTempInletType" use="required">
+		<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.10.1:CoolingPowerType" use="required">
+		<xs:attribute name="coolingPower" type="v2.3:CoolingPowerType" use="required">
 			<xs:annotation>
 				<xs:documentation>P510 - [W]</xs:documentation>
 			</xs:annotation>
@@ -483,24 +993,24 @@
 		<xs:restriction base="xs:int"/>
 	</xs:simpleType>
 	<xs:complexType name="ElectricMachineSystemConditioningEntryType">
-		<xs:attribute name="coolantTempInlet" type="v2.10.1:CoolantTempInletType" use="required">
+		<xs:attribute name="coolantTempInlet" type="v2.3:CoolantTempInletType" use="required">
 			<xs:annotation>
 				<xs:documentation>P476 - [°C]</xs:documentation>
 			</xs:annotation>
 		</xs:attribute>
-		<xs:attribute name="coolingPower" type="v2.10.1:CoolingPowerType" use="required">
+		<xs:attribute name="coolingPower" type="v2.3:CoolingPowerType" use="required">
 			<xs:annotation>
 				<xs:documentation>P477 - [W]</xs:documentation>
 			</xs:annotation>
 		</xs:attribute>
 	</xs:complexType>
 	<xs:complexType name="IEPCSystemDragTorqueEntryType">
-		<xs:attribute name="outShaftSpeed" type="v2.10.1:OutShaftSpeedType" use="required">
+		<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.10.1:DragTorqueType" use="required">
+		<xs:attribute name="dragTorque" type="v2.3:DragTorqueType" use="required">
 			<xs:annotation>
 				<xs:documentation>P505 - [Nm]</xs:documentation>
 			</xs:annotation>
@@ -520,12 +1030,12 @@
 		<xs:restriction base="v1.0:Double2"/>
 	</xs:simpleType>
 	<xs:complexType name="ElectricMachineSystemDragTorqueEntryType">
-		<xs:attribute name="outShaftSpeed" type="v2.10.1:OutShaftSpeedType" use="required">
+		<xs:attribute name="outShaftSpeed" type="v2.3:OutShaftSpeedType" use="required">
 			<xs:annotation>
 				<xs:documentation>P471 - [rpm]</xs:documentation>
 			</xs:annotation>
 		</xs:attribute>
-		<xs:attribute name="dragTorque" type="v2.10.1:DragTorqueType" use="required">
+		<xs:attribute name="dragTorque" type="v2.3:DragTorqueType" use="required">
 			<xs:annotation>
 				<xs:documentation>P472 - [Nm]</xs:documentation>
 			</xs:annotation>
@@ -533,9 +1043,9 @@
 	</xs:complexType>
 	<xs:complexType name="ElectricMachineSystemIHPCMeasuredDataDeclarationType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.1:AbstractElectricMachineSystemDataType">
+			<xs:extension base="v2.3:AbstractElectricMachineSystemDataType">
 				<xs:sequence>
-					<xs:group ref="v2.10.1:ElectricMachineSystemCommonParametersSequenceGroup"/>
+					<xs:group ref="v2.3:ElectricMachineSystemCommonParametersSequenceGroup"/>
 					<xs:element name="CertificationMethod">
 						<xs:annotation>
 							<xs:documentation>P456 - enum</xs:documentation>
@@ -547,12 +1057,12 @@
 							</xs:appinfo>
 						</xs:annotation>
 						<xs:simpleType>
-							<xs:restriction base="v2.10.1:CertificationMethodType">
+							<xs:restriction base="v2.3:CertificationMethodType">
 								<xs:enumeration value="Measured"/>
 							</xs:restriction>
 						</xs:simpleType>
 					</xs:element>
-					<xs:group ref="v2.10.1:ElectricMachineSystemPowerRatingsSequenceGroup"/>
+					<xs:group ref="v2.3:ElectricMachineSystemPowerRatingsSequenceGroup"/>
 					<xs:element name="DcDcConverterIncluded" type="xs:boolean">
 						<xs:annotation>
 							<xs:documentation>P465 - bool</xs:documentation>
@@ -575,23 +1085,23 @@
 							</xs:appinfo>
 						</xs:annotation>
 						<xs:simpleType>
-							<xs:restriction base="v2.10.1:IHPCTypeType">
+							<xs:restriction base="v2.3:IHPCTypeType">
 								<xs:enumeration value="IHPC Type 1"/>
 							</xs:restriction>
 						</xs:simpleType>
 					</xs:element>
-					<xs:element name="VoltageLevel" type="v2.10.1:ElectricMachineSystemIHPCVoltageLevelMeasuredType" minOccurs="2" maxOccurs="unbounded"/>
+					<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.10.1:ElectricMachineSystemDragTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
+								<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.10.1:ElectricMachineSystemConditioningEntryType" maxOccurs="unbounded"/>
+								<xs:element name="Entry" type="v2.3:ElectricMachineSystemConditioningEntryType" maxOccurs="unbounded"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
@@ -601,34 +1111,34 @@
 	</xs:complexType>
 	<xs:complexType name="ElectricMachineSystemIHPCVoltageLevelMeasuredType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.1:AbstractElectricMachineSystemVoltageLevelType">
+			<xs:extension base="v2.3:AbstractElectricMachineSystemVoltageLevelType">
 				<xs:sequence>
-					<xs:element name="Voltage" type="v2.10.1:VoltageLevelVoltageType">
+					<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.10.1:MaxTorqueType">
+					<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.10.1:TestSpeedType">
+					<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.10.1:MaxTorqueType">
+					<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.10.1:TestSpeedType">
+					<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.10.1:OverloadDurationType">
+					<xs:element name="OverloadDuration" type="v2.3:OverloadDurationType">
 						<xs:annotation>
 							<xs:documentation>P463 - [s]</xs:documentation>
 						</xs:annotation>
@@ -636,14 +1146,14 @@
 					<xs:element name="MaxTorqueCurve">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Entry" type="v2.10.1:ElectricMachineSystemMaxTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
+								<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.10.1:ElectricMachineSystemPowerMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
+								<xs:element name="Entry" type="v2.3:ElectricMachineSystemPowerMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
 							</xs:sequence>
 							<xs:attribute name="gear" use="required">
 								<xs:simpleType>
@@ -660,21 +1170,21 @@
 	</xs:complexType>
 	<xs:complexType name="ElectricMachineSystemMaxTorqueCurveType">
 		<xs:sequence>
-			<xs:element name="Entry" type="v2.10.1:ElectricMachineSystemMaxTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
+			<xs:element name="Entry" type="v2.3:ElectricMachineSystemMaxTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="ElectricMachineSystemMaxTorqueEntryType">
-		<xs:attribute name="outShaftSpeed" type="v2.10.1:OutShaftSpeedType" use="required">
+		<xs:attribute name="outShaftSpeed" type="v2.3:OutShaftSpeedType" use="required">
 			<xs:annotation>
 				<xs:documentation>P468 - [rpm]</xs:documentation>
 			</xs:annotation>
 		</xs:attribute>
-		<xs:attribute name="maxTorque" type="v2.10.1:maxTorqueType" use="required">
+		<xs:attribute name="maxTorque" type="v2.3:maxTorqueType" use="required">
 			<xs:annotation>
 				<xs:documentation>P469 - [Nm]</xs:documentation>
 			</xs:annotation>
 		</xs:attribute>
-		<xs:attribute name="minTorque" type="v2.10.1:minTorqueType" use="required">
+		<xs:attribute name="minTorque" type="v2.3:minTorqueType" use="required">
 			<xs:annotation>
 				<xs:documentation>P470 - [Nm]</xs:documentation>
 			</xs:annotation>
@@ -682,9 +1192,9 @@
 	</xs:complexType>
 	<xs:complexType name="ElectricMachineSystemMeasuredDataDeclarationType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.1:AbstractElectricMachineSystemDataType">
+			<xs:extension base="v2.3:AbstractElectricMachineSystemDataType">
 				<xs:sequence>
-					<xs:group ref="v2.10.1:ElectricMachineSystemCommonParametersSequenceGroup"/>
+					<xs:group ref="v2.3:ElectricMachineSystemCommonParametersSequenceGroup"/>
 					<xs:element name="CertificationMethod">
 						<xs:annotation>
 							<xs:documentation>P456 - enum</xs:documentation>
@@ -696,12 +1206,12 @@
 							</xs:appinfo>
 						</xs:annotation>
 						<xs:simpleType>
-							<xs:restriction base="v2.10.1:CertificationMethodType">
+							<xs:restriction base="v2.3:CertificationMethodType">
 								<xs:enumeration value="Measured"/>
 							</xs:restriction>
 						</xs:simpleType>
 					</xs:element>
-					<xs:group ref="v2.10.1:ElectricMachineSystemPowerRatingsSequenceGroup"/>
+					<xs:group ref="v2.3:ElectricMachineSystemPowerRatingsSequenceGroup"/>
 					<xs:element name="DcDcConverterIncluded" type="xs:boolean">
 						<xs:annotation>
 							<xs:documentation>P465 - bool</xs:documentation>
@@ -718,23 +1228,23 @@
 							<xs:documentation>P466 - enum</xs:documentation>
 						</xs:annotation>
 						<xs:simpleType>
-							<xs:restriction base="v2.10.1:IHPCTypeType">
+							<xs:restriction base="v2.3:IHPCTypeType">
 								<xs:enumeration value="None"/>
 							</xs:restriction>
 						</xs:simpleType>
 					</xs:element>
-					<xs:element name="VoltageLevel" type="v2.10.1:ElectricMachineSystemVoltageLevelMeasuredType" minOccurs="2" maxOccurs="unbounded"/>
+					<xs:element name="VoltageLevel" type="v2.3:ElectricMachineSystemVoltageLevelMeasuredType" minOccurs="2" maxOccurs="unbounded"/>
 					<xs:element name="DragCurve">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Entry" type="v2.10.1:ElectricMachineSystemDragTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
+								<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.10.1:ElectricMachineSystemConditioningEntryType" maxOccurs="unbounded"/>
+								<xs:element name="Entry" type="v2.3:ElectricMachineSystemConditioningEntryType" maxOccurs="unbounded"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
@@ -743,17 +1253,17 @@
 		</xs:complexContent>
 	</xs:complexType>
 	<xs:complexType name="ElectricMachineSystemPowerMapEntryType">
-		<xs:attribute name="outShaftSpeed" type="v2.10.1:OutShaftSpeedType" use="required">
+		<xs:attribute name="outShaftSpeed" type="v2.3:OutShaftSpeedType" use="required">
 			<xs:annotation>
 				<xs:documentation>P473 - [rpm]</xs:documentation>
 			</xs:annotation>
 		</xs:attribute>
-		<xs:attribute name="torque" type="v2.10.1:PowerMapTorqueType" use="required">
+		<xs:attribute name="torque" type="v2.3:PowerMapTorqueType" use="required">
 			<xs:annotation>
 				<xs:documentation>P474 - [Nm]</xs:documentation>
 			</xs:annotation>
 		</xs:attribute>
-		<xs:attribute name="electricPower" type="v2.10.1:PowerMapElectricPowerType" use="required">
+		<xs:attribute name="electricPower" type="v2.3:PowerMapElectricPowerType" use="required">
 			<xs:annotation>
 				<xs:documentation>P475 - [W]</xs:documentation>
 			</xs:annotation>
@@ -761,9 +1271,9 @@
 	</xs:complexType>
 	<xs:complexType name="ElectricMachineSystemStandardValuesDataDeclarationType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.1:AbstractElectricMachineSystemDataType">
+			<xs:extension base="v2.3:AbstractElectricMachineSystemDataType">
 				<xs:sequence>
-					<xs:group ref="v2.10.1:ElectricMachineSystemCommonParametersSequenceGroup"/>
+					<xs:group ref="v2.3:ElectricMachineSystemCommonParametersSequenceGroup"/>
 					<xs:element name="CertificationMethod">
 						<xs:annotation>
 							<xs:documentation>P456 - enum</xs:documentation>
@@ -775,12 +1285,12 @@
 							</xs:appinfo>
 						</xs:annotation>
 						<xs:simpleType>
-							<xs:restriction base="v2.10.1:CertificationMethodType">
+							<xs:restriction base="v2.3:CertificationMethodType">
 								<xs:enumeration value="Standard values"/>
 							</xs:restriction>
 						</xs:simpleType>
 					</xs:element>
-					<xs:group ref="v2.10.1:ElectricMachineSystemPowerRatingsSequenceGroup"/>
+					<xs:group ref="v2.3:ElectricMachineSystemPowerRatingsSequenceGroup"/>
 					<xs:element name="DcDcConverterIncluded" type="xs:boolean">
 						<xs:annotation>
 							<xs:documentation>P465 - bool</xs:documentation>
@@ -803,16 +1313,16 @@
 							</xs:appinfo>
 						</xs:annotation>
 						<xs:simpleType>
-							<xs:restriction base="v2.10.1:IHPCTypeType">
+							<xs:restriction base="v2.3:IHPCTypeType">
 								<xs:enumeration value="None"/>
 							</xs:restriction>
 						</xs:simpleType>
 					</xs:element>
-					<xs:element name="VoltageLevel" type="v2.10.1:ElectricMachineSystemVoltageLevelStandardValuesType"/>
+					<xs:element name="VoltageLevel" type="v2.3:ElectricMachineSystemVoltageLevelStandardValuesType"/>
 					<xs:element name="DragCurve">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Entry" type="v2.10.1:ElectricMachineSystemDragTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
+								<xs:element name="Entry" type="v2.3:ElectricMachineSystemDragTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
@@ -822,43 +1332,43 @@
 	</xs:complexType>
 	<xs:complexType name="ElectricMachineSystemVoltageLevelMeasuredType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.1:AbstractElectricMachineSystemVoltageLevelType">
+			<xs:extension base="v2.3:AbstractElectricMachineSystemVoltageLevelType">
 				<xs:sequence>
-					<xs:element name="Voltage" type="v2.10.1:VoltageLevelVoltageType">
+					<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.10.1:MaxTorqueType">
+					<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.10.1:TestSpeedType">
+					<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.10.1:MaxTorqueType">
+					<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.10.1:TestSpeedType">
+					<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.10.1:OverloadDurationType">
+					<xs:element name="OverloadDuration" type="v2.3:OverloadDurationType">
 						<xs:annotation>
 							<xs:documentation>P463 - [s]</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="MaxTorqueCurve" type="v2.10.1:ElectricMachineSystemMaxTorqueCurveType"/>
+					<xs:element name="MaxTorqueCurve" type="v2.3:ElectricMachineSystemMaxTorqueCurveType"/>
 					<xs:element name="PowerMap">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Entry" type="v2.10.1:ElectricMachineSystemPowerMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
+								<xs:element name="Entry" type="v2.3:ElectricMachineSystemPowerMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
@@ -868,29 +1378,29 @@
 	</xs:complexType>
 	<xs:complexType name="ElectricMachineSystemVoltageLevelStandardValuesType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.1:AbstractElectricMachineSystemVoltageLevelType">
+			<xs:extension base="v2.3:AbstractElectricMachineSystemVoltageLevelType">
 				<xs:sequence>
-					<xs:element name="ContinuousTorque" type="v2.10.1:MaxTorqueType">
+					<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.10.1:TestSpeedType">
+					<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.10.1:MaxTorqueType">
+					<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.10.1:TestSpeedType">
+					<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.10.1:OverloadDurationType">
+					<xs:element name="OverloadDuration" type="v2.3:OverloadDurationType">
 						<xs:annotation>
 							<xs:documentation>P463 - [s]</xs:documentation>
 						</xs:annotation>
@@ -898,14 +1408,14 @@
 					<xs:element name="MaxTorqueCurve">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Entry" type="v2.10.1:ElectricMachineSystemMaxTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
+								<xs:element name="Entry" type="v2.3:ElectricMachineSystemMaxTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
 					<xs:element name="PowerMap">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Entry" type="v2.10.1:ElectricMachineSystemPowerMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
+								<xs:element name="Entry" type="v2.3:ElectricMachineSystemPowerMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
@@ -945,7 +1455,7 @@
 							<xs:documentation>P209 - [-]</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="TransmissionType" type="v2.10.1:GearboxTransmissionTypeType">
+					<xs:element name="TransmissionType" type="v2.3:GearboxTransmissionTypeType">
 						<xs:annotation>
 							<xs:documentation>P076 - enum</xs:documentation>
 						</xs:annotation>
@@ -1019,7 +1529,7 @@
 	</xs:complexType>
 	<xs:complexType name="IEPCComponentDeclarationType">
 		<xs:sequence>
-			<xs:element name="Data" type="v2.10.1:AbstractIEPCDataType"/>
+			<xs:element name="Data" type="v2.3:AbstractIEPCDataType"/>
 			<xs:element name="Signature" type="v2.0:SignatureType"/>
 		</xs:sequence>
 	</xs:complexType>
@@ -1061,30 +1571,30 @@
 	</xs:complexType>
 	<xs:complexType name="IEPCGearsDeclarationType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.1:AbstractIEPCGearsDeclarationType">
+			<xs:extension base="v2.3:AbstractIEPCGearsDeclarationType">
 				<xs:sequence>
-					<xs:element name="Gear" type="v2.10.1:IEPCGearDeclarationType" maxOccurs="unbounded"/>
+					<xs:element name="Gear" type="v2.3:IEPCGearDeclarationType" maxOccurs="unbounded"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
 	<xs:complexType name="IEPCMeasuredDataDeclarationType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.1:AbstractIEPCDataType">
+			<xs:extension base="v2.3:AbstractIEPCDataType">
 				<xs:sequence>
-					<xs:group ref="v2.10.1:IEPCCommonParametersSequenceGroup"/>
+					<xs:group ref="v2.3:IEPCCommonParametersSequenceGroup"/>
 					<xs:element name="CertificationMethod">
 						<xs:annotation>
 							<xs:documentation>P484 - enum</xs:documentation>
 						</xs:annotation>
 						<xs:simpleType>
-							<xs:restriction base="v2.10.1:IEPCCertificationMethodType">
+							<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="v2.10.1:IEPCPowerRatingsSequenceGroup"/>
+					<xs:group ref="v2.3:IEPCPowerRatingsSequenceGroup"/>
 					<xs:element name="DifferentialIncluded" type="xs:boolean">
 						<xs:annotation>
 							<xs:documentation>P493 - bool</xs:documentation>
@@ -1107,17 +1617,17 @@
 							</xs:appinfo>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="NrOfDesignTypeWheelMotorMeasured" type="v2.10.1:NrOfDesignTypeWheelMotorMeasuredType" minOccurs="0">
+					<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="v2.10.1:AbstractIEPCGearsDeclarationType"/>
-					<xs:element name="VoltageLevel" type="v2.10.1:IEPCSystemVoltageLevelMeasuredType" minOccurs="2" maxOccurs="unbounded"/>
+					<xs:element name="Gears" type="v2.3:AbstractIEPCGearsDeclarationType"/>
+					<xs:element name="VoltageLevel" type="v2.3:IEPCSystemVoltageLevelMeasuredType" minOccurs="2" maxOccurs="unbounded"/>
 					<xs:element name="DragCurve" maxOccurs="unbounded">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Entry" type="v2.10.1:IEPCSystemDragTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
+								<xs:element name="Entry" type="v2.3:IEPCSystemDragTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
 							</xs:sequence>
 							<xs:attribute name="gear" use="required">
 								<xs:simpleType>
@@ -1131,7 +1641,7 @@
 					<xs:element name="Conditioning" minOccurs="0">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Entry" type="v2.10.1:IEPCSystemConditioningEntryType"/>
+								<xs:element name="Entry" type="v2.3:IEPCSystemConditioningEntryType"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
@@ -1141,20 +1651,20 @@
 	</xs:complexType>
 	<xs:complexType name="IEPCStandardValuesDataDeclarationType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.1:AbstractIEPCDataType">
+			<xs:extension base="v2.3:AbstractIEPCDataType">
 				<xs:sequence>
-					<xs:group ref="v2.10.1:IEPCCommonParametersSequenceGroup"/>
+					<xs:group ref="v2.3:IEPCCommonParametersSequenceGroup"/>
 					<xs:element name="CertificationMethod">
 						<xs:annotation>
 							<xs:documentation>P484 - enum</xs:documentation>
 						</xs:annotation>
 						<xs:simpleType>
-							<xs:restriction base="v2.10.1:IEPCCertificationMethodType">
+							<xs:restriction base="v2.3:IEPCCertificationMethodType">
 								<xs:enumeration value="Standard values for all components"/>
 							</xs:restriction>
 						</xs:simpleType>
 					</xs:element>
-					<xs:group ref="v2.10.1:IEPCPowerRatingsSequenceGroup"/>
+					<xs:group ref="v2.3:IEPCPowerRatingsSequenceGroup"/>
 					<xs:element name="DifferentialIncluded" type="xs:boolean">
 						<xs:annotation>
 							<xs:documentation>P493 - bool</xs:documentation>
@@ -1165,17 +1675,17 @@
 							<xs:documentation>P494 - bool</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="NrOfDesignTypeWheelMotorMeasured" type="v2.10.1:NrOfDesignTypeWheelMotorMeasuredType" minOccurs="0">
+					<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="v2.10.1:AbstractIEPCGearsDeclarationType"/>
-					<xs:element name="VoltageLevel" type="v2.10.1:IEPCSystemVoltageLevelStandardValuesType"/>
+					<xs:element name="Gears" type="v2.3:AbstractIEPCGearsDeclarationType"/>
+					<xs:element name="VoltageLevel" type="v2.3:IEPCSystemVoltageLevelStandardValuesType"/>
 					<xs:element name="DragCurve">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Entry" type="v2.10.1:IEPCSystemDragTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
+								<xs:element name="Entry" type="v2.3:IEPCSystemDragTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
@@ -1184,34 +1694,34 @@
 		</xs:complexContent>
 	</xs:complexType>
 	<xs:complexType name="IEPCSystemMaxTorqueEntryType">
-		<xs:attribute name="outShaftSpeed" type="v2.10.1:OutShaftSpeedType" use="required">
+		<xs:attribute name="outShaftSpeed" type="v2.3:OutShaftSpeedType" use="required">
 			<xs:annotation>
 				<xs:documentation>P501 - [rpm]</xs:documentation>
 			</xs:annotation>
 		</xs:attribute>
-		<xs:attribute name="maxTorque" type="v2.10.1:maxTorqueType" use="required">
+		<xs:attribute name="maxTorque" type="v2.3:maxTorqueType" use="required">
 			<xs:annotation>
 				<xs:documentation>P502 - [Nm]</xs:documentation>
 			</xs:annotation>
 		</xs:attribute>
-		<xs:attribute name="minTorque" type="v2.10.1:minTorqueType" use="required">
+		<xs:attribute name="minTorque" type="v2.3:minTorqueType" use="required">
 			<xs:annotation>
 				<xs:documentation>P503 - [Nm]</xs:documentation>
 			</xs:annotation>
 		</xs:attribute>
 	</xs:complexType>
 	<xs:complexType name="IEPCSystemPowerMapEntryType">
-		<xs:attribute name="outShaftSpeed" type="v2.10.1:OutShaftSpeedType" use="required">
+		<xs:attribute name="outShaftSpeed" type="v2.3:OutShaftSpeedType" use="required">
 			<xs:annotation>
 				<xs:documentation>P506 - [rpm]</xs:documentation>
 			</xs:annotation>
 		</xs:attribute>
-		<xs:attribute name="torque" type="v2.10.1:PowerMapTorqueType" use="required">
+		<xs:attribute name="torque" type="v2.3:PowerMapTorqueType" use="required">
 			<xs:annotation>
 				<xs:documentation>P507 - [Nm]</xs:documentation>
 			</xs:annotation>
 		</xs:attribute>
-		<xs:attribute name="electricPower" type="v2.10.1:PowerMapElectricPowerType" use="required">
+		<xs:attribute name="electricPower" type="v2.3:PowerMapElectricPowerType" use="required">
 			<xs:annotation>
 				<xs:documentation>P508 - [W]</xs:documentation>
 			</xs:annotation>
@@ -1219,43 +1729,43 @@
 	</xs:complexType>
 	<xs:complexType name="IEPCSystemVoltageLevelMeasuredType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.1:AbstractElectricMachineSystemVoltageLevelType">
+			<xs:extension base="v2.3:AbstractElectricMachineSystemVoltageLevelType">
 				<xs:sequence>
-					<xs:element name="Voltage" type="v2.10.1:VoltageLevelVoltageType">
+					<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.10.1:MaxTorqueType">
+					<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.10.1:TestSpeedType">
+					<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.10.1:MaxTorqueType">
+					<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.10.1:TestSpeedType">
+					<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.10.1:OverloadDurationType">
+					<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.10.1:ElectricMachineSystemMaxTorqueCurveType"/>
+					<xs:element name="MaxTorqueCurve" type="v2.3:ElectricMachineSystemMaxTorqueCurveType"/>
 					<xs:element name="PowerMap" maxOccurs="unbounded">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Entry" type="v2.10.1:IEPCSystemPowerMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
+								<xs:element name="Entry" type="v2.3:IEPCSystemPowerMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
 							</xs:sequence>
 							<xs:attribute name="gear" use="required">
 								<xs:simpleType>
@@ -1272,29 +1782,29 @@
 	</xs:complexType>
 	<xs:complexType name="IEPCSystemVoltageLevelStandardValuesType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.1:AbstractElectricMachineSystemVoltageLevelType">
+			<xs:extension base="v2.3:AbstractElectricMachineSystemVoltageLevelType">
 				<xs:sequence>
-					<xs:element name="ContinuousTorque" type="v2.10.1:MaxTorqueType">
+					<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.10.1:TestSpeedType">
+					<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.10.1:MaxTorqueType">
+					<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.10.1:TestSpeedType">
+					<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.10.1:OverloadDurationType">
+					<xs:element name="OverloadDuration" type="v2.3:OverloadDurationType">
 						<xs:annotation>
 							<xs:documentation>P491 - [s]</xs:documentation>
 						</xs:annotation>
@@ -1302,14 +1812,14 @@
 					<xs:element name="MaxTorqueCurve">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Entry" type="v2.10.1:IEPCSystemMaxTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
+								<xs:element name="Entry" type="v2.3:IEPCSystemMaxTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
 					<xs:element name="PowerMap">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Entry" type="v2.10.1:IEPCSystemPowerMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
+								<xs:element name="Entry" type="v2.3:IEPCSystemPowerMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
@@ -1319,7 +1829,7 @@
 	</xs:complexType>
 	<xs:complexType name="REESSComponentDeclarationType">
 		<xs:sequence>
-			<xs:element name="Data" type="v2.10.1:AbstractREESSDataType"/>
+			<xs:element name="Data" type="v2.3:AbstractREESSDataType"/>
 			<xs:element name="Signature" type="v2.0:SignatureType"/>
 		</xs:sequence>
 	</xs:complexType>
@@ -1744,7 +2254,7 @@
 					</xs:appinfo>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="ElectricMachineType" type="v2.10.1:ElectricMachineTypeType">
+			<xs:element name="ElectricMachineType" type="v2.3:ElectricMachineTypeType">
 				<xs:annotation>
 					<xs:documentation>P455 - enum</xs:documentation>
 					<xs:appinfo>
@@ -1759,12 +2269,12 @@
 	</xs:group>
 	<xs:group name="ElectricMachineSystemPowerRatingsSequenceGroup">
 		<xs:sequence>
-			<xs:element name="R85RatedPower" type="v2.10.1:R85RatedPowerType">
+			<xs:element name="R85RatedPower" type="v2.3:R85RatedPowerType">
 				<xs:annotation>
 					<xs:documentation>P457 - [W]</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="RotationalInertia" type="v2.10.1:RotationalInertiaType">
+			<xs:element name="RotationalInertia" type="v2.3:RotationalInertiaType">
 				<xs:annotation>
 					<xs:documentation>P458 - [kgm²]</xs:documentation>
 				</xs:annotation>
@@ -1828,7 +2338,7 @@
 					</xs:appinfo>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="ElectricMachineType" type="v2.10.1:ElectricMachineTypeType">
+			<xs:element name="ElectricMachineType" type="v2.3:ElectricMachineTypeType">
 				<xs:annotation>
 					<xs:documentation>P483 - enum</xs:documentation>
 				</xs:annotation>
@@ -1837,12 +2347,12 @@
 	</xs:group>
 	<xs:group name="IEPCPowerRatingsSequenceGroup">
 		<xs:sequence>
-			<xs:element name="R85RatedPower" type="v2.10.1:R85RatedPowerType">
+			<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.10.1:RotationalInertiaType">
+			<xs:element name="RotationalInertia" type="v2.3:RotationalInertiaType">
 				<xs:annotation>
 					<xs:documentation>P486 [ kgm2]</xs:documentation>
 				</xs:annotation>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd
similarity index 77%
rename from VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd
rename to VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd
index 1a18e1edfb..431eab4c58 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd
@@ -1,12 +1,11 @@
 <?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:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.4" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xmlns:v2.10.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns: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" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
 	<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/>
-	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3_DEV.xsd"/>
-	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" schemaLocation="VectoDeclarationDefinitions.2.10.1_xEV_Components.xsd"/>
+	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3.xsd"/>
 	<xs:complexType name="Abstract_ADAS_ConventionalType" abstract="true">
 		<xs:complexContent>
 			<xs:extension base="v2.1:AbstractAdvancedDriverAssistantSystemsType"/>
@@ -98,7 +97,7 @@
 	</xs:complexType>
 	<xs:complexType name="ADAS_Conventional_Type">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_ADAS_ConventionalType">
+			<xs:extension base="v2.4:Abstract_ADAS_ConventionalType">
 				<xs:sequence>
 					<xs:element name="EngineStopStart" type="v2.1:EngineStopStartType">
 						<xs:annotation>
@@ -137,7 +136,7 @@
 	</xs:complexType>
 	<xs:complexType name="ADAS_HEV_Type">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_ADAS_HEVType">
+			<xs:extension base="v2.4:Abstract_ADAS_HEVType">
 				<xs:sequence>
 					<xs:element name="EngineStopStart" type="v2.1:EngineStopStartType">
 						<xs:annotation>
@@ -155,7 +154,7 @@
 	</xs:complexType>
 	<xs:complexType name="ADAS_IEPC_Type">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_ADAS_IEPCType">
+			<xs:extension base="v2.4:Abstract_ADAS_IEPCType">
 				<xs:sequence>
 					<xs:element name="PredictiveCruiseControl" type="v2.1:PredictiveCruiseControlType">
 						<xs:annotation>
@@ -168,7 +167,7 @@
 	</xs:complexType>
 	<xs:complexType name="ADAS_PEV_Type">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_ADAS_PEVType">
+			<xs:extension base="v2.4:Abstract_ADAS_PEVType">
 				<xs:sequence>
 					<xs:element name="PredictiveCruiseControl" type="v2.1:PredictiveCruiseControlType">
 						<xs:annotation>
@@ -186,7 +185,7 @@
 	</xs:complexType>
 	<xs:complexType name="AUX_Component_Conventional_CompletedBus_Type">
 		<xs:sequence>
-			<xs:element name="Data" type="v2.10.2:Abstract_AUX_Conventional_CompletedBusDeclarationType"/>
+			<xs:element name="Data" type="v2.4:Abstract_AUX_Conventional_CompletedBusDeclarationType"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="AUX_Component_Conventional_Lorry_Type">
@@ -196,61 +195,61 @@
 	</xs:complexType>
 	<xs:complexType name="AUX_Component_Conventional_PrimaryBus_Type">
 		<xs:sequence>
-			<xs:element name="Data" type="v2.10.2:Abstract_AUX_Conventional_PrimaryBusDeclarationType"/>
+			<xs:element name="Data" type="v2.4:Abstract_AUX_Conventional_PrimaryBusDeclarationType"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="AUX_Component_HEV-P_Lorry_Type">
 		<xs:sequence>
-			<xs:element name="Data" type="v2.10.2:Abstract_AUX_HEV-P_LorryDeclarationType"/>
+			<xs:element name="Data" type="v2.4:Abstract_AUX_HEV-P_LorryDeclarationType"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="AUX_Component_HEV-P_PrimaryBus_Type">
 		<xs:sequence>
-			<xs:element name="Data" type="v2.10.2:Abstract_AUX_HEV-P_PrimaryBusDeclarationType"/>
+			<xs:element name="Data" type="v2.4:Abstract_AUX_HEV-P_PrimaryBusDeclarationType"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="AUX_Component_HEV-S_Lorry_Type">
 		<xs:sequence>
-			<xs:element name="Data" type="v2.10.2:Abstract_AUX_HEV-S_LorryDeclarationType"/>
+			<xs:element name="Data" type="v2.4:Abstract_AUX_HEV-S_LorryDeclarationType"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="AUX_Component_HEV-S_PrimaryBus_Type">
 		<xs:sequence>
-			<xs:element name="Data" type="v2.10.2:Abstract_AUX_HEV-S_PrimaryBusDeclarationType"/>
+			<xs:element name="Data" type="v2.4:Abstract_AUX_HEV-S_PrimaryBusDeclarationType"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="AUX_Component_IEPC_Lorry_Type">
 		<xs:sequence>
-			<xs:element name="Data" type="v2.10.2:Abstract_AUX_IEPC_LorryDeclarationType"/>
+			<xs:element name="Data" type="v2.4:Abstract_AUX_IEPC_LorryDeclarationType"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="AUX_Component_IEPC_PrimaryBus_Type">
 		<xs:sequence>
-			<xs:element name="Data" type="v2.10.2:Abstract_AUX_IEPC_PrimaryBusDeclarationType"/>
+			<xs:element name="Data" type="v2.4:Abstract_AUX_IEPC_PrimaryBusDeclarationType"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="AUX_Component_PEV_Lorry_Type">
 		<xs:sequence>
-			<xs:element name="Data" type="v2.10.2:Abstract_AUX_PEV_LorryDeclarationType"/>
+			<xs:element name="Data" type="v2.4:Abstract_AUX_PEV_LorryDeclarationType"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="AUX_Component_PEV_PrimaryBus_Type">
 		<xs:sequence>
-			<xs:element name="Data" type="v2.10.2:Abstract_AUX_PEV_PrimaryBusDeclarationType"/>
+			<xs:element name="Data" type="v2.4:Abstract_AUX_PEV_PrimaryBusDeclarationType"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="AUX_Conventional_CompletedBusType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_AUX_Conventional_CompletedBusDeclarationType">
+			<xs:extension base="v2.4:Abstract_AUX_Conventional_CompletedBusDeclarationType">
 				<xs:sequence minOccurs="0">
 					<xs:element name="ElectricSystem" minOccurs="0">
 						<xs:complexType>
-							<xs:group ref="v2.10.2:BusAuxElectricSystemLightsGroup"/>
+							<xs:group ref="v2.4:BusAuxElectricSystemLightsGroup"/>
 						</xs:complexType>
 					</xs:element>
 					<xs:element name="HVAC" minOccurs="0">
 						<xs:complexType>
-							<xs:group ref="v2.10.2:BusAuxHVACConventionalSequenceGroup" minOccurs="0"/>
+							<xs:group ref="v2.4:BusAuxHVACConventionalSequenceGroup" minOccurs="0"/>
 						</xs:complexType>
 					</xs:element>
 				</xs:sequence>
@@ -264,7 +263,7 @@
 					<xs:element name="Fan">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Technology" type="v2.10.2:AuxFanTechnologyLorryType">
+								<xs:element name="Technology" type="v2.4:AuxFanTechnologyLorryType">
 									<xs:annotation>
 										<xs:documentation>P181 - [-]</xs:documentation>
 									</xs:annotation>
@@ -281,7 +280,7 @@
 									</xs:annotation>
 									<xs:complexType>
 										<xs:simpleContent>
-											<xs:extension base="v2.10.2:AuxSPTechnologyLorryType">
+											<xs:extension base="v2.4:AuxSPTechnologyLorryType">
 												<xs:attribute name="axleNumber" use="required">
 													<xs:simpleType>
 														<xs:restriction base="xs:int">
@@ -300,7 +299,7 @@
 					<xs:element name="ElectricSystem">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Technology" type="v2.10.2:AuxESTechnologyLorryType">
+								<xs:element name="Technology" type="v2.4:AuxESTechnologyLorryType">
 									<xs:annotation>
 										<xs:documentation>P183 - [-]</xs:documentation>
 									</xs:annotation>
@@ -311,7 +310,7 @@
 					<xs:element name="PneumaticSystem">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Technology" type="v2.10.2:AuxPSTechnologyLorryType">
+								<xs:element name="Technology" type="v2.4:AuxPSTechnologyLorryType">
 									<xs:annotation>
 										<xs:documentation>P184 - [-]</xs:documentation>
 									</xs:annotation>
@@ -322,7 +321,7 @@
 					<xs:element name="HVAC">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Technology" type="v2.10.2:AuxHVACTechnologyLorryType">
+								<xs:element name="Technology" type="v2.4:AuxHVACTechnologyLorryType">
 									<xs:annotation>
 										<xs:documentation>P185</xs:documentation>
 									</xs:annotation>
@@ -336,12 +335,12 @@
 	</xs:complexType>
 	<xs:complexType name="AUX_Conventional_PrimaryBusType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_AUX_Conventional_PrimaryBusDeclarationType">
+			<xs:extension base="v2.4:Abstract_AUX_Conventional_PrimaryBusDeclarationType">
 				<xs:sequence>
 					<xs:element name="Fan">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Technology" type="v2.10.2:AuxFanTechnologyPrimaryBusType">
+								<xs:element name="Technology" type="v2.4:AuxFanTechnologyPrimaryBusType">
 									<xs:annotation>
 										<xs:documentation>P181 - enum</xs:documentation>
 									</xs:annotation>
@@ -358,7 +357,7 @@
 									</xs:annotation>
 									<xs:complexType>
 										<xs:simpleContent>
-											<xs:extension base="v2.10.2:AuxSPTechnologyPrimaryBusType">
+											<xs:extension base="v2.4:AuxSPTechnologyPrimaryBusType">
 												<xs:attribute name="axleNumber" use="required">
 													<xs:simpleType>
 														<xs:restriction base="xs:int">
@@ -377,20 +376,20 @@
 					<xs:element name="ElectricSystem">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="AlternatorTechnology" type="v2.10.2:AlternatorTechnology_Conventional_Type">
+								<xs:element name="AlternatorTechnology" type="v2.4:AlternatorTechnology_Conventional_Type">
 									<xs:annotation>
 										<xs:documentation>P294 - enum</xs:documentation>
 									</xs:annotation>
 								</xs:element>
-								<xs:group ref="v2.10.2:BusAuxElectricSystemSupplySequenceGroup" minOccurs="0"/>
+								<xs:group ref="v2.4:BusAuxElectricSystemSupplySequenceGroup" minOccurs="0"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
 					<xs:element name="PneumaticSystem">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:group ref="v2.10.2:BusAuxPneumaticSystemGen_Conventional_SequenceGroup"/>
-								<xs:group ref="v2.10.2:BusAuxPneumaticSystemConsumerSequenceGroup"/>
+								<xs:group ref="v2.4:BusAuxPneumaticSystemGen_Conventional_SequenceGroup"/>
+								<xs:group ref="v2.4:BusAuxPneumaticSystemConsumerSequenceGroup"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
@@ -416,12 +415,12 @@
 	</xs:complexType>
 	<xs:complexType name="AUX_HEV-P_LorryDataType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_AUX_HEV-P_LorryDeclarationType">
+			<xs:extension base="v2.4:Abstract_AUX_HEV-P_LorryDeclarationType">
 				<xs:sequence>
 					<xs:element name="Fan">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Technology" type="v2.10.2:AuxFanTechnologyLorryType">
+								<xs:element name="Technology" type="v2.4:AuxFanTechnologyLorryType">
 									<xs:annotation>
 										<xs:documentation>P181 - enum</xs:documentation>
 									</xs:annotation>
@@ -438,7 +437,7 @@
 									</xs:annotation>
 									<xs:complexType>
 										<xs:simpleContent>
-											<xs:extension base="v2.10.2:AuxSPTechnologyLorryType">
+											<xs:extension base="v2.4:AuxSPTechnologyLorryType">
 												<xs:attribute name="axleNumber" use="required">
 													<xs:simpleType>
 														<xs:restriction base="xs:int">
@@ -457,7 +456,7 @@
 					<xs:element name="ElectricSystem">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Technology" type="v2.10.2:AuxESTechnologyLorryType">
+								<xs:element name="Technology" type="v2.4:AuxESTechnologyLorryType">
 									<xs:annotation>
 										<xs:documentation>P183 - enum</xs:documentation>
 									</xs:annotation>
@@ -468,7 +467,7 @@
 					<xs:element name="PneumaticSystem">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Technology" type="v2.10.2:AuxPSTechnologyLorryType">
+								<xs:element name="Technology" type="v2.4:AuxPSTechnologyLorryType">
 									<xs:annotation>
 										<xs:documentation>P184 - enum</xs:documentation>
 									</xs:annotation>
@@ -479,7 +478,7 @@
 					<xs:element name="HVAC">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Technology" type="v2.10.2:AuxHVACTechnologyLorryType">
+								<xs:element name="Technology" type="v2.4:AuxHVACTechnologyLorryType">
 									<xs:annotation>
 										<xs:documentation>P185 - enum</xs:documentation>
 									</xs:annotation>
@@ -493,12 +492,12 @@
 	</xs:complexType>
 	<xs:complexType name="AUX_HEV-P_PrimaryBusType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_AUX_HEV-P_PrimaryBusDeclarationType">
+			<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.10.2:AuxFanTechnologyPrimaryBusType">
+								<xs:element name="Technology" type="v2.4:AuxFanTechnologyPrimaryBusType">
 									<xs:annotation>
 										<xs:documentation>P181 - enum</xs:documentation>
 									</xs:annotation>
@@ -515,7 +514,7 @@
 									</xs:annotation>
 									<xs:complexType>
 										<xs:simpleContent>
-											<xs:extension base="v2.10.2:AuxSPTechnologyPrimaryBusType">
+											<xs:extension base="v2.4:AuxSPTechnologyPrimaryBusType">
 												<xs:attribute name="axleNumber" use="required">
 													<xs:simpleType>
 														<xs:restriction base="xs:int">
@@ -534,12 +533,12 @@
 					<xs:element name="ElectricSystem">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="AlternatorTechnology" type="v2.10.2:AlternatorTechnology_HEV_Type">
+								<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.10.2:BusAuxElectricSystemSupplySequenceGroup" minOccurs="0"/>
+								<xs:group ref="v2.4:BusAuxElectricSystemSupplySequenceGroup" minOccurs="0"/>
 								<xs:element name="SupplyFromHEVPossible" type="xs:boolean">
 									<xs:annotation>
 										<xs:documentation>P303 - bool</xs:documentation>
@@ -551,8 +550,8 @@
 					<xs:element name="PneumaticSystem">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:group ref="v2.10.2:BusAuxPneumaticSystemGen_HEV-Px_SequenceGroup"/>
-								<xs:group ref="v2.10.2:BusAuxPneumaticSystemConsumerSequenceGroup"/>
+								<xs:group ref="v2.4:BusAuxPneumaticSystemGen_HEV-Px_SequenceGroup"/>
+								<xs:group ref="v2.4:BusAuxPneumaticSystemConsumerSequenceGroup"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
@@ -578,12 +577,12 @@
 	</xs:complexType>
 	<xs:complexType name="AUX_HEV-S_LorryDataType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_AUX_HEV-S_LorryDeclarationType">
+			<xs:extension base="v2.4:Abstract_AUX_HEV-S_LorryDeclarationType">
 				<xs:sequence>
 					<xs:element name="Fan">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Technology" type="v2.10.2:AuxFanTechnologyLorryType">
+								<xs:element name="Technology" type="v2.4:AuxFanTechnologyLorryType">
 									<xs:annotation>
 										<xs:documentation>P181 - enum</xs:documentation>
 									</xs:annotation>
@@ -600,7 +599,7 @@
 									</xs:annotation>
 									<xs:complexType>
 										<xs:simpleContent>
-											<xs:extension base="v2.10.2:AuxSPTechnology_HEV-S_LorryType">
+											<xs:extension base="v2.4:AuxSPTechnology_HEV-S_LorryType">
 												<xs:attribute name="axleNumber" use="required">
 													<xs:simpleType>
 														<xs:restriction base="xs:int">
@@ -619,7 +618,7 @@
 					<xs:element name="ElectricSystem">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Technology" type="v2.10.2:AuxESTechnologyLorryType">
+								<xs:element name="Technology" type="v2.4:AuxESTechnologyLorryType">
 									<xs:annotation>
 										<xs:documentation>P183 - enum</xs:documentation>
 									</xs:annotation>
@@ -630,7 +629,7 @@
 					<xs:element name="PneumaticSystem">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Technology" type="v2.10.2:AuxPSTechnologyLorryType">
+								<xs:element name="Technology" type="v2.4:AuxPSTechnologyLorryType">
 									<xs:annotation>
 										<xs:documentation>P184 - enum</xs:documentation>
 									</xs:annotation>
@@ -641,7 +640,7 @@
 					<xs:element name="HVAC">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Technology" type="v2.10.2:AuxHVACTechnologyLorryType">
+								<xs:element name="Technology" type="v2.4:AuxHVACTechnologyLorryType">
 									<xs:annotation>
 										<xs:documentation>P185 - enum</xs:documentation>
 									</xs:annotation>
@@ -655,12 +654,12 @@
 	</xs:complexType>
 	<xs:complexType name="AUX_HEV-S_PrimaryBusType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_AUX_HEV-S_PrimaryBusDeclarationType">
+			<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.10.2:AuxFanTechnologyPrimaryBusType">
+								<xs:element name="Technology" type="v2.4:AuxFanTechnologyPrimaryBusType">
 									<xs:annotation>
 										<xs:documentation>P181 - enum</xs:documentation>
 									</xs:annotation>
@@ -677,7 +676,7 @@
 									</xs:annotation>
 									<xs:complexType>
 										<xs:simpleContent>
-											<xs:extension base="v2.10.2:AuxSPTechnology_HEV-S_PrimaryBusType">
+											<xs:extension base="v2.4:AuxSPTechnology_HEV-S_PrimaryBusType">
 												<xs:attribute name="axleNumber" use="required">
 													<xs:simpleType>
 														<xs:restriction base="xs:int">
@@ -696,7 +695,7 @@
 					<xs:element name="ElectricSystem">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="AlternatorTechnology" type="v2.10.2:AlternatorTechnology_HEV-S_Type">
+								<xs:element name="AlternatorTechnology" type="v2.4:AlternatorTechnology_HEV-S_Type">
 									<xs:annotation>
 										<xs:documentation>P294 - enum</xs:documentation>
 									</xs:annotation>
@@ -712,8 +711,8 @@
 					<xs:element name="PneumaticSystem">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:group ref="v2.10.2:BusAuxPneumaticSystemGen_HEV-S_SequenceGroup"/>
-								<xs:group ref="v2.10.2:BusAuxPneumaticSystemConsumerSequenceGroup"/>
+								<xs:group ref="v2.4:BusAuxPneumaticSystemGen_HEV-S_SequenceGroup"/>
+								<xs:group ref="v2.4:BusAuxPneumaticSystemConsumerSequenceGroup"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
@@ -739,7 +738,7 @@
 	</xs:complexType>
 	<xs:complexType name="AUX_IEPC_LorryDataType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_AUX_IEPC_LorryDeclarationType">
+			<xs:extension base="v2.4:Abstract_AUX_IEPC_LorryDeclarationType">
 				<xs:sequence>
 					<xs:element name="SteeringPump">
 						<xs:complexType>
@@ -750,7 +749,7 @@
 									</xs:annotation>
 									<xs:complexType>
 										<xs:simpleContent>
-											<xs:extension base="v2.10.2:AuxPSTechnology_PEV_LorryType">
+											<xs:extension base="v2.4:AuxPSTechnology_PEV_LorryType">
 												<xs:attribute name="axleNumber" use="required">
 													<xs:simpleType>
 														<xs:restriction base="xs:int">
@@ -769,7 +768,7 @@
 					<xs:element name="ElectricSystem">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Technology" type="v2.10.2:AuxESTechnologyLorryType">
+								<xs:element name="Technology" type="v2.4:AuxESTechnologyLorryType">
 									<xs:annotation>
 										<xs:documentation>P183 - enum</xs:documentation>
 									</xs:annotation>
@@ -780,7 +779,7 @@
 					<xs:element name="PneumaticSystem">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Technology" type="v2.10.2:AuxPSTechnology_PEV_LorryType">
+								<xs:element name="Technology" type="v2.4:AuxPSTechnology_PEV_LorryType">
 									<xs:annotation>
 										<xs:documentation>P184 - enum</xs:documentation>
 									</xs:annotation>
@@ -791,7 +790,7 @@
 					<xs:element name="HVAC">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Technology" type="v2.10.2:AuxHVACTechnologyLorryType">
+								<xs:element name="Technology" type="v2.4:AuxHVACTechnologyLorryType">
 									<xs:annotation>
 										<xs:documentation>P185 - enum</xs:documentation>
 									</xs:annotation>
@@ -805,7 +804,7 @@
 	</xs:complexType>
 	<xs:complexType name="AUX_IEPC_PrimaryBusType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_AUX_IEPC_PrimaryBusDeclarationType">
+			<xs:extension base="v2.4:Abstract_AUX_IEPC_PrimaryBusDeclarationType">
 				<xs:sequence>
 					<xs:element name="SteeringPump">
 						<xs:complexType>
@@ -816,7 +815,7 @@
 									</xs:annotation>
 									<xs:complexType>
 										<xs:simpleContent>
-											<xs:extension base="v2.10.2:AuxSPTechnology_PEV_PrimaryBusType">
+											<xs:extension base="v2.4:AuxSPTechnology_PEV_PrimaryBusType">
 												<xs:attribute name="axleNumber" use="required">
 													<xs:simpleType>
 														<xs:restriction base="xs:int">
@@ -835,8 +834,8 @@
 					<xs:element name="PneumaticSystem">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:group ref="v2.10.2:BusAuxPneumaticSystemGen_IEPC_SequenceGroup"/>
-								<xs:group ref="v2.10.2:BusAuxPneumaticSystemConsumerSequenceGroup"/>
+								<xs:group ref="v2.4:BusAuxPneumaticSystemGen_IEPC_SequenceGroup"/>
+								<xs:group ref="v2.4:BusAuxPneumaticSystemConsumerSequenceGroup"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
@@ -857,7 +856,7 @@
 	</xs:complexType>
 	<xs:complexType name="AUX_PEV_LorryDataType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_AUX_PEV_LorryDeclarationType">
+			<xs:extension base="v2.4:Abstract_AUX_PEV_LorryDeclarationType">
 				<xs:sequence>
 					<xs:element name="SteeringPump">
 						<xs:complexType>
@@ -868,7 +867,7 @@
 									</xs:annotation>
 									<xs:complexType>
 										<xs:simpleContent>
-											<xs:extension base="v2.10.2:AuxSPTechnology_PEV_LorryType">
+											<xs:extension base="v2.4:AuxSPTechnology_PEV_LorryType">
 												<xs:attribute name="axleNumber" use="required">
 													<xs:simpleType>
 														<xs:restriction base="xs:int">
@@ -887,7 +886,7 @@
 					<xs:element name="ElectricSystem">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Technology" type="v2.10.2:AuxESTechnologyLorryType">
+								<xs:element name="Technology" type="v2.4:AuxESTechnologyLorryType">
 									<xs:annotation>
 										<xs:documentation>P183 - enum</xs:documentation>
 									</xs:annotation>
@@ -898,7 +897,7 @@
 					<xs:element name="PneumaticSystem">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Technology" type="v2.10.2:AuxPSTechnology_PEV_LorryType">
+								<xs:element name="Technology" type="v2.4:AuxPSTechnology_PEV_LorryType">
 									<xs:annotation>
 										<xs:documentation>P184 - enum</xs:documentation>
 									</xs:annotation>
@@ -909,7 +908,7 @@
 					<xs:element name="HVAC">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Technology" type="v2.10.2:AuxHVACTechnologyLorryType">
+								<xs:element name="Technology" type="v2.4:AuxHVACTechnologyLorryType">
 									<xs:annotation>
 										<xs:documentation>P185 - enum</xs:documentation>
 									</xs:annotation>
@@ -923,7 +922,7 @@
 	</xs:complexType>
 	<xs:complexType name="AUX_PEV_PrimaryBusType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_AUX_PEV_PrimaryBusDeclarationType">
+			<xs:extension base="v2.4:Abstract_AUX_PEV_PrimaryBusDeclarationType">
 				<xs:sequence>
 					<xs:element name="SteeringPump">
 						<xs:complexType>
@@ -934,7 +933,7 @@
 									</xs:annotation>
 									<xs:complexType>
 										<xs:simpleContent>
-											<xs:extension base="v2.10.2:AuxSPTechnology_PEV_PrimaryBusType">
+											<xs:extension base="v2.4:AuxSPTechnology_PEV_PrimaryBusType">
 												<xs:attribute name="axleNumber" use="required">
 													<xs:simpleType>
 														<xs:restriction base="xs:int">
@@ -953,8 +952,8 @@
 					<xs:element name="PneumaticSystem">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:group ref="v2.10.2:BusAuxPneumaticSystemGen_PEV_SequenceGroup"/>
-								<xs:group ref="v2.10.2:BusAuxPneumaticSystemConsumerSequenceGroup"/>
+								<xs:group ref="v2.4:BusAuxPneumaticSystemGen_PEV_SequenceGroup"/>
+								<xs:group ref="v2.4:BusAuxPneumaticSystemConsumerSequenceGroup"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
@@ -975,18 +974,18 @@
 	</xs:complexType>
 	<xs:complexType name="AUX_xEV_CompletedBusType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_AUX_xEV_CompletedBusDeclarationType">
+			<xs:extension base="v2.4:Abstract_AUX_xEV_CompletedBusDeclarationType">
 				<xs:sequence minOccurs="0">
 					<xs:element name="ElectricSystem" minOccurs="0">
 						<xs:complexType>
-							<xs:group ref="v2.10.2:BusAuxElectricSystemLightsGroup"/>
+							<xs:group ref="v2.4:BusAuxElectricSystemLightsGroup"/>
 						</xs:complexType>
 					</xs:element>
 					<xs:element name="HVAC" minOccurs="0">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:group ref="v2.10.2:BusAuxHVACConventionalSequenceGroup" minOccurs="0"/>
-								<xs:group ref="v2.10.2:BusAuxHVACxEVSequenceGroup" minOccurs="0"/>
+								<xs:group ref="v2.4:BusAuxHVACConventionalSequenceGroup" minOccurs="0"/>
+								<xs:group ref="v2.4:BusAuxHVACxEVSequenceGroup" minOccurs="0"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
@@ -996,7 +995,7 @@
 	</xs:complexType>
 	<xs:complexType name="BoostingLimitationsType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:AbstractBoostingLimitationsDeclarationType">
+			<xs:extension base="v2.4:AbstractBoostingLimitationsDeclarationType">
 				<xs:sequence>
 					<xs:element name="Entry" minOccurs="2" maxOccurs="unbounded">
 						<xs:complexType>
@@ -1022,17 +1021,17 @@
 	</xs:complexType>
 	<xs:complexType name="Components_Conventional_CompletedBusType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_Components_Conventional_CompletedBusDeclarationType">
+			<xs:extension base="v2.4:Abstract_Components_Conventional_CompletedBusDeclarationType">
 				<xs:sequence>
 					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
-					<xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_Conventional_CompletedBus_Type" minOccurs="0"/>
+					<xs:element name="Auxiliaries" type="v2.4:AUX_Component_Conventional_CompletedBus_Type" minOccurs="0"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
 	<xs:complexType name="Components_Conventional_LorryType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_Components_Conventional_LorryDeclarationType">
+			<xs:extension base="v2.4:Abstract_Components_Conventional_LorryDeclarationType">
 				<xs:sequence>
 					<xs:element name="Engine" type="v2.0:EngineComponentDeclarationType"/>
 					<xs:element name="Gearbox" type="v2.0:GearboxComponentDeclarationType"/>
@@ -1041,7 +1040,7 @@
 					<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
 					<xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType"/>
 					<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
-					<xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_Conventional_Lorry_Type"/>
+					<xs:element name="Auxiliaries" type="v2.4:AUX_Component_Conventional_Lorry_Type"/>
 					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
 				</xs:sequence>
 			</xs:extension>
@@ -1049,7 +1048,7 @@
 	</xs:complexType>
 	<xs:complexType name="Components_Conventional_PrimaryBusType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_Components_Conventional_PrimaryBusDeclarationType">
+			<xs:extension base="v2.4:Abstract_Components_Conventional_PrimaryBusDeclarationType">
 				<xs:sequence>
 					<xs:element name="Engine" type="v2.0:EngineComponentDeclarationType"/>
 					<xs:element name="Gearbox" type="v2.0:GearboxComponentDeclarationType"/>
@@ -1058,20 +1057,20 @@
 					<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.10.2:AUX_Component_Conventional_PrimaryBus_Type"/>
+					<xs:element name="Auxiliaries" type="v2.4:AUX_Component_Conventional_PrimaryBus_Type"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
 	<xs:complexType name="Components_HEV-IEPC-S_LorryType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_Components_HEV-IEPC-S_LorryDeclarationType">
+			<xs:extension base="v2.4:Abstract_Components_HEV-IEPC-S_LorryDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Components_HEV-IEPC-S_GenSetSequenceGroup"/>
+					<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.10.2:AUX_Component_HEV-S_Lorry_Type"/>
+					<xs:element name="Auxiliaries" type="v2.4:AUX_Component_HEV-S_Lorry_Type"/>
 					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
 				</xs:sequence>
 			</xs:extension>
@@ -1079,31 +1078,31 @@
 	</xs:complexType>
 	<xs:complexType name="Components_HEV-IEPC-S_PrimaryBus">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_Components_HEV-IEPC-S_PrimaryBusDeclarationType">
+			<xs:extension base="v2.4:Abstract_Components_HEV-IEPC-S_PrimaryBusDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Components_HEV-IEPC-S_GenSetSequenceGroup"/>
+					<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.10.2:AUX_Component_HEV-S_PrimaryBus_Type"/>
+					<xs:element name="Auxiliaries" type="v2.4:AUX_Component_HEV-S_PrimaryBus_Type"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
 	<xs:complexType name="Components_HEV-Px_LorryType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_Components_HEV-Px_LorryDeclarationType">
+			<xs:extension base="v2.4:Abstract_Components_HEV-Px_LorryDeclarationType">
 				<xs:sequence>
 					<xs:element name="Engine" type="v2.0:EngineComponentDeclarationType"/>
-					<xs:element name="ElectricMachine" type="v2.10.2:ElectricMachineType"/>
-					<xs:element name="ElectricEnergyStorage" type="v2.10.2:ElectricEnergyStorageType"/>
+					<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.10.2:AUX_Component_HEV-P_Lorry_Type"/>
+					<xs:element name="Auxiliaries" type="v2.4:AUX_Component_HEV-P_Lorry_Type"/>
 					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
 				</xs:sequence>
 			</xs:extension>
@@ -1111,34 +1110,34 @@
 	</xs:complexType>
 	<xs:complexType name="Components_HEV-Px_PrimaryBusType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_Components_HEV-Px_PrimaryBusDeclarationType">
+			<xs:extension base="v2.4:Abstract_Components_HEV-Px_PrimaryBusDeclarationType">
 				<xs:sequence>
 					<xs:element name="Engine" type="v2.0:EngineComponentDeclarationType"/>
-					<xs:element name="ElectricMachine" type="v2.10.2:ElectricMachineType"/>
-					<xs:element name="ElectricEnergyStorage" type="v2.10.2:ElectricEnergyStorageType"/>
+					<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.10.2:AUX_Component_HEV-P_PrimaryBus_Type"/>
+					<xs:element name="Auxiliaries" type="v2.4:AUX_Component_HEV-P_PrimaryBus_Type"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
 	<xs:complexType name="Components_HEV-S2_LorryType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_Components_HEV-Sx_LorryDeclarationType">
+			<xs:extension base="v2.4:Abstract_Components_HEV-Sx_LorryDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Components_HEV-Sx_GenSetSequenceGroup"/>
+					<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.10.2:AUX_Component_HEV-S_Lorry_Type"/>
+					<xs:element name="Auxiliaries" type="v2.4:AUX_Component_HEV-S_Lorry_Type"/>
 					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
 				</xs:sequence>
 			</xs:extension>
@@ -1146,29 +1145,29 @@
 	</xs:complexType>
 	<xs:complexType name="Components_HEV-S2_PrimaryBusType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_Components_HEV-Sx_PrimaryBusDeclarationType">
+			<xs:extension base="v2.4:Abstract_Components_HEV-Sx_PrimaryBusDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Components_HEV-Sx_GenSetSequenceGroup"/>
+					<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.10.2:AUX_Component_HEV-S_PrimaryBus_Type"/>
+					<xs:element name="Auxiliaries" type="v2.4:AUX_Component_HEV-S_PrimaryBus_Type"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
 	<xs:complexType name="Components_HEV-S3_LorryType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_Components_HEV-Sx_LorryDeclarationType">
+			<xs:extension base="v2.4:Abstract_Components_HEV-Sx_LorryDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Components_HEV-Sx_GenSetSequenceGroup"/>
+					<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.10.2:AUX_Component_HEV-S_Lorry_Type"/>
+					<xs:element name="Auxiliaries" type="v2.4:AUX_Component_HEV-S_Lorry_Type"/>
 					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
 				</xs:sequence>
 			</xs:extension>
@@ -1176,25 +1175,25 @@
 	</xs:complexType>
 	<xs:complexType name="Components_HEV-S3_PrimaryBusType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_Components_HEV-Sx_PrimaryBusDeclarationType">
+			<xs:extension base="v2.4:Abstract_Components_HEV-Sx_PrimaryBusDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Components_HEV-Sx_GenSetSequenceGroup"/>
+					<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.10.2:AUX_Component_HEV-S_PrimaryBus_Type"/>
+					<xs:element name="Auxiliaries" type="v2.4:AUX_Component_HEV-S_PrimaryBus_Type"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
 	<xs:complexType name="Components_HEV-S4_LorryType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_Components_HEV-Sx_LorryDeclarationType">
+			<xs:extension base="v2.4:Abstract_Components_HEV-Sx_LorryDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Components_HEV-Sx_GenSetSequenceGroup"/>
+					<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.10.2:AUX_Component_HEV-S_Lorry_Type"/>
+					<xs:element name="Auxiliaries" type="v2.4:AUX_Component_HEV-S_Lorry_Type"/>
 					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
 				</xs:sequence>
 			</xs:extension>
@@ -1202,26 +1201,26 @@
 	</xs:complexType>
 	<xs:complexType name="Components_HEV-S4_PrimaryBusType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_Components_HEV-Sx_PrimaryBusDeclarationType">
+			<xs:extension base="v2.4:Abstract_Components_HEV-Sx_PrimaryBusDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Components_HEV-Sx_GenSetSequenceGroup"/>
+					<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.10.2:AUX_Component_HEV-S_PrimaryBus_Type"/>
+					<xs:element name="Auxiliaries" type="v2.4:AUX_Component_HEV-S_PrimaryBus_Type"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
 	<xs:complexType name="Components_IEPC_LorryType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_Components_IEPC_LorryDeclarationType">
+			<xs:extension base="v2.4:Abstract_Components_IEPC_LorryDeclarationType">
 				<xs:sequence>
-					<xs:element name="IEPC" type="v2.10.1:IEPCComponentDeclarationType"/>
-					<xs:element name="ElectricEnergyStorage" type="v2.10.2:ElectricEnergyStorageType"/>
+					<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.10.2:AUX_Component_IEPC_Lorry_Type"/>
+					<xs:element name="Auxiliaries" type="v2.4:AUX_Component_IEPC_Lorry_Type"/>
 					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
 				</xs:sequence>
 			</xs:extension>
@@ -1229,31 +1228,31 @@
 	</xs:complexType>
 	<xs:complexType name="Components_IEPC_PrimaryBusType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_Components_IEPC_PrimaryBusDeclarationType">
+			<xs:extension base="v2.4:Abstract_Components_IEPC_PrimaryBusDeclarationType">
 				<xs:sequence>
-					<xs:element name="IEPC" type="v2.10.1:IEPCComponentDeclarationType"/>
-					<xs:element name="ElectricEnergyStorage" type="v2.10.2:ElectricEnergyStorageType"/>
+					<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.10.2:AUX_Component_IEPC_PrimaryBus_Type"/>
+					<xs:element name="Auxiliaries" type="v2.4:AUX_Component_IEPC_PrimaryBus_Type"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
 	<xs:complexType name="Components_PEV-E2_LorryType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_Components_PEV_LorryDeclarationType">
+			<xs:extension base="v2.4:Abstract_Components_PEV_LorryDeclarationType">
 				<xs:sequence>
-					<xs:element name="ElectricMachine" type="v2.10.2:ElectricMachineType"/>
-					<xs:element name="ElectricEnergyStorage" type="v2.10.2:ElectricEnergyStorageType"/>
+					<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.10.2:AUX_Component_PEV_Lorry_Type"/>
+					<xs:element name="Auxiliaries" type="v2.4:AUX_Component_PEV_Lorry_Type"/>
 					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
 				</xs:sequence>
 			</xs:extension>
@@ -1261,31 +1260,31 @@
 	</xs:complexType>
 	<xs:complexType name="Components_PEV-E2_PrimaryBusType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_Components_PEV_PrimaryBusDeclarationType">
+			<xs:extension base="v2.4:Abstract_Components_PEV_PrimaryBusDeclarationType">
 				<xs:sequence>
-					<xs:element name="ElectricMachine" type="v2.10.2:ElectricMachineType"/>
-					<xs:element name="ElectricEnergyStorage" type="v2.10.2:ElectricEnergyStorageType"/>
+					<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.10.2:AUX_Component_PEV_PrimaryBus_Type"/>
+					<xs:element name="Auxiliaries" type="v2.4:AUX_Component_PEV_PrimaryBus_Type"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
 	<xs:complexType name="Components_PEV-E3_LorryType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_Components_PEV_LorryDeclarationType">
+			<xs:extension base="v2.4:Abstract_Components_PEV_LorryDeclarationType">
 				<xs:sequence>
-					<xs:element name="ElectricMachine" type="v2.10.2:ElectricMachineType"/>
-					<xs:element name="ElectricEnergyStorage" type="v2.10.2:ElectricEnergyStorageType"/>
+					<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.10.2:AUX_Component_PEV_Lorry_Type"/>
+					<xs:element name="Auxiliaries" type="v2.4:AUX_Component_PEV_Lorry_Type"/>
 					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
 				</xs:sequence>
 			</xs:extension>
@@ -1293,27 +1292,27 @@
 	</xs:complexType>
 	<xs:complexType name="Components_PEV-E3_PrimaryBusType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_Components_PEV_PrimaryBusDeclarationType">
+			<xs:extension base="v2.4:Abstract_Components_PEV_PrimaryBusDeclarationType">
 				<xs:sequence>
-					<xs:element name="ElectricMachine" type="v2.10.2:ElectricMachineType"/>
-					<xs:element name="ElectricEnergyStorage" type="v2.10.2:ElectricEnergyStorageType"/>
+					<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.10.2:AUX_Component_PEV_PrimaryBus_Type"/>
+					<xs:element name="Auxiliaries" type="v2.4:AUX_Component_PEV_PrimaryBus_Type"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
 	<xs:complexType name="Components_PEV-E4_LorryType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_Components_PEV_LorryDeclarationType">
+			<xs:extension base="v2.4:Abstract_Components_PEV_LorryDeclarationType">
 				<xs:sequence>
-					<xs:element name="ElectricMachine" type="v2.10.2:ElectricMachineType"/>
-					<xs:element name="ElectricEnergyStorage" type="v2.10.2:ElectricEnergyStorageType"/>
+					<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.10.2:AUX_Component_PEV_Lorry_Type"/>
+					<xs:element name="Auxiliaries" type="v2.4:AUX_Component_PEV_Lorry_Type"/>
 					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
 				</xs:sequence>
 			</xs:extension>
@@ -1321,26 +1320,26 @@
 	</xs:complexType>
 	<xs:complexType name="Components_PEV-E4_PrimaryBusType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_Components_PEV_PrimaryBusDeclarationType">
+			<xs:extension base="v2.4:Abstract_Components_PEV_PrimaryBusDeclarationType">
 				<xs:sequence>
-					<xs:element name="ElectricMachine" type="v2.10.2:ElectricMachineType"/>
-					<xs:element name="ElectricEnergyStorage" type="v2.10.2:ElectricEnergyStorageType"/>
+					<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.10.2:AUX_Component_PEV_PrimaryBus_Type"/>
+					<xs:element name="Auxiliaries" type="v2.4:AUX_Component_PEV_PrimaryBus_Type"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
 	<xs:complexType name="Components_xEV_CompletedBusType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:Abstract_Components_xEV_CompletedBusType">
+			<xs:extension base="v2.4:Abstract_Components_xEV_CompletedBusType">
 				<xs:sequence>
 					<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
 					<xs:element name="Auxiliaries" minOccurs="0">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Data" type="v2.10.2:Abstract_AUX_xEV_CompletedBusDeclarationType"/>
+								<xs:element name="Data" type="v2.4:Abstract_AUX_xEV_CompletedBusDeclarationType"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
@@ -1350,13 +1349,13 @@
 	</xs:complexType>
 	<xs:complexType name="ElectricEnergyStorageType">
 		<xs:choice>
-			<xs:element name="Capacitor" type="v2.10.2:REESSCapacitorType"/>
-			<xs:element name="Battery" type="v2.10.2:REESSBatteryType" maxOccurs="unbounded"/>
+			<xs:element name="Capacitor" type="v2.4:REESSCapacitorType"/>
+			<xs:element name="Battery" type="v2.4:REESSBatteryType" maxOccurs="unbounded"/>
 		</xs:choice>
 	</xs:complexType>
 	<xs:complexType name="ElectricMachineGENType">
 		<xs:sequence>
-			<xs:element name="PowertrainPosition" type="v2.10.2:PowertrainPositionGENType">
+			<xs:element name="PowertrainPosition" type="v2.4:PowertrainPositionGENType">
 				<xs:annotation>
 					<xs:documentation>P403 - enum</xs:documentation>
 				</xs:annotation>
@@ -1371,18 +1370,18 @@
 					</xs:restriction>
 				</xs:simpleType>
 			</xs:element>
-			<xs:element name="ElectricMachineSystem" type="v2.10.1:ElectricMachineSystemComponentDeclarationType"/>
-			<xs:element name="ADC" type="v2.10.1:ADCComponentDeclarationType" minOccurs="0"/>
+			<xs:element name="ElectricMachineSystem" type="v2.3:ElectricMachineSystemComponentDeclarationType"/>
+			<xs:element name="ADC" type="v2.3:ADCComponentDeclarationType" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="ElectricMachineTorqueLimitsType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType">
+			<xs:extension base="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType">
 				<xs:sequence>
 					<xs:element name="ElectricMachine" maxOccurs="unbounded">
 						<xs:complexType>
 							<xs:sequence>
-								<xs:element name="Position" type="v2.10.2:PowertrainPositionType"/>
+								<xs:element name="Position" type="v2.4:PowertrainPositionType"/>
 								<xs:element name="VoltageLevel" minOccurs="2" maxOccurs="unbounded">
 									<xs:complexType>
 										<xs:sequence>
@@ -1393,7 +1392,7 @@
 													</xs:restriction>
 												</xs:simpleType>
 											</xs:element>
-											<xs:element name="MaxTorqueCurve" type="v2.10.1:ElectricMachineSystemMaxTorqueCurveType"/>
+											<xs:element name="MaxTorqueCurve" type="v2.3:ElectricMachineSystemMaxTorqueCurveType"/>
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
@@ -1406,7 +1405,7 @@
 	</xs:complexType>
 	<xs:complexType name="ElectricMachineType">
 		<xs:sequence>
-			<xs:element name="PowertrainPosition" type="v2.10.2:PowertrainPositionDriveType">
+			<xs:element name="PowertrainPosition" type="v2.4:PowertrainPositionDriveType">
 				<xs:annotation>
 					<xs:documentation>P403 - enum</xs:documentation>
 				</xs:annotation>
@@ -1421,8 +1420,8 @@
 					</xs:restriction>
 				</xs:simpleType>
 			</xs:element>
-			<xs:element name="ElectricMachineSystem" type="v2.10.1:ElectricMachineSystemComponentDeclarationType"/>
-			<xs:element name="ADC" type="v2.10.1:ADCComponentDeclarationType" minOccurs="0"/>
+			<xs:element name="ElectricMachineSystem" type="v2.3:ElectricMachineSystemComponentDeclarationType"/>
+			<xs:element name="ADC" type="v2.3:ADCComponentDeclarationType" minOccurs="0"/>
 			<xs:element name="P2.5GearRatios" minOccurs="0">
 				<xs:annotation>
 					<xs:documentation>P407 - [-]</xs:documentation>
@@ -1445,9 +1444,9 @@
 	</xs:complexType>
 	<xs:complexType name="PTOType">
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:AbstractPTODataType">
+			<xs:extension base="v2.4:AbstractPTODataType">
 				<xs:sequence>
-					<xs:element name="PTOShaftsGearWheels" type="v2.10.2:PTOShaftsGearWheelsType">
+					<xs:element name="PTOShaftsGearWheels" type="v2.4:PTOShaftsGearWheelsType">
 						<xs:annotation>
 							<xs:documentation>P247 - enum</xs:documentation>
 						</xs:annotation>
@@ -1476,7 +1475,7 @@
 			<xs:element name="REESS">
 				<xs:complexType>
 					<xs:sequence>
-						<xs:element name="Data" type="v2.10.1:AbstractBatterySystemDataType"/>
+						<xs:element name="Data" type="v2.3:AbstractBatterySystemDataType"/>
 						<xs:element name="Signature" type="v2.0:SignatureType"/>
 					</xs:sequence>
 				</xs:complexType>
@@ -1509,7 +1508,7 @@
 	</xs:complexType>
 	<xs:complexType name="REESSCapacitorType">
 		<xs:sequence>
-			<xs:element name="Data" type="v2.10.1:AbstractCapacitorSystemDataType"/>
+			<xs:element name="Data" type="v2.3:AbstractCapacitorSystemDataType"/>
 			<xs:element name="Signature" type="v2.0:SignatureType"/>
 		</xs:sequence>
 	</xs:complexType>
@@ -1518,17 +1517,17 @@
 			<xs:documentation>Vehicle stage input parts</xs:documentation>
 		</xs:annotation>
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:AbstractCompletedBusVehicleType">
+			<xs:extension base="v2.4:AbstractCompletedBusVehicleType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_CompletedBus_GeneralParametersSequenceGroup"/>
-					<xs:group ref="v2.10.2:Vehicle_CompletedBusParametersSequenceGroup"/>
+					<xs:group ref="v2.4:Vehicle_CompletedBus_GeneralParametersSequenceGroup"/>
+					<xs:group ref="v2.4:Vehicle_CompletedBusParametersSequenceGroup"/>
 					<xs:element name="NgTankSystem" type="v1.0:NgTankSystemType" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>P275 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:group ref="v2.10.2:Vehicle_CompletedBus_PassengerCountSequenceGroup" minOccurs="0"/>
-					<xs:element name="BodyworkCode" type="v2.10.2:VehicleCodeType" minOccurs="0">
+					<xs:group ref="v2.4:Vehicle_CompletedBus_PassengerCountSequenceGroup" minOccurs="0"/>
+					<xs:element name="BodyworkCode" type="v2.4:VehicleCodeType" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>P285 - enum</xs:documentation>
 						</xs:annotation>
@@ -1538,24 +1537,24 @@
 							<xs:documentation>P286 - bool</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:group ref="v2.10.2:Vehicle_CompletedBus_DimensionsSequenceGroup" minOccurs="0"/>
-					<xs:element name="DoorDriveTechnology" type="v2.10.2:DoorDriveTechnologyType" minOccurs="0">
+					<xs:group ref="v2.4:Vehicle_CompletedBus_DimensionsSequenceGroup" minOccurs="0"/>
+					<xs:element name="DoorDriveTechnology" type="v2.4:DoorDriveTechnologyType" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>P291 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="VehicleDeclarationType" type="v2.10.2:DeclarationType">
+					<xs:element name="VehicleDeclarationType" type="v2.4:DeclarationType">
 						<xs:annotation>
 							<xs:documentation>P293 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="VehicleTypeApprovalNumber" type="v2.10.2:VehicleTypeApprovalNumberType" minOccurs="0">
+					<xs:element name="VehicleTypeApprovalNumber" type="v2.4:VehicleTypeApprovalNumberType" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>P352 - [-]</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_ConventionalType" minOccurs="0"/>
-					<xs:element name="Components" type="v2.10.2:Abstract_Components_Conventional_CompletedBusDeclarationType" minOccurs="0"/>
+					<xs:element name="ADAS" type="v2.4:Abstract_ADAS_ConventionalType" minOccurs="0"/>
+					<xs:element name="Components" type="v2.4:Abstract_Components_Conventional_CompletedBusDeclarationType" minOccurs="0"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -1564,16 +1563,16 @@
 		<xs:complexContent>
 			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_HeavyLorryParametersSequenceGroup_1"/>
+					<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.10.2:Vehicle_HeavyLorryParametersSequenceGroup_2"/>
-					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_ConventionalType"/>
+					<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.10.2:Abstract_Components_Conventional_LorryDeclarationType"/>
+					<xs:element name="Components" type="v2.4:Abstract_Components_Conventional_LorryDeclarationType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -1582,16 +1581,16 @@
 		<xs:complexContent>
 			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_MediumLorryParametersSequenceGroup_1"/>
+					<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.10.2:Vehicle_MediumLorryParametersSequenceGroup_2"/>
-					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_ConventionalType"/>
+					<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.10.2:Abstract_Components_Conventional_LorryDeclarationType"/>
+					<xs:element name="Components" type="v2.4:Abstract_Components_Conventional_LorryDeclarationType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -1600,13 +1599,13 @@
 		<xs:complexContent>
 			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_PrimaryBusParametersSequenceGroup"/>
+					<xs:group ref="v2.4: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.10.2:Vehicle_RetarderSequenceGroup"/>
+					<xs:group ref="v2.4:Vehicle_RetarderSequenceGroup"/>
 					<xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
 						<xs:annotation>
 							<xs:documentation>P180 - enum</xs:documentation>
@@ -1617,9 +1616,9 @@
 							<xs:documentation>P269 - bool</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_ConventionalType"/>
+					<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.10.2:Abstract_Components_Conventional_PrimaryBusDeclarationType"/>
+					<xs:element name="Components" type="v2.4:Abstract_Components_Conventional_PrimaryBusDeclarationType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -1629,15 +1628,15 @@
 			<xs:documentation>Exempted vehicle stage input parts</xs:documentation>
 		</xs:annotation>
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:AbstractCompletedBusVehicleType">
+			<xs:extension base="v2.4:AbstractCompletedBusVehicleType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_CompletedBus_GeneralParametersSequenceGroup"/>
+					<xs:group ref="v2.4:Vehicle_CompletedBus_GeneralParametersSequenceGroup"/>
 					<xs:element name="Model" type="v1.0:ModelType" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>P236 - [-]</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="LegislativeCategory" type="v2.10.2:LegislativeCategoryPrimaryBusDeclarationType" minOccurs="0">
+					<xs:element name="LegislativeCategory" type="v2.4:LegislativeCategoryPrimaryBusDeclarationType" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>P251 - enum</xs:documentation>
 						</xs:annotation>
@@ -1652,13 +1651,13 @@
 							<xs:documentation>P041 - [kg]</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="ClassBus" type="v2.10.2:RegisteredClassType" minOccurs="0">
+					<xs:element name="ClassBus" type="v2.4:RegisteredClassType" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>P282 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:group ref="v2.10.2:Vehicle_CompletedBus_PassengerCountSequenceGroup" minOccurs="0"/>
-					<xs:element name="BodyworkCode" type="v2.10.2:VehicleCodeType" minOccurs="0">
+					<xs:group ref="v2.4:Vehicle_CompletedBus_PassengerCountSequenceGroup" minOccurs="0"/>
+					<xs:element name="BodyworkCode" type="v2.4:VehicleCodeType" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>P285 - enum</xs:documentation>
 						</xs:annotation>
@@ -1668,7 +1667,7 @@
 							<xs:documentation>P286 - bool</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="HeightIntegratedBody" type="v2.10.2:VehicleDimensionType" minOccurs="0">
+					<xs:element name="HeightIntegratedBody" type="v2.4:VehicleDimensionType" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>P287 - [mm]</xs:documentation>
 						</xs:annotation>
@@ -1681,18 +1680,18 @@
 		<xs:complexContent>
 			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_GeneralParametersSequenceGroup"/>
-					<xs:element name="LegislativeCategory" type="v2.10.2:LegislativeCategoryHeavyLorryDeclarationType">
+					<xs:group ref="v2.4:Vehicle_GeneralParametersSequenceGroup"/>
+					<xs:element name="LegislativeCategory" type="v2.4:LegislativeCategoryHeavyLorryDeclarationType">
 						<xs:annotation>
 							<xs:documentation>P251 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="ChassisConfiguration" type="v2.10.2:ChassisConfigurationHeavyLorryDeclarationType">
+					<xs:element name="ChassisConfiguration" type="v2.4:ChassisConfigurationHeavyLorryDeclarationType">
 						<xs:annotation>
 							<xs:documentation>P036 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="AxleConfiguration" type="v2.10.2:AxleConfigurationHeavyLorryDeclarationType">
+					<xs:element name="AxleConfiguration" type="v2.4:AxleConfigurationHeavyLorryDeclarationType">
 						<xs:annotation>
 							<xs:documentation>P037 - enum</xs:documentation>
 						</xs:annotation>
@@ -1747,18 +1746,18 @@
 		<xs:complexContent>
 			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_GeneralParametersSequenceGroup"/>
-					<xs:element name="LegislativeCategory" type="v2.10.2:LegislativeCategoryHeavyLorryDeclarationType">
+					<xs:group ref="v2.4:Vehicle_GeneralParametersSequenceGroup"/>
+					<xs:element name="LegislativeCategory" type="v2.4:LegislativeCategoryHeavyLorryDeclarationType">
 						<xs:annotation>
 							<xs:documentation>P251 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="ChassisConfiguration" type="v2.10.2:ChassisConfigurationHeavyLorryDeclarationType">
+					<xs:element name="ChassisConfiguration" type="v2.4:ChassisConfigurationHeavyLorryDeclarationType">
 						<xs:annotation>
 							<xs:documentation>P036 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="AxleConfiguration" type="v2.10.2:AxleConfigurationHeavyLorryDeclarationType">
+					<xs:element name="AxleConfiguration" type="v2.4:AxleConfigurationHeavyLorryDeclarationType">
 						<xs:annotation>
 							<xs:documentation>P037 - enum</xs:documentation>
 						</xs:annotation>
@@ -1808,7 +1807,7 @@
 		<xs:complexContent>
 			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_PrimaryBusParametersSequenceGroup"/>
+					<xs:group ref="v2.4:Vehicle_PrimaryBusParametersSequenceGroup"/>
 					<xs:element name="ZeroEmissionVehicle" type="xs:boolean">
 						<xs:annotation>
 							<xs:documentation>P269 - bool</xs:documentation>
@@ -1845,17 +1844,17 @@
 			<xs:documentation>Vehicle stage input parts</xs:documentation>
 		</xs:annotation>
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:AbstractCompletedBusVehicleType">
+			<xs:extension base="v2.4:AbstractCompletedBusVehicleType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_CompletedBus_GeneralParametersSequenceGroup"/>
-					<xs:group ref="v2.10.2:Vehicle_CompletedBusParametersSequenceGroup"/>
+					<xs:group ref="v2.4:Vehicle_CompletedBus_GeneralParametersSequenceGroup"/>
+					<xs:group ref="v2.4:Vehicle_CompletedBusParametersSequenceGroup"/>
 					<xs:element name="NgTankSystem" type="v1.0:NgTankSystemType" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>P275 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:group ref="v2.10.2:Vehicle_CompletedBus_PassengerCountSequenceGroup" minOccurs="0"/>
-					<xs:element name="BodyworkCode" type="v2.10.2:VehicleCodeType" minOccurs="0">
+					<xs:group ref="v2.4:Vehicle_CompletedBus_PassengerCountSequenceGroup" minOccurs="0"/>
+					<xs:element name="BodyworkCode" type="v2.4:VehicleCodeType" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>P285 - enum</xs:documentation>
 						</xs:annotation>
@@ -1865,24 +1864,24 @@
 							<xs:documentation>P286 - bool</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:group ref="v2.10.2:Vehicle_CompletedBus_DimensionsSequenceGroup" minOccurs="0"/>
-					<xs:element name="DoorDriveTechnology" type="v2.10.2:DoorDriveTechnologyType" minOccurs="0">
+					<xs:group ref="v2.4:Vehicle_CompletedBus_DimensionsSequenceGroup" minOccurs="0"/>
+					<xs:element name="DoorDriveTechnology" type="v2.4:DoorDriveTechnologyType" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>P291 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="VehicleDeclarationType" type="v2.10.2:DeclarationType">
+					<xs:element name="VehicleDeclarationType" type="v2.4:DeclarationType">
 						<xs:annotation>
 							<xs:documentation>P293 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="VehicleTypeApprovalNumber" type="v2.10.2:VehicleTypeApprovalNumberType" minOccurs="0">
+					<xs:element name="VehicleTypeApprovalNumber" type="v2.4:VehicleTypeApprovalNumberType" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>P352 - [-]</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType" minOccurs="0"/>
-					<xs:element name="Components" type="v2.10.2:Abstract_Components_xEV_CompletedBusType" minOccurs="0"/>
+					<xs:element name="ADAS" type="v2.4:Abstract_ADAS_HEVType" minOccurs="0"/>
+					<xs:element name="Components" type="v2.4:Abstract_Components_xEV_CompletedBusType" minOccurs="0"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -1891,24 +1890,24 @@
 		<xs:complexContent>
 			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_HeavyLorryParametersSequenceGroup_1"/>
+					<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.10.2:Vehicle_HeavyLorryParametersSequenceGroup_2"/>
-					<xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_HEV-IEPC-S_Type">
+					<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.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
-					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType"/>
+					<xs:group ref="v2.4:Vehicle_xEV-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.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
-					<xs:element name="BoostingLimitations" type="v2.10.2:AbstractBoostingLimitationsDeclarationType" minOccurs="0"/>
-					<xs:element name="Components" type="v2.10.2:Abstract_Components_HEV-IEPC-S_LorryDeclarationType"/>
+					<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-IEPC-S_LorryDeclarationType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -1917,24 +1916,24 @@
 		<xs:complexContent>
 			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_MediumLorryParametersSequenceGroup_1"/>
+					<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.10.2:Vehicle_MediumLorryParametersSequenceGroup_2"/>
-					<xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_HEV-IEPC-S_Type">
+					<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.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
-					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType"/>
+					<xs:group ref="v2.4:Vehicle_xEV-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.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
-					<xs:element name="BoostingLimitations" type="v2.10.2:AbstractBoostingLimitationsDeclarationType" minOccurs="0"/>
-					<xs:element name="Components" type="v2.10.2:Abstract_Components_HEV-IEPC-S_LorryDeclarationType"/>
+					<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-IEPC-S_LorryDeclarationType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -1943,13 +1942,13 @@
 		<xs:complexContent>
 			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_PrimaryBusParametersSequenceGroup"/>
+					<xs:group ref="v2.4: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.10.2:Vehicle_RetarderSequenceGroup"/>
+					<xs:group ref="v2.4:Vehicle_RetarderSequenceGroup"/>
 					<xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
 						<xs:annotation>
 							<xs:documentation>P180 - enum</xs:documentation>
@@ -1960,17 +1959,17 @@
 							<xs:documentation>P269 - bool</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_HEV-IEPC-S_Type">
+					<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.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
-					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType"/>
+					<xs:group ref="v2.4:Vehicle_xEV-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.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
-					<xs:element name="BoostingLimitations" type="v2.10.2:AbstractBoostingLimitationsDeclarationType" minOccurs="0"/>
-					<xs:element name="Components" type="v2.10.2:Abstract_Components_HEV-IEPC-S_PrimaryBusDeclarationType"/>
+					<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-IEPC-S_PrimaryBusDeclarationType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -1979,24 +1978,24 @@
 		<xs:complexContent>
 			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_HeavyLorryParametersSequenceGroup_1"/>
+					<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.10.2:Vehicle_HeavyLorryParametersSequenceGroup_2"/>
-					<xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_HEV-Px_Type">
+					<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.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
-					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType"/>
+					<xs:group ref="v2.4:Vehicle_xEV-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.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
-					<xs:element name="BoostingLimitations" type="v2.10.2:AbstractBoostingLimitationsDeclarationType" minOccurs="0"/>
-					<xs:element name="Components" type="v2.10.2:Abstract_Components_HEV-Px_LorryDeclarationType"/>
+					<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_LorryDeclarationType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -2005,24 +2004,24 @@
 		<xs:complexContent>
 			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_MediumLorryParametersSequenceGroup_1"/>
+					<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.10.2:Vehicle_MediumLorryParametersSequenceGroup_2"/>
-					<xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_HEV-Px_Type">
+					<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.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
-					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType"/>
+					<xs:group ref="v2.4:Vehicle_xEV-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.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
-					<xs:element name="BoostingLimitations" type="v2.10.2:AbstractBoostingLimitationsDeclarationType" minOccurs="0"/>
-					<xs:element name="Components" type="v2.10.2:Abstract_Components_HEV-Px_LorryDeclarationType"/>
+					<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_LorryDeclarationType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -2031,13 +2030,13 @@
 		<xs:complexContent>
 			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_PrimaryBusParametersSequenceGroup"/>
+					<xs:group ref="v2.4: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.10.2:Vehicle_RetarderSequenceGroup"/>
+					<xs:group ref="v2.4:Vehicle_RetarderSequenceGroup"/>
 					<xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
 						<xs:annotation>
 							<xs:documentation>P180 - enum</xs:documentation>
@@ -2048,17 +2047,17 @@
 							<xs:documentation>P269 - bool</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_HEV-Px_Type">
+					<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.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
-					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType"/>
+					<xs:group ref="v2.4:Vehicle_xEV-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.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
-					<xs:element name="BoostingLimitations" type="v2.10.2:AbstractBoostingLimitationsDeclarationType" minOccurs="0"/>
-					<xs:element name="Components" type="v2.10.2:Abstract_Components_HEV-Px_PrimaryBusDeclarationType"/>
+					<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>
@@ -2067,23 +2066,23 @@
 		<xs:complexContent>
 			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_HeavyLorryParametersSequenceGroup_1"/>
+					<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.10.2:Vehicle_HeavyLorryParametersSequenceGroup_2"/>
-					<xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_HEV-Sx_Type">
+					<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.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
-					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType"/>
+					<xs:group ref="v2.4:Vehicle_xEV-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.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0" maxOccurs="2"/>
-					<xs:element name="Components" type="v2.10.2:Abstract_Components_HEV-Sx_LorryDeclarationType"/>
+					<xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0" maxOccurs="2"/>
+					<xs:element name="Components" type="v2.4:Abstract_Components_HEV-Sx_LorryDeclarationType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -2092,23 +2091,23 @@
 		<xs:complexContent>
 			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_MediumLorryParametersSequenceGroup_1"/>
+					<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.10.2:Vehicle_MediumLorryParametersSequenceGroup_2"/>
-					<xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_HEV-Sx_Type">
+					<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.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
-					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType"/>
+					<xs:group ref="v2.4:Vehicle_xEV-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.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0" maxOccurs="2"/>
-					<xs:element name="Components" type="v2.10.2:Abstract_Components_HEV-Sx_LorryDeclarationType"/>
+					<xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0" maxOccurs="2"/>
+					<xs:element name="Components" type="v2.4:Abstract_Components_HEV-Sx_LorryDeclarationType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -2117,13 +2116,13 @@
 		<xs:complexContent>
 			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_PrimaryBusParametersSequenceGroup"/>
+					<xs:group ref="v2.4: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.10.2:Vehicle_RetarderSequenceGroup"/>
+					<xs:group ref="v2.4:Vehicle_RetarderSequenceGroup"/>
 					<xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
 						<xs:annotation>
 							<xs:documentation>P180 - enum</xs:documentation>
@@ -2134,16 +2133,16 @@
 							<xs:documentation>P269 - bool</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_HEV-Sx_Type">
+					<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.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
-					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType"/>
+					<xs:group ref="v2.4:Vehicle_xEV-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.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0" maxOccurs="2"/>
-					<xs:element name="Components" type="v2.10.2:Abstract_Components_HEV-Sx_PrimaryBusDeclarationType"/>
+					<xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0" maxOccurs="2"/>
+					<xs:element name="Components" type="v2.4:Abstract_Components_HEV-Sx_PrimaryBusDeclarationType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -2153,12 +2152,12 @@
 			<xs:documentation>Vehicle stage input parts</xs:documentation>
 		</xs:annotation>
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:AbstractCompletedBusVehicleType">
+			<xs:extension base="v2.4:AbstractCompletedBusVehicleType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_CompletedBus_GeneralParametersSequenceGroup"/>
-					<xs:group ref="v2.10.2:Vehicle_CompletedBusParametersSequenceGroup"/>
-					<xs:group ref="v2.10.2:Vehicle_CompletedBus_PassengerCountSequenceGroup" minOccurs="0"/>
-					<xs:element name="BodyworkCode" type="v2.10.2:VehicleCodeType" minOccurs="0">
+					<xs:group ref="v2.4:Vehicle_CompletedBus_GeneralParametersSequenceGroup"/>
+					<xs:group ref="v2.4:Vehicle_CompletedBusParametersSequenceGroup"/>
+					<xs:group ref="v2.4:Vehicle_CompletedBus_PassengerCountSequenceGroup" minOccurs="0"/>
+					<xs:element name="BodyworkCode" type="v2.4:VehicleCodeType" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>P285 - enum</xs:documentation>
 						</xs:annotation>
@@ -2168,24 +2167,24 @@
 							<xs:documentation>P286 - bool</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:group ref="v2.10.2:Vehicle_CompletedBus_DimensionsSequenceGroup" minOccurs="0"/>
-					<xs:element name="DoorDriveTechnology" type="v2.10.2:DoorDriveTechnologyType" minOccurs="0">
+					<xs:group ref="v2.4:Vehicle_CompletedBus_DimensionsSequenceGroup" minOccurs="0"/>
+					<xs:element name="DoorDriveTechnology" type="v2.4:DoorDriveTechnologyType" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>P291 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="VehicleDeclarationType" type="v2.10.2:DeclarationType">
+					<xs:element name="VehicleDeclarationType" type="v2.4:DeclarationType">
 						<xs:annotation>
 							<xs:documentation>P293 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="VehicleTypeApprovalNumber" type="v2.10.2:VehicleTypeApprovalNumberType" minOccurs="0">
+					<xs:element name="VehicleTypeApprovalNumber" type="v2.4:VehicleTypeApprovalNumberType" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>P352 - [-]</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_IEPCType" minOccurs="0"/>
-					<xs:element name="Components" type="v2.10.2:Abstract_Components_xEV_CompletedBusType" minOccurs="0"/>
+					<xs:element name="ADAS" type="v2.4:Abstract_ADAS_IEPCType" minOccurs="0"/>
+					<xs:element name="Components" type="v2.4:Abstract_Components_xEV_CompletedBusType" minOccurs="0"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -2194,16 +2193,16 @@
 		<xs:complexContent>
 			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_HeavyLorryParametersSequenceGroup_1"/>
-					<xs:group ref="v2.10.2:Vehicle_HeavyLorryPEVParametersSequenceGroup_2"/>
-					<xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_IEPC_Type">
+					<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:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
-					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_IEPCType"/>
-					<xs:element name="Components" type="v2.10.2:Abstract_Components_IEPC_LorryDeclarationType"/>
+					<xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/>
+					<xs:element name="ADAS" type="v2.4:Abstract_ADAS_IEPCType"/>
+					<xs:element name="Components" type="v2.4:Abstract_Components_IEPC_LorryDeclarationType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -2212,16 +2211,16 @@
 		<xs:complexContent>
 			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_MediumLorryParametersSequenceGroup_1"/>
-					<xs:group ref="v2.10.2:Vehicle_MediumLorryPEVParametersSequenceGroup_2"/>
-					<xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_IEPC_Type">
+					<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:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
-					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_IEPCType"/>
-					<xs:element name="Components" type="v2.10.2:Abstract_Components_IEPC_LorryDeclarationType"/>
+					<xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/>
+					<xs:element name="ADAS" type="v2.4:Abstract_ADAS_IEPCType"/>
+					<xs:element name="Components" type="v2.4:Abstract_Components_IEPC_LorryDeclarationType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -2230,8 +2229,8 @@
 		<xs:complexContent>
 			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_PrimaryBusParametersSequenceGroup"/>
-					<xs:group ref="v2.10.2:Vehicle_RetarderSequenceGroup"/>
+					<xs:group ref="v2.4:Vehicle_PrimaryBusParametersSequenceGroup"/>
+					<xs:group ref="v2.4:Vehicle_RetarderSequenceGroup"/>
 					<xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
 						<xs:annotation>
 							<xs:documentation>P180 - enum</xs:documentation>
@@ -2242,14 +2241,14 @@
 							<xs:documentation>P269 - bool</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_IEPC_Type">
+					<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="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
-					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_IEPCType"/>
-					<xs:element name="Components" type="v2.10.2:Abstract_Components_IEPC_PrimaryBusDeclarationType"/>
+					<xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/>
+					<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>
@@ -2259,12 +2258,12 @@
 			<xs:documentation>Vehicle stage input parts</xs:documentation>
 		</xs:annotation>
 		<xs:complexContent>
-			<xs:extension base="v2.10.2:AbstractCompletedBusVehicleType">
+			<xs:extension base="v2.4:AbstractCompletedBusVehicleType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_CompletedBus_GeneralParametersSequenceGroup"/>
-					<xs:group ref="v2.10.2:Vehicle_CompletedBusParametersSequenceGroup"/>
-					<xs:group ref="v2.10.2:Vehicle_CompletedBus_PassengerCountSequenceGroup" minOccurs="0"/>
-					<xs:element name="BodyworkCode" type="v2.10.2:VehicleCodeType" minOccurs="0">
+					<xs:group ref="v2.4:Vehicle_CompletedBus_GeneralParametersSequenceGroup"/>
+					<xs:group ref="v2.4:Vehicle_CompletedBusParametersSequenceGroup"/>
+					<xs:group ref="v2.4:Vehicle_CompletedBus_PassengerCountSequenceGroup" minOccurs="0"/>
+					<xs:element name="BodyworkCode" type="v2.4:VehicleCodeType" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>P285 - enum</xs:documentation>
 						</xs:annotation>
@@ -2274,24 +2273,24 @@
 							<xs:documentation>P286 - bool</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:group ref="v2.10.2:Vehicle_CompletedBus_DimensionsSequenceGroup" minOccurs="0"/>
-					<xs:element name="DoorDriveTechnology" type="v2.10.2:DoorDriveTechnologyType" minOccurs="0">
+					<xs:group ref="v2.4:Vehicle_CompletedBus_DimensionsSequenceGroup" minOccurs="0"/>
+					<xs:element name="DoorDriveTechnology" type="v2.4:DoorDriveTechnologyType" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>P291 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="VehicleDeclarationType" type="v2.10.2:DeclarationType">
+					<xs:element name="VehicleDeclarationType" type="v2.4:DeclarationType">
 						<xs:annotation>
 							<xs:documentation>P293 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="VehicleTypeApprovalNumber" type="v2.10.2:VehicleTypeApprovalNumberType" minOccurs="0">
+					<xs:element name="VehicleTypeApprovalNumber" type="v2.4:VehicleTypeApprovalNumberType" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>P352 - [-]</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_PEVType" minOccurs="0"/>
-					<xs:element name="Components" type="v2.10.2:Abstract_Components_xEV_CompletedBusType" minOccurs="0"/>
+					<xs:element name="ADAS" type="v2.4:Abstract_ADAS_PEVType" minOccurs="0"/>
+					<xs:element name="Components" type="v2.4:Abstract_Components_xEV_CompletedBusType" minOccurs="0"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -2300,18 +2299,18 @@
 		<xs:complexContent>
 			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_HeavyLorryParametersSequenceGroup_1"/>
-					<xs:group ref="v2.10.2:Vehicle_HeavyLorryPEVParametersSequenceGroup_2"/>
-					<xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_PEV_Type">
+					<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:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
-					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_PEVType"/>
+					<xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/>
+					<xs:element name="ADAS" type="v2.4:Abstract_ADAS_PEVType"/>
 					<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
-					<xs:element name="ElectricMotorTorqueLimits" type="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
-					<xs:element name="Components" type="v2.10.2:Abstract_Components_PEV_LorryDeclarationType"/>
+					<xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
+					<xs:element name="Components" type="v2.4:Abstract_Components_PEV_LorryDeclarationType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -2320,18 +2319,18 @@
 		<xs:complexContent>
 			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_MediumLorryParametersSequenceGroup_1"/>
-					<xs:group ref="v2.10.2:Vehicle_MediumLorryPEVParametersSequenceGroup_2"/>
-					<xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_PEV_Type">
+					<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:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
-					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_PEVType"/>
+					<xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/>
+					<xs:element name="ADAS" type="v2.4:Abstract_ADAS_PEVType"/>
 					<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
-					<xs:element name="ElectricMotorTorqueLimits" type="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
-					<xs:element name="Components" type="v2.10.2:Abstract_Components_PEV_LorryDeclarationType"/>
+					<xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
+					<xs:element name="Components" type="v2.4:Abstract_Components_PEV_LorryDeclarationType"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -2340,8 +2339,8 @@
 		<xs:complexContent>
 			<xs:extension base="v2.0:AbstractVehicleDeclarationType">
 				<xs:sequence>
-					<xs:group ref="v2.10.2:Vehicle_PrimaryBusParametersSequenceGroup"/>
-					<xs:group ref="v2.10.2:Vehicle_RetarderSequenceGroup"/>
+					<xs:group ref="v2.4:Vehicle_PrimaryBusParametersSequenceGroup"/>
+					<xs:group ref="v2.4:Vehicle_RetarderSequenceGroup"/>
 					<xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
 						<xs:annotation>
 							<xs:documentation>P180 - enum</xs:documentation>
@@ -2352,16 +2351,16 @@
 							<xs:documentation>P269 - bool</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_PEV_Type">
+					<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="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/>
-					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_PEVType"/>
+					<xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/>
+					<xs:element name="ADAS" type="v2.4:Abstract_ADAS_PEVType"/>
 					<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
-					<xs:element name="ElectricMotorTorqueLimits" type="v2.10.2:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0"/>
-					<xs:element name="Components" type="v2.10.2:Abstract_Components_PEV_PrimaryBusDeclarationType"/>
+					<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>
@@ -2386,10 +2385,10 @@
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="AlternatorTechnologyType">
-		<xs:union memberTypes="v2.10.2:AlternatorTechnology_Conventional_Type v2.10.2:AlternatorTechnology_HEV_Type v2.10.2:AlternatorTechnology_HEV-S_Type"/>
+		<xs:union memberTypes="v2.4:AlternatorTechnology_Conventional_Type v2.4:AlternatorTechnology_HEV_Type v2.4:AlternatorTechnology_HEV-S_Type"/>
 	</xs:simpleType>
 	<xs:simpleType name="ArchitectureID_HEV_Type">
-		<xs:union memberTypes="v2.10.2:ArchitectureID_HEV-Px_Type v2.10.2:ArchitectureID_HEV-Sx_Type v2.10.2:ArchitectureID_HEV-IEPC-S_Type"/>
+		<xs:union memberTypes="v2.4:ArchitectureID_HEV-Px_Type v2.4:ArchitectureID_HEV-Sx_Type v2.4:ArchitectureID_HEV-IEPC-S_Type"/>
 	</xs:simpleType>
 	<xs:simpleType name="ArchitectureID_HEV-IEPC-S_Type">
 		<xs:restriction base="xs:string">
@@ -2425,7 +2424,7 @@
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="ArchitectureIDType">
-		<xs:union memberTypes="v2.10.2:ArchitectureID_HEV_Type v2.10.2:ArchitectureID_IEPC_Type v2.10.2:ArchitectureID_PEV_Type"/>
+		<xs:union memberTypes="v2.4:ArchitectureID_HEV_Type v2.4:ArchitectureID_IEPC_Type v2.4:ArchitectureID_PEV_Type"/>
 	</xs:simpleType>
 	<xs:simpleType name="AuxESTechnologyLorryType">
 		<xs:restriction base="xs:string">
@@ -2473,7 +2472,7 @@
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="AuxPSTechnology_PEV_LorryType">
-		<xs:restriction base="v2.10.2:AuxPSTechnologyLorryType">
+		<xs:restriction base="v2.4:AuxPSTechnologyLorryType">
 			<xs:enumeration value="Small + elec. driven"/>
 			<xs:enumeration value="Small + ESS + elec. driven "/>
 			<xs:enumeration value="Medium Supply 1-stage + elec. driven"/>
@@ -2529,25 +2528,25 @@
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="AuxSPTechnology_HEV-S_LorryType">
-		<xs:restriction base="v2.10.2:AuxSPTechnologyLorryType">
+		<xs:restriction base="v2.4:AuxSPTechnologyLorryType">
 			<xs:enumeration value="Electric driven pump"/>
 			<xs:enumeration value="Full electric steering gear"/>
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="AuxSPTechnology_HEV-S_PrimaryBusType">
-		<xs:restriction base="v2.10.2:AuxSPTechnologyPrimaryBusType">
+		<xs:restriction base="v2.4:AuxSPTechnologyPrimaryBusType">
 			<xs:enumeration value="Electric driven pump"/>
 			<xs:enumeration value="Full electric steering gear"/>
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="AuxSPTechnology_PEV_LorryType">
-		<xs:restriction base="v2.10.2:AuxSPTechnologyLorryType">
+		<xs:restriction base="v2.4:AuxSPTechnologyLorryType">
 			<xs:enumeration value="Electric driven pump"/>
 			<xs:enumeration value="Full electric steering gear"/>
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="AuxSPTechnology_PEV_PrimaryBusType">
-		<xs:restriction base="v2.10.2:AuxSPTechnologyPrimaryBusType">
+		<xs:restriction base="v2.4:AuxSPTechnologyPrimaryBusType">
 			<xs:enumeration value="Electric driven pump"/>
 			<xs:enumeration value="Full electric steering gear"/>
 		</xs:restriction>
@@ -2628,7 +2627,7 @@
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="ChassisConfiguration">
-		<xs:union memberTypes="v2.10.2:ChassisConfigurationHeavyLorryDeclarationType v2.10.2:ChassisConfigurationMediumLorryDeclarationType v2.10.2:ChassisConfigurationPrimaryBusDeclarationType"/>
+		<xs:union memberTypes="v2.4:ChassisConfigurationHeavyLorryDeclarationType v2.4:ChassisConfigurationMediumLorryDeclarationType v2.4:ChassisConfigurationPrimaryBusDeclarationType"/>
 	</xs:simpleType>
 	<xs:simpleType name="ChassisConfigurationHeavyLorryDeclarationType">
 		<xs:annotation>
@@ -2817,7 +2816,7 @@
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="PowertrainPositionType">
-		<xs:union memberTypes="v2.10.2:PowertrainPositionDriveType v2.10.2:PowertrainPositionGENType"/>
+		<xs:union memberTypes="v2.4:PowertrainPositionDriveType v2.4:PowertrainPositionGENType"/>
 	</xs:simpleType>
 	<xs:simpleType name="PTOShaftsGearWheelsType">
 		<xs:annotation>
@@ -3042,7 +3041,7 @@
 	</xs:group>
 	<xs:group name="BusAuxHVACConventionalSequenceGroup">
 		<xs:sequence>
-			<xs:group ref="v2.10.2:BusAuxHVACHeatPumpSequenceGroup" minOccurs="0"/>
+			<xs:group ref="v2.4:BusAuxHVACHeatPumpSequenceGroup" minOccurs="0"/>
 			<xs:element name="AuxiliaryHeaterPower" minOccurs="0">
 				<xs:annotation>
 					<xs:documentation>P322 - [W]</xs:documentation>
@@ -3086,12 +3085,12 @@
 			<xs:element name="HeatPumpTypeDriverCompartment">
 				<xs:complexType>
 					<xs:sequence>
-						<xs:element name="Cooling" type="v2.10.2:HeatPumpTypeDriverCompartmentType">
+						<xs:element name="Cooling" type="v2.4:HeatPumpTypeDriverCompartmentType">
 							<xs:annotation>
 								<xs:documentation>P318 - enum</xs:documentation>
 							</xs:annotation>
 						</xs:element>
-						<xs:element name="Heating" type="v2.10.2:HeatPumpTypeDriverCompartmentType">
+						<xs:element name="Heating" type="v2.4:HeatPumpTypeDriverCompartmentType">
 							<xs:annotation>
 								<xs:documentation>P319 - enum</xs:documentation>
 							</xs:annotation>
@@ -3102,12 +3101,12 @@
 			<xs:element name="HeatPumpTypePassengerCompartment">
 				<xs:complexType>
 					<xs:sequence>
-						<xs:element name="Cooling" type="v2.10.2:HeatPumpTypePassengerCompartmentType">
+						<xs:element name="Cooling" type="v2.4:HeatPumpTypePassengerCompartmentType">
 							<xs:annotation>
 								<xs:documentation>P320 - enum</xs:documentation>
 							</xs:annotation>
 						</xs:element>
-						<xs:element name="Heating" type="v2.10.2:HeatPumpTypePassengerCompartmentType">
+						<xs:element name="Heating" type="v2.4:HeatPumpTypePassengerCompartmentType">
 							<xs:annotation>
 								<xs:documentation>P321 - enum</xs:documentation>
 							</xs:annotation>
@@ -3163,7 +3162,7 @@
 	</xs:group>
 	<xs:group name="BusAuxPneumaticSystemGen_Conventional_SequenceGroup">
 		<xs:sequence>
-			<xs:element name="SizeOfAirSupply" type="v2.10.2:PneumaticSystemTechnologyType">
+			<xs:element name="SizeOfAirSupply" type="v2.4:PneumaticSystemTechnologyType">
 				<xs:annotation>
 					<xs:documentation>P309 - enum</xs:documentation>
 				</xs:annotation>
@@ -3179,7 +3178,7 @@
 					</xs:restriction>
 				</xs:simpleType>
 			</xs:element>
-			<xs:element name="Clutch" type="v2.10.2:PneumaticSystemClutchTypeType">
+			<xs:element name="Clutch" type="v2.4:PneumaticSystemClutchTypeType">
 				<xs:annotation>
 					<xs:documentation>P311 - enum</xs:documentation>
 				</xs:annotation>
@@ -3203,7 +3202,7 @@
 	</xs:group>
 	<xs:group name="BusAuxPneumaticSystemGen_HEV-Px_SequenceGroup">
 		<xs:sequence>
-			<xs:element name="SizeOfAirSupply" type="v2.10.2:PneumaticSystemTechnologyType">
+			<xs:element name="SizeOfAirSupply" type="v2.4:PneumaticSystemTechnologyType">
 				<xs:annotation>
 					<xs:documentation>P309 - enum</xs:documentation>
 				</xs:annotation>
@@ -3219,7 +3218,7 @@
 					</xs:restriction>
 				</xs:simpleType>
 			</xs:element>
-			<xs:element name="Clutch" type="v2.10.2:PneumaticSystemClutchTypeType">
+			<xs:element name="Clutch" type="v2.4:PneumaticSystemClutchTypeType">
 				<xs:annotation>
 					<xs:documentation>P311 - enum</xs:documentation>
 				</xs:annotation>
@@ -3243,7 +3242,7 @@
 	</xs:group>
 	<xs:group name="BusAuxPneumaticSystemGen_HEV-S_SequenceGroup">
 		<xs:sequence>
-			<xs:element name="SizeOfAirSupply" type="v2.10.2:PneumaticSystemTechnologyType">
+			<xs:element name="SizeOfAirSupply" type="v2.4:PneumaticSystemTechnologyType">
 				<xs:annotation>
 					<xs:documentation>P309 - enum</xs:documentation>
 				</xs:annotation>
@@ -3259,7 +3258,7 @@
 					</xs:restriction>
 				</xs:simpleType>
 			</xs:element>
-			<xs:element name="Clutch" type="v2.10.2:PneumaticSystemClutchTypeType">
+			<xs:element name="Clutch" type="v2.4:PneumaticSystemClutchTypeType">
 				<xs:annotation>
 					<xs:documentation>P311 - enum</xs:documentation>
 				</xs:annotation>
@@ -3306,7 +3305,7 @@
 	</xs:group>
 	<xs:group name="BusAuxPneumaticSystemGroup_HEV-S">
 		<xs:sequence>
-			<xs:element name="SizeOfAirSupply" type="v2.10.2:PneumaticSystemTechnologyType">
+			<xs:element name="SizeOfAirSupply" type="v2.4:PneumaticSystemTechnologyType">
 				<xs:annotation>
 					<xs:documentation>P309 - enum</xs:documentation>
 				</xs:annotation>
@@ -3322,7 +3321,7 @@
 					</xs:restriction>
 				</xs:simpleType>
 			</xs:element>
-			<xs:element name="Clutch" type="v2.10.2:PneumaticSystemClutchTypeType">
+			<xs:element name="Clutch" type="v2.4:PneumaticSystemClutchTypeType">
 				<xs:annotation>
 					<xs:documentation>P311 - enum</xs:documentation>
 				</xs:annotation>
@@ -3363,17 +3362,17 @@
 	<xs:group name="Components_HEV-IEPC-S_GenSetSequenceGroup">
 		<xs:sequence>
 			<xs:element name="Engine" type="v2.0:EngineComponentDeclarationType"/>
-			<xs:element name="ElectricMachineGEN" type="v2.10.2:ElectricMachineGENType"/>
-			<xs:element name="ElectricEnergyStorage" type="v2.10.2:ElectricEnergyStorageType"/>
-			<xs:element name="IEPC" type="v2.10.1:IEPCComponentDeclarationType"/>
+			<xs:element name="ElectricMachineGEN" type="v2.4:ElectricMachineGENType"/>
+			<xs:element name="ElectricEnergyStorage" type="v2.4:ElectricEnergyStorageType"/>
+			<xs:element name="IEPC" type="v2.3:IEPCComponentDeclarationType"/>
 		</xs:sequence>
 	</xs:group>
 	<xs:group name="Components_HEV-Sx_GenSetSequenceGroup">
 		<xs:sequence>
 			<xs:element name="Engine" type="v2.0:EngineComponentDeclarationType"/>
-			<xs:element name="ElectricMachineGEN" type="v2.10.2:ElectricMachineGENType"/>
-			<xs:element name="ElectricEnergyStorage" type="v2.10.2:ElectricEnergyStorageType"/>
-			<xs:element name="ElectricMachine" type="v2.10.2:ElectricMachineType"/>
+			<xs:element name="ElectricMachineGEN" type="v2.4:ElectricMachineGENType"/>
+			<xs:element name="ElectricEnergyStorage" type="v2.4:ElectricEnergyStorageType"/>
+			<xs:element name="ElectricMachine" type="v2.4:ElectricMachineType"/>
 		</xs:sequence>
 	</xs:group>
 	<xs:group name="Vehicle_ChassisLorryParametersSequenceGroup">
@@ -3392,17 +3391,17 @@
 	</xs:group>
 	<xs:group name="Vehicle_ChassisPrimaryBusParametersSequenceGroup">
 		<xs:sequence>
-			<xs:element name="LegislativeCategory" type="v2.10.2:LegislativeCategoryPrimaryBusDeclarationType">
+			<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.10.2:ChassisConfigurationPrimaryBusDeclarationType">
+			<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.10.2:AxleConfigurationPrimaryBusLorryDeclarationType">
+			<xs:element name="AxleConfiguration" type="v2.4:AxleConfigurationPrimaryBusLorryDeclarationType">
 				<xs:annotation>
 					<xs:documentation>P037 - enum</xs:documentation>
 				</xs:annotation>
@@ -3421,22 +3420,22 @@
 	</xs:group>
 	<xs:group name="Vehicle_CompletedBus_DimensionsSequenceGroup">
 		<xs:sequence>
-			<xs:element name="HeightIntegratedBody" type="v2.10.2:VehicleDimensionType">
+			<xs:element name="HeightIntegratedBody" type="v2.4:VehicleDimensionType">
 				<xs:annotation>
 					<xs:documentation>P287 - [mm]</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="VehicleLength" type="v2.10.2:VehicleDimensionType">
+			<xs:element name="VehicleLength" type="v2.4:VehicleDimensionType">
 				<xs:annotation>
 					<xs:documentation>P288 - [mm]</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="VehicleWidth" type="v2.10.2:VehicleDimensionType">
+			<xs:element name="VehicleWidth" type="v2.4:VehicleDimensionType">
 				<xs:annotation>
 					<xs:documentation>P289 - [mm]</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="EntranceHeight" type="v2.10.2:VehicleDimensionType">
+			<xs:element name="EntranceHeight" type="v2.4:VehicleDimensionType">
 				<xs:annotation>
 					<xs:documentation>P290 - [mm]</xs:documentation>
 				</xs:annotation>
@@ -3469,22 +3468,22 @@
 	</xs:group>
 	<xs:group name="Vehicle_CompletedBus_PassengerCountSequenceGroup">
 		<xs:sequence>
-			<xs:element name="NumberPassengerSeatsLowerDeck" type="v2.10.2:PassengerCountType">
+			<xs:element name="NumberPassengerSeatsLowerDeck" type="v2.4:PassengerCountType">
 				<xs:annotation>
 					<xs:documentation>P283 - [-]</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="NumberPassengersStandingLowerDeck" type="v2.10.2:PassengerCountType">
+			<xs:element name="NumberPassengersStandingLowerDeck" type="v2.4:PassengerCountType">
 				<xs:annotation>
 					<xs:documentation>P354 - [-]</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="NumberPassengerSeatsUpperDeck" type="v2.10.2:PassengerCountType">
+			<xs:element name="NumberPassengerSeatsUpperDeck" type="v2.4:PassengerCountType">
 				<xs:annotation>
 					<xs:documentation>P284 - [-]</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="NumberPassengersStandingUpperDeck" type="v2.10.2:PassengerCountType">
+			<xs:element name="NumberPassengersStandingUpperDeck" type="v2.4:PassengerCountType">
 				<xs:annotation>
 					<xs:documentation>P355 - [-]</xs:documentation>
 				</xs:annotation>
@@ -3498,7 +3497,7 @@
 					<xs:documentation>P236 - [-]</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="LegislativeCategory" type="v2.10.2:LegislativeCategoryPrimaryBusDeclarationType" minOccurs="0">
+			<xs:element name="LegislativeCategory" type="v2.4:LegislativeCategoryPrimaryBusDeclarationType" minOccurs="0">
 				<xs:annotation>
 					<xs:documentation>P251 - enum</xs:documentation>
 				</xs:annotation>
@@ -3524,7 +3523,7 @@
 					</xs:appinfo>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="ClassBus" type="v2.10.2:RegisteredClassType" minOccurs="0">
+			<xs:element name="ClassBus" type="v2.4:RegisteredClassType" minOccurs="0">
 				<xs:annotation>
 					<xs:documentation>P282 - enum</xs:documentation>
 				</xs:annotation>
@@ -3562,34 +3561,34 @@
 	</xs:group>
 	<xs:group name="Vehicle_HeavyLorryParametersSequenceGroup_1">
 		<xs:sequence>
-			<xs:group ref="v2.10.2:Vehicle_GeneralParametersSequenceGroup"/>
-			<xs:element name="LegislativeCategory" type="v2.10.2:LegislativeCategoryHeavyLorryDeclarationType">
+			<xs:group ref="v2.4:Vehicle_GeneralParametersSequenceGroup"/>
+			<xs:element name="LegislativeCategory" type="v2.4:LegislativeCategoryHeavyLorryDeclarationType">
 				<xs:annotation>
 					<xs:documentation>P251 - enum</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="ChassisConfiguration" type="v2.10.2:ChassisConfigurationHeavyLorryDeclarationType">
+			<xs:element name="ChassisConfiguration" type="v2.4:ChassisConfigurationHeavyLorryDeclarationType">
 				<xs:annotation>
 					<xs:documentation>P036 - enum</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="AxleConfiguration" type="v2.10.2:AxleConfigurationHeavyLorryDeclarationType">
+			<xs:element name="AxleConfiguration" type="v2.4:AxleConfigurationHeavyLorryDeclarationType">
 				<xs:annotation>
 					<xs:documentation>P037 - enum</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:group ref="v2.10.2:Vehicle_ChassisLorryParametersSequenceGroup"/>
+			<xs:group ref="v2.4:Vehicle_ChassisLorryParametersSequenceGroup"/>
 		</xs:sequence>
 	</xs:group>
 	<xs:group name="Vehicle_HeavyLorryParametersSequenceGroup_2">
 		<xs:sequence>
-			<xs:group ref="v2.10.2:Vehicle_RetarderSequenceGroup"/>
+			<xs:group ref="v2.4:Vehicle_RetarderSequenceGroup"/>
 			<xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
 				<xs:annotation>
 					<xs:documentation>P180 - enum</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="PTO" type="v2.10.2:AbstractPTODataType"/>
+			<xs:element name="PTO" type="v2.4:AbstractPTODataType"/>
 			<xs:element name="ZeroEmissionVehicle" type="xs:boolean">
 				<xs:annotation>
 					<xs:documentation>P269 - bool</xs:documentation>
@@ -3610,7 +3609,7 @@
 					<xs:documentation>P276 - bool</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="VehicleTypeApprovalNumber" type="v2.10.2:VehicleTypeApprovalNumberType" minOccurs="0">
+			<xs:element name="VehicleTypeApprovalNumber" type="v2.4:VehicleTypeApprovalNumberType" minOccurs="0">
 				<xs:annotation>
 					<xs:documentation>P352 - [-]</xs:documentation>
 				</xs:annotation>
@@ -3619,13 +3618,13 @@
 	</xs:group>
 	<xs:group name="Vehicle_HeavyLorryPEVParametersSequenceGroup_2">
 		<xs:sequence>
-			<xs:group ref="v2.10.2:Vehicle_RetarderSequenceGroup"/>
+			<xs:group ref="v2.4:Vehicle_RetarderSequenceGroup"/>
 			<xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
 				<xs:annotation>
 					<xs:documentation>P180 - enum</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="PTO" type="v2.10.2:AbstractPTODataType"/>
+			<xs:element name="PTO" type="v2.4:AbstractPTODataType"/>
 			<xs:element name="ZeroEmissionVehicle" type="xs:boolean">
 				<xs:annotation>
 					<xs:documentation>P269 - bool</xs:documentation>
@@ -3641,7 +3640,7 @@
 					<xs:documentation>P276 - bool</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="VehicleTypeApprovalNumber" type="v2.10.2:VehicleTypeApprovalNumberType" minOccurs="0">
+			<xs:element name="VehicleTypeApprovalNumber" type="v2.4:VehicleTypeApprovalNumberType" minOccurs="0">
 				<xs:annotation>
 					<xs:documentation>P352 - [-]</xs:documentation>
 				</xs:annotation>
@@ -3650,23 +3649,23 @@
 	</xs:group>
 	<xs:group name="Vehicle_MediumLorryParametersSequenceGroup_1">
 		<xs:sequence>
-			<xs:group ref="v2.10.2:Vehicle_GeneralParametersSequenceGroup"/>
-			<xs:element name="LegislativeCategory" type="v2.10.2:LegislativeCategoryMediumLorryDeclarationType">
+			<xs:group ref="v2.4:Vehicle_GeneralParametersSequenceGroup"/>
+			<xs:element name="LegislativeCategory" type="v2.4:LegislativeCategoryMediumLorryDeclarationType">
 				<xs:annotation>
 					<xs:documentation>P251 - enum</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="ChassisConfiguration" type="v2.10.2:ChassisConfigurationMediumLorryDeclarationType">
+			<xs:element name="ChassisConfiguration" type="v2.4:ChassisConfigurationMediumLorryDeclarationType">
 				<xs:annotation>
 					<xs:documentation>P036 - enum</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="AxleConfiguration" type="v2.10.2:AxleConfigurationMediumLorryDeclarationType">
+			<xs:element name="AxleConfiguration" type="v2.4:AxleConfigurationMediumLorryDeclarationType">
 				<xs:annotation>
 					<xs:documentation>P037 - enum</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:group ref="v2.10.2:Vehicle_ChassisLorryParametersSequenceGroup"/>
+			<xs:group ref="v2.4:Vehicle_ChassisLorryParametersSequenceGroup"/>
 		</xs:sequence>
 	</xs:group>
 	<xs:group name="Vehicle_MediumLorryParametersSequenceGroup_2">
@@ -3681,7 +3680,7 @@
 					</xs:restriction>
 				</xs:simpleType>
 			</xs:element>
-			<xs:group ref="v2.10.2:Vehicle_RetarderSequenceGroup"/>
+			<xs:group ref="v2.4:Vehicle_RetarderSequenceGroup"/>
 			<xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
 				<xs:annotation>
 					<xs:documentation>P180 - enum</xs:documentation>
@@ -3697,7 +3696,7 @@
 					<xs:documentation>P275 - enum</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="VehicleTypeApprovalNumber" type="v2.10.2:VehicleTypeApprovalNumberType" minOccurs="0">
+			<xs:element name="VehicleTypeApprovalNumber" type="v2.4:VehicleTypeApprovalNumberType" minOccurs="0">
 				<xs:annotation>
 					<xs:documentation>P352 - [-]</xs:documentation>
 				</xs:annotation>
@@ -3716,7 +3715,7 @@
 					</xs:restriction>
 				</xs:simpleType>
 			</xs:element>
-			<xs:group ref="v2.10.2:Vehicle_RetarderSequenceGroup"/>
+			<xs:group ref="v2.4:Vehicle_RetarderSequenceGroup"/>
 			<xs:element name="AngledriveType" type="v1.0:AngledriveTypeType">
 				<xs:annotation>
 					<xs:documentation>P180 - enum</xs:documentation>
@@ -3727,7 +3726,7 @@
 					<xs:documentation>P269 - bool</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="VehicleTypeApprovalNumber" type="v2.10.2:VehicleTypeApprovalNumberType" minOccurs="0">
+			<xs:element name="VehicleTypeApprovalNumber" type="v2.4:VehicleTypeApprovalNumberType" minOccurs="0">
 				<xs:annotation>
 					<xs:documentation>P352 - [-]</xs:documentation>
 				</xs:annotation>
@@ -3736,8 +3735,8 @@
 	</xs:group>
 	<xs:group name="Vehicle_PrimaryBusParametersSequenceGroup">
 		<xs:sequence>
-			<xs:group ref="v2.10.2:Vehicle_GeneralParametersSequenceGroup"/>
-			<xs:group ref="v2.10.2:Vehicle_ChassisPrimaryBusParametersSequenceGroup"/>
+			<xs:group ref="v2.4:Vehicle_GeneralParametersSequenceGroup"/>
+			<xs:group ref="v2.4:Vehicle_ChassisPrimaryBusParametersSequenceGroup"/>
 		</xs:sequence>
 	</xs:group>
 	<xs:group name="Vehicle_RetarderSequenceGroup">
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
index 768be785d5..ffc8be13bd 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
@@ -10,9 +10,6 @@
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" schemaLocation="VectoDeclarationDefinitions.2.1.xsd"/>
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" schemaLocation="VectoDeclarationDefinitions.2.2.xsd"/>
-	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3_DEV.xsd"/>
-<!--	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" schemaLocation="VectoDeclarationDefinitions.2.6_Buses.xsd"/>
-	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" schemaLocation="VectoDeclarationDefinitions.2.8_Stage.xsd"/>-->
-	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" schemaLocation="VectoDeclarationDefinitions.2.10.1_xEV_Components.xsd"/>
-	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" schemaLocation="VectoDeclarationDefinitions.2.10.2_JobInputData.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:schema>
diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp
index 5e68b4e88b..d8c324aac6 100644
--- a/VectoCore/VectoXML.spp
+++ b/VectoCore/VectoXML.spp
@@ -460,17 +460,14 @@
 		<Folder FolderName="Declaration">
 			<File FilePath="VectoCore\Resources\XSD\VectoComponent.1.0.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VectoComponent.2.0.xsd" HomeFolder="Yes"/>
-			<File FilePath="VectoCore\Resources\XSD\VectoComponent.2.10.xsd" HomeFolder="Yes"/>
+			<File FilePath="VectoCore\Resources\XSD\VectoComponent.2.1.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VectoDeclarationComponent.xsd" HomeFolder="Yes"/>
-			<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.0.6.xsd" HomeFolder="Yes"/>
-			<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.0.8.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.1.0.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.0.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.1.xsd" HomeFolder="Yes"/>
-			<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.10.1_xEV_Components.xsd" HomeFolder="Yes"/>
-			<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.10.2_JobInputData.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.2.xsd" HomeFolder="Yes"/>
-			<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.3_DEV.xsd" HomeFolder="Yes"/>
+			<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.3.xsd" HomeFolder="Yes"/>
+			<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.4.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VectoDeclarationJob.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VectoInput.1.0.xsd" HomeFolder="Yes"/>
-- 
GitLab