diff --git a/VectoCommon/VectoCommon/Hashing/VectoComponents.cs b/VectoCommon/VectoCommon/Hashing/VectoComponents.cs
index ee2dbfd3c3dc35949d72a9b485ab0ca2690255f9..241e40be9fecf6b8d99ef37616970ecc005b1ce8 100644
--- a/VectoCommon/VectoCommon/Hashing/VectoComponents.cs
+++ b/VectoCommon/VectoCommon/Hashing/VectoComponents.cs
@@ -46,7 +46,15 @@ namespace TUGraz.VectoCommon.Hashing
 		Tyre,
 		Vehicle,
 		VectoOutput,
-		VectoCustomerInformation
+		VectoCustomerInformation,
+		VectoPrimaryVehicleInformation,
+		VectoManufacturingStage,
+		BatterySystem,
+		CapacitorSystem,
+		ElectricMachineSystem,
+		IEPC,
+		ADC,
+		REESS
 	}
 
 	public static class VectoComponentsExtensionMethods
@@ -76,6 +84,22 @@ namespace TUGraz.VectoCommon.Hashing
 					return "VectoOutput";
 				case VectoComponents.VectoCustomerInformation:
 					return "VectoCustomerInformation";
+				case VectoComponents.VectoPrimaryVehicleInformation:
+					return "PrimaryVehicle";
+				case VectoComponents.VectoManufacturingStage:
+					return "ManufacturingStage";
+				case VectoComponents.BatterySystem:
+					return XMLNames.Component_BatterySystem;
+				case VectoComponents.CapacitorSystem:
+					return XMLNames.Component_CapacitorSystem;
+				case VectoComponents.ElectricMachineSystem:
+					return XMLNames.Component_ElectricMachineSystem;
+				case VectoComponents.IEPC:
+					return XMLNames.Component_IEPC;
+				case VectoComponents.ADC:
+					return XMLNames.Component_ADC;
+				case VectoComponents.REESS:
+					return XMLNames.REESS;
 				default:
 					throw new ArgumentOutOfRangeException("VectoComponents", component, null);
 			}
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
index 9cf220d97ebc9be596459d1e1123e698ef1aaa56..385979fd8da9c379b8b350f304ad838022c6c950 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
@@ -402,6 +402,15 @@ namespace TUGraz.VectoCommon.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to ADC.
+        /// </summary>
+        public static string Component_ADC {
+            get {
+                return ResourceManager.GetString("Component_ADC", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to AirDrag.
         /// </summary>
@@ -456,6 +465,24 @@ namespace TUGraz.VectoCommon.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to BatterySystem.
+        /// </summary>
+        public static string Component_BatterySystem {
+            get {
+                return ResourceManager.GetString("Component_BatterySystem", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to CapacitorSystem.
+        /// </summary>
+        public static string Component_CapacitorSystem {
+            get {
+                return ResourceManager.GetString("Component_CapacitorSystem", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to CertificationMethod.
         /// </summary>
@@ -501,6 +528,15 @@ namespace TUGraz.VectoCommon.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to ElectricMachineSystem.
+        /// </summary>
+        public static string Component_ElectricMachineSystem {
+            get {
+                return ResourceManager.GetString("Component_ElectricMachineSystem", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Engine.
         /// </summary>
@@ -537,6 +573,15 @@ namespace TUGraz.VectoCommon.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to IEPC.
+        /// </summary>
+        public static string Component_IEPC {
+            get {
+                return ResourceManager.GetString("Component_IEPC", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Manufacturer.
         /// </summary>
@@ -1428,6 +1473,15 @@ namespace TUGraz.VectoCommon.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to REESS.
+        /// </summary>
+        public static string REESS {
+            get {
+                return ResourceManager.GetString("REESS", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to CdxA.
         /// </summary>
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx
index 56aa349d8a1c81c4fdf8cfb00af577c5aac57604..2f8334f99b9891d32a42093efba35c2ea9b0b433 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.resx
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx
@@ -1065,4 +1065,22 @@
 <data name="DriverModel_Overspeed_Enabled" xml:space="preserve">
 	<value>Enabled</value>
 </data>
+<data name="Component_BatterySystem" xml:space="preserve">
+    <value>BatterySystem</value>
+  </data>
+<data name="Component_CapacitorSystem" xml:space="preserve">
+    <value>CapacitorSystem</value>
+  </data>
+<data name="Component_ElectricMachineSystem" xml:space="preserve">
+    <value>ElectricMachineSystem</value>
+  </data>
+<data name="Component_IEPC" xml:space="preserve">
+    <value>IEPC</value>
+  </data>
+<data name="Component_ADC" xml:space="preserve">
+    <value>ADC</value>
+  </data>
+<data name="REESS" xml:space="preserve">
+    <value>REESS</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashing/Resources/XSLT/SortInputData.xslt b/VectoCommon/VectoHashing/Resources/XSLT/SortInputData.xslt
index e4fa358efb2f40844edde01282401ea067bb1361..9d88bbe778118d45893712bc0916d7c8a7aa579f 100644
--- a/VectoCommon/VectoHashing/Resources/XSLT/SortInputData.xslt
+++ b/VectoCommon/VectoHashing/Resources/XSLT/SortInputData.xslt
@@ -13,11 +13,26 @@
       - normalize the whitespaces of all attribute values and text nodes
          leading and trailing whitespaces are removed
          multiple whitespaces are replaced by a single whitespace
-      - sort entries in fuelconsumption map and loss-maps (i.e, transmission, axlegear, angledrive)
-      - sort entries of torque converter characteristics
-      - sort torque limiation entries 
-      - sort gears
-      - sort axles
+      - sort entries of FuelConsumptionMap and loss-maps (i.e, transmission, axlegear, angledrive)
+	  - sort entries of FullLoadAndDragCurve	
+	  - sort entries of TorqueLossMap
+      - sort entries of RetarderLossMap
+	  - sort entries of TorqueLimits
+	  - sort Gears 
+      - sort entries of Characteristics
+      - sort Axles 
+	  - sort entries of MaxTorqueCurve
+	  - sort entries of DragCurve
+	  - sort entries of Conditioning
+	  - sort entries of PowerMap
+	  - sort VoltageLevels by Voltage value
+	  - sort DragCurve by gear attribute value
+	  - sort Fuel by type attribute value
+	  - sort Mode by numbers of child Fuels
+      - sort entries of ApplicableVehicleGroups 
+	  - sort entries of OCV
+      - sort entries of InternalResistance
+	  - sort entries of CurrentLimits
 -->	<xsl:output omit-xml-declaration="no" indent="yes"/>
 	<xsl:template match="*">
 		<xsl:element name="{local-name()}">
@@ -105,4 +120,197 @@
 			</xsl:for-each>
 		</xsl:element>
 	</xsl:template>
+	<xsl:template match="*[local-name()='MaxTorqueCurve']">
+		<xsl:element name="{local-name()}">
+			<xsl:apply-templates select="@*"/>
+			<xsl:for-each select="*">
+				<xsl:sort data-type="number" select="@outShaftSpeed" order="ascending"/>
+				<xsl:sort data-type="number" select="@maxTorque" order="ascending"/>
+				<xsl:apply-templates select="."/>
+			</xsl:for-each>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template name="DragCurveTemplate" match="*[local-name()='DragCurve']">
+		<xsl:element name="{local-name()}">
+			<xsl:apply-templates select="@*"/>
+			<xsl:for-each select="*">
+				<xsl:sort data-type="number" select="@outShaftSpeed" order="ascending"/>
+				<xsl:apply-templates select="."/>
+			</xsl:for-each>
+		</xsl:element>
+	</xsl:template>		
+	<xsl:template match="*[local-name()='Conditioning']">
+		<xsl:element name="{local-name()}">
+			<xsl:apply-templates select="@*"/>
+			<xsl:for-each select="*">
+				<xsl:sort data-type="number" select="@coolantTempInlet" order="ascending"/>
+				<xsl:sort data-type="number" select="@coolingPower" order="ascending"/>
+				<xsl:apply-templates select="."/>
+			</xsl:for-each>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template name="PowerMapTemplate" match="*[local-name()='PowerMap']">
+		<xsl:element name="{local-name()}">
+			<xsl:apply-templates select="@*"/>
+			<xsl:for-each select="*">
+				<xsl:sort data-type="number" select="@outShaftSpeed" order="ascending"/>
+				<xsl:sort data-type="number" select="@torque" order="ascending"/>
+				<xsl:apply-templates select="."/>
+			</xsl:for-each>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name()='OCV']">
+		<xsl:element name="{local-name()}">
+			<xsl:apply-templates select="@*"/>
+			<xsl:for-each select="*">
+				<xsl:sort data-type="number" select="@SoC" order="ascending"/>
+				<xsl:apply-templates select="."/>
+			</xsl:for-each>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name()='CurrentLimits']">
+		<xsl:element name="{local-name()}">
+			<xsl:apply-templates select="@*"/>
+			<xsl:for-each select="*">
+				<xsl:sort data-type="number" select="@SoC" order="ascending"/>
+				<xsl:sort data-type="number" select="@maxChargingCurrent" order="ascending"/>
+				<xsl:apply-templates select="."/>
+			</xsl:for-each>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name()='ApplicableVehicleGroups']">
+		<xsl:element name="{local-name()}">
+			<xsl:for-each select="*[local-name()='ApplicableVehicleGroup']">
+				<xsl:sort data-type="text" select="text()" order="ascending"/>
+					<xsl:apply-templates select="."/>
+			</xsl:for-each>
+		</xsl:element>	
+	</xsl:template>	
+		
+	<!-- Sorts InternalResistance entries at BattterySystem component, -->
+	<!-- or create the InternalResistance element at CapacitorSystem component -->
+	<xsl:template match="*[local-name()='InternalResistance']">
+		<xsl:choose>
+			<xsl:when test="*">	
+				<xsl:element name="{local-name()}">
+					<xsl:apply-templates select="@*"/>
+					<xsl:for-each select="*">
+						<xsl:sort data-type="number" select="@SoC" order="ascending"/>
+						<xsl:sort data-type="number" select="@R_2" order="ascending"/>
+						<xsl:sort data-type="number" select="@R_10" order="ascending"/>
+						<xsl:sort data-type="number" select="@R_20" order="ascending"/>
+						<xsl:apply-templates select="."/>
+					</xsl:for-each>
+				</xsl:element>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:element name="{local-name()}">
+					<xsl:apply-templates select="@*|node()"/> 
+				</xsl:element>
+			</xsl:otherwise>		
+		</xsl:choose>
+	</xsl:template>		
+	
+	<!-- Sorts PowerMap, which has a attribute gear and sorts them by the gear number in ascending order -->
+	<!-- For the components EM-IHPC and IEPC -->
+	<xsl:template match="*[local-name()='PowerMap' and @gear]">
+		<xsl:if test="count(preceding-sibling::*[local-name()='PowerMap']) = 0">
+			<xsl:for-each select="../*[local-name()='PowerMap']">
+				<xsl:sort data-type="number" select="@gear" order="ascending"/>
+				<xsl:call-template name="PowerMapTemplate"/>
+			</xsl:for-each>
+		</xsl:if>	
+	</xsl:template>	
+	
+	<!-- Sorts VoltageLevel, which has a child element Voltage and sorts them by this value in ascending order -->
+	<!-- For the components EM, EM-IHPC and IEPC-->
+	<xsl:template match="*[local-name()='VoltageLevel' and ./*[local-name()='Voltage']]">		
+		<xsl:if test="count(preceding-sibling::*[local-name()='VoltageLevel']) = 0">
+			<xsl:for-each select="../*[local-name()='VoltageLevel']">
+				<xsl:sort data-type="number" select="./*[local-name() = 'Voltage']/text()" order="ascending"/>			
+				<xsl:element name="{local-name()}">
+					<xsl:apply-templates select="*"/> 	
+				</xsl:element>
+			</xsl:for-each>			
+		</xsl:if>				
+	</xsl:template>
+	
+	<!-- Sorts DragCurve, which has a attribute gear and sorts them by the gear number in ascending order -->
+	<!-- For the components EM IHPC and IEPC -->
+	<xsl:template match="*[local-name()='DragCurve' and @gear]">
+		<xsl:if test="count(preceding-sibling::*[local-name()='DragCurve']) = 0">	
+			<xsl:for-each select="../*[local-name()='DragCurve']">
+				<xsl:sort data-type="number" select="@gear" order="ascending"/>
+				<xsl:call-template name="DragCurveTemplate"/>
+			</xsl:for-each>
+		</xsl:if>
+	</xsl:template>
+	
+	<!-- Sorts Fuel, which has a attribute type and sorts them by type string in ascending order-->
+	<!-- For the Engine component -->
+	<xsl:template match="*[local-name()='Fuel' and @type]">
+		<xsl:if test="count(preceding-sibling::*[local-name()='Fuel']) = 0">	
+			<xsl:for-each select="../*[local-name()='Fuel']">
+				<xsl:sort data-type="text" select="@type" order="ascending"/>
+				<xsl:element name="{local-name()}">
+					<xsl:apply-templates select="@*|node()"/> 
+				</xsl:element>
+			</xsl:for-each>
+		</xsl:if>
+	</xsl:template>
+	
+	<!-- Sorts Mode, which has a child element Fuel and sorts by the number of Fuel child elements in ascending order-->
+	<!-- For the Engine component-->
+	<xsl:template match="*[local-name()='Mode' and ./*[local-name()='Fuel']]">
+		<xsl:if test="count(preceding-sibling::*[local-name()='Mode']) = 0">
+			<xsl:for-each select="../*[local-name()='Mode']">
+				<xsl:sort data-type="number" select="count(./*[local-name() = 'Fuel'])" order="ascending"/>
+					<xsl:element name="{local-name()}">
+						<xsl:apply-templates select="@*|node()"/>
+					</xsl:element>
+			</xsl:for-each>
+		</xsl:if>
+	</xsl:template> 
+	
+	<!-- Sorting for Job files -->
+		
+	<!-- ElectricEnergyStorage -->
+	<xsl:template match="*[local-name()='Battery' and ./*[local-name()='StringID']]">
+		<xsl:if test="count(preceding-sibling::*[local-name()='Battery']) = 0">
+			<xsl:for-each select="../*[local-name()='Battery']">
+				<xsl:sort data-type="number" select="./*[local-name() = 'StringID']/text()" order="ascending"/>				
+				<xsl:sort data-type="text" select="./*[local-name() = 'REESS']/*[local-name() = 'Data']/@id" order="ascending"/>				
+				<xsl:element name="{local-name()}">
+					<xsl:apply-templates select="*"/> 	
+				</xsl:element>
+			</xsl:for-each>
+		</xsl:if>
+	</xsl:template>
+			
+	<!-- ElectricMotorTorqueLimits -->	
+	<xsl:template match="*[local-name()='ElectricMachine' and ./*[local-name()='Position']]">		
+		<xsl:if test="count(preceding-sibling::*[local-name()='ElectricMachine']) = 0">
+			<xsl:for-each select="../*[local-name()='ElectricMachine']">
+				<xsl:sort data-type="text" select="./*[local-name() = 'Position']/text()" order="ascending"/>			
+				<xsl:element name="{local-name()}">
+					<xsl:apply-templates select="*"/> 	
+				</xsl:element>
+			</xsl:for-each>			
+		</xsl:if>				
+	</xsl:template>	
+	
+	<!-- AUX SteeringPump -->
+	<xsl:template match="*[local-name()='SteeringPump']">
+		<xsl:element name="{local-name()}">
+			<xsl:apply-templates select="@*"/>
+			<xsl:for-each select="*">
+				<xsl:sort data-type="number" select="@axleNumber" order="ascending"/>
+				<xsl:apply-templates select="."/>
+			</xsl:for-each>
+		</xsl:element>
+	</xsl:template>	
+	
+
+	
+
 </xsl:transform>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ADC.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ADC.xml
index 88ede23f780d333fecba8b39dcf45665e7d2e1da..5142f0fa5502b515c59299961ebfb2e39391501b 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ADC.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ADC.xml
@@ -1 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
    <tns:ADC>
        <Data xsi:type="ADCDataDeclarationType" id="ADC-123">
            <Manufacturer>Generic Vendor</Manufacturer>
            <Model>ADC 20</Model>
            <CertificationNumber>ADC-20-CERT</CertificationNumber>
            <Date>2021-11-18T14:09:17.2810263Z</Date>
            <AppVersion>VectoCore</AppVersion>
            <Ratio>0.035</Ratio>
            <CertificationMethod>Option 1</CertificationMethod>
            <TorqueLossMap>
                <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00" />
                <Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00" />
                <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
                <Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00" />
                <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00" />
				<Entry inputSpeed="4000.00" inputTorque="-60000.00" torqueLoss="2000.00" />
				<Entry inputSpeed="4000.00" inputTorque="-680.00" torqueLoss="31.00" />
				<Entry inputSpeed="4000.00" inputTorque="0.00" torqueLoss="31.00" />
				<Entry inputSpeed="4000.00" inputTorque="680.00" torqueLoss="31.00" />
				<Entry inputSpeed="4000.00" inputTorque="60000.00" torqueLoss="2000.00" />
                <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
                <Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00" />
                <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00" />
                <Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00" />
                <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
            </TorqueLossMap>
        </Data>
        <v2.3:Signature>
            <di:Reference URI="#ADC-123">
                <di:Transforms>
                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                </di:Transforms>
                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
                <di:DigestValue>HWRjRcjJ/S1JBoUv+xjhWQDAsRn5c7D4LbwB04yyxrQ=</di:DigestValue>
            </di:Reference>
        </v2.3:Signature>
    </tns:ADC>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+	<tns:ADC>
+		<Data xsi:type="ADCDataDeclarationType" id="ADC-123">
+			<Manufacturer>Generic Vendor</Manufacturer>
+			<Model>ADC 20</Model>
+			<CertificationNumber>ADC-20-CERT</CertificationNumber>
+			<Date>2021-11-18T14:09:17.2810263Z</Date>
+			<AppVersion>VectoCore</AppVersion>
+			<Ratio>0.035</Ratio>
+			<CertificationMethod>Option 1</CertificationMethod>
+			<TorqueLossMap>
+				<Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+				<Entry inputSpeed="0.00" inputTorque="-125.00" torqueLoss="5.00"/>
+				<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
+				<Entry inputSpeed="0.00" inputTorque="125.00" torqueLoss="5.00"/>
+				<Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+				<Entry inputSpeed="4000.00" inputTorque="-60000.00" torqueLoss="2000.00"/>
+				<Entry inputSpeed="4000.00" inputTorque="-680.00" torqueLoss="31.00"/>
+				<Entry inputSpeed="4000.00" inputTorque="0.00" torqueLoss="31.00"/>
+				<Entry inputSpeed="4000.00" inputTorque="680.00" torqueLoss="31.00"/>
+				<Entry inputSpeed="4000.00" inputTorque="60000.00" torqueLoss="2000.00"/>
+				<Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="2000.00"/>
+				<Entry inputSpeed="5000.00" inputTorque="-780.00" torqueLoss="31.00"/>
+				<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="31.00"/>
+				<Entry inputSpeed="5000.00" inputTorque="780.00" torqueLoss="31.00"/>
+				<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00"/>
+			</TorqueLossMap>
+		</Data>
+		<v2.3:Signature>
+			<di:Reference URI="#ADC-123">
+				<di:Transforms>
+					<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+					<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+				</di:Transforms>
+				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+				<di:DigestValue>HWRjRcjJ/S1JBoUv+xjhWQDAsRn5c7D4LbwB04yyxrQ=</di:DigestValue>
+			</di:Reference>
+		</v2.3:Signature>
+	</tns:ADC>
+</tns:VectoInputDeclaration>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Angledrive.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Angledrive.xml
index 4315e83063dd57de4e7c724473c0c69ad585adcc..96bb94f5bcf6059820a84daa6a62e1c2e3a40ff9 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Angledrive.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Angledrive.xml
@@ -1 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
    <tns:Angledrive>
        <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AngledriveDataDeclarationType" id="ANGL-asdf">           
         <Manufacturer>Generic Vendor</Manufacturer>
         <Model>Generic Model</Model>
         <CertificationNumber>ANGL-1234</CertificationNumber>
         <Date>2021-11-18T14:09:17.2810263Z</Date>
         <AppVersion>aaaaa</AppVersion>
         <Ratio>1.123</Ratio>
         <CertificationMethod>Option 1</CertificationMethod>
		<TorqueLossMap>
			<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00" />
			<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00" />
			<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00" />
			<Entry inputSpeed="800.00" inputTorque="-1200.00" torqueLoss="100.00" />
			<Entry inputSpeed="800.00" inputTorque="0.00" torqueLoss="10.00" />
			<Entry inputSpeed="800.00" inputTorque="1200.00" torqueLoss="100.00" />
			<Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00" />
			<Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00" />
			<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00" />
		</TorqueLossMap>
        </v2.0:Data>
        <v2.0:Signature>
            <di:Reference URI="#ANGL-asdf">
                <di:Transforms>
                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                </di:Transforms>
                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
                <di:DigestValue>lFLmCC4J39gaYU+VNw4q6ScyWOBzKoeVqmQ8/mQizBQ=</di:DigestValue>
            </di:Reference>
        </v2.0:Signature>
    </tns:Angledrive>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+	<tns:Angledrive>
+		<v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AngledriveDataDeclarationType" id="ANGL-asdf">
+			<Manufacturer>Generic Vendor</Manufacturer>
+			<Model>Generic Model</Model>
+			<CertificationNumber>ANGL-1234</CertificationNumber>
+			<Date>2021-11-18T14:09:17.2810263Z</Date>
+			<AppVersion>aaaaa</AppVersion>
+			<Ratio>1.123</Ratio>
+			<CertificationMethod>Option 1</CertificationMethod>
+			<TorqueLossMap>
+				<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00"/>
+				<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00"/>
+				<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00"/>
+				<Entry inputSpeed="800.00" inputTorque="-1200.00" torqueLoss="100.00"/>
+				<Entry inputSpeed="800.00" inputTorque="0.00" torqueLoss="10.00"/>
+				<Entry inputSpeed="800.00" inputTorque="1200.00" torqueLoss="100.00"/>
+				<Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00"/>
+				<Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00"/>
+				<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00"/>
+			</TorqueLossMap>
+		</v2.0:Data>
+		<v2.0:Signature>
+			<di:Reference URI="#ANGL-asdf">
+				<di:Transforms>
+					<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+					<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+				</di:Transforms>
+				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+				<di:DigestValue>lFLmCC4J39gaYU+VNw4q6ScyWOBzKoeVqmQ8/mQizBQ=</di:DigestValue>
+			</di:Reference>
+		</v2.0:Signature>
+	</tns:Angledrive>
+</tns:VectoInputDeclaration>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Axlegear.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Axlegear.xml
index 8f75f0ef256806b873b84e2d8df09f90fbebc763..cf8c8b8002067edffbb852ed5b3a8790de566586 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Axlegear.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Axlegear.xml
@@ -1,45 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
-xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
-xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
-    <tns:Axlegear>
-        <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxlegearDataDeclarationType" id="AXL-asdf">            
-         <Manufacturer>Generic Vendor</Manufacturer>
-         <Model>Generic Model</Model>
-         <CertificationNumber>AXL-AXL_12</CertificationNumber>
-         <Date>2021-11-18T14:23:31.4958567Z</Date>
-         <AppVersion>VectoCore</AppVersion>
-         <LineType>Single portal axle</LineType>
-         <Ratio>1.000</Ratio>
-         <CertificationMethod>Measured</CertificationMethod>
-         <TorqueLossMap>
-			<Entry inputSpeed="0.00" inputTorque="-50000.10" torqueLoss="2000.10" />
-			<Entry inputSpeed="0.00" inputTorque="-125.10" torqueLoss="5.10" />
-			<Entry inputSpeed="0.00" inputTorque="0.10" torqueLoss="5.10" />
-			<Entry inputSpeed="0.00" inputTorque="125.10" torqueLoss="5.10" />
-			<Entry inputSpeed="0.00" inputTorque="50000.10" torqueLoss="2000.10" />
-			<Entry inputSpeed="4000.00" inputTorque="-60000.10" torqueLoss="2000.10" />
-			<Entry inputSpeed="4000.00" inputTorque="-788.10" torqueLoss="31.10" />
-			<Entry inputSpeed="4000.00" inputTorque="0.11" torqueLoss="31.10" />
-			<Entry inputSpeed="4000.00" inputTorque="788.10" torqueLoss="31.10" />
-			<Entry inputSpeed="4000.00" inputTorque="60000.10" torqueLoss="2000.10" />
-			<Entry inputSpeed="5000.00" inputTorque="-50000.10" torqueLoss="2000.10" />
-			<Entry inputSpeed="5000.00" inputTorque="-780.10" torqueLoss="31.10" />
-			<Entry inputSpeed="5000.00" inputTorque="0.10" torqueLoss="31.10" />
-			<Entry inputSpeed="5000.00" inputTorque="780.10" torqueLoss="31.10" />
-			<Entry inputSpeed="5000.00" inputTorque="50000.10" torqueLoss="2000.10" />
-		</TorqueLossMap>
-        </v2.0:Data>
-        <v2.0:Signature>
-            <di:Reference URI="#AXL-asdf">
-                <di:Transforms>
-                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
-                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-                </di:Transforms>
-                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-                <di:DigestValue>MCdQW6mfKSC6WVU+1A5UVLkxKc7eBbg4GWQp6KpzjEw=</di:DigestValue>
-            </di:Reference>
-        </v2.0:Signature>
-    </tns:Axlegear>
-</tns:VectoInputDeclaration>
\ No newline at end of file
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+	<tns:Axlegear>
+		<v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxlegearDataDeclarationType" id="AXL-asdf">
+			<Manufacturer>Generic Vendor</Manufacturer>
+			<Model>Generic Model</Model>
+			<CertificationNumber>AXL-AXL_12</CertificationNumber>
+			<Date>2021-11-18T14:23:31.4958567Z</Date>
+			<AppVersion>VectoCore</AppVersion>
+			<LineType>Single portal axle</LineType>
+			<Ratio>1.000</Ratio>
+			<CertificationMethod>Measured</CertificationMethod>
+			<TorqueLossMap>
+				<Entry inputSpeed="0.00" inputTorque="-50000.10" torqueLoss="2000.10"/>
+				<Entry inputSpeed="0.00" inputTorque="-125.10" torqueLoss="5.10"/>
+				<Entry inputSpeed="0.00" inputTorque="0.10" torqueLoss="5.10"/>
+				<Entry inputSpeed="0.00" inputTorque="125.10" torqueLoss="5.10"/>
+				<Entry inputSpeed="0.00" inputTorque="50000.10" torqueLoss="2000.10"/>
+				<Entry inputSpeed="4000.00" inputTorque="-60000.10" torqueLoss="2000.10"/>
+				<Entry inputSpeed="4000.00" inputTorque="-788.10" torqueLoss="31.10"/>
+				<Entry inputSpeed="4000.00" inputTorque="0.11" torqueLoss="31.10"/>
+				<Entry inputSpeed="4000.00" inputTorque="788.10" torqueLoss="31.10"/>
+				<Entry inputSpeed="4000.00" inputTorque="60000.10" torqueLoss="2000.10"/>
+				<Entry inputSpeed="5000.00" inputTorque="-50000.10" torqueLoss="2000.10"/>
+				<Entry inputSpeed="5000.00" inputTorque="-780.10" torqueLoss="31.10"/>
+				<Entry inputSpeed="5000.00" inputTorque="0.10" torqueLoss="31.10"/>
+				<Entry inputSpeed="5000.00" inputTorque="780.10" torqueLoss="31.10"/>
+				<Entry inputSpeed="5000.00" inputTorque="50000.10" torqueLoss="2000.10"/>
+			</TorqueLossMap>
+		</v2.0:Data>
+		<v2.0:Signature>
+			<di:Reference URI="#AXL-asdf">
+				<di:Transforms>
+					<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+					<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+				</di:Transforms>
+				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+				<di:DigestValue>MCdQW6mfKSC6WVU+1A5UVLkxKc7eBbg4GWQp6KpzjEw=</di:DigestValue>
+			</di:Reference>
+		</v2.0:Signature>
+	</tns:Axlegear>
+</tns:VectoInputDeclaration>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/BatterySystem_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/BatterySystem_1.xml
index d6787b93832b644c7c33301aa531ab50fef5be08..fd7cbcec65ba7d41bed3e4637e524e36ec3c6e89 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/BatterySystem_1.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/BatterySystem_1.xml
@@ -1 +1,49 @@
-<?xml version="1.0" encoding="utf-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">    
<tns:BatterySystem>
        <Data xsi:type="BatterySystemDataType" id="BAT-asdf">
            <Manufacturer>a</Manufacturer>
            <Model>a</Model>
            <CertificationNumber>token</CertificationNumber>
            <Date>2021-11-18T14:11:51.3452323Z</Date>
            <AppVersion>aaaaa</AppVersion>
            <CertificationMethod>Measured</CertificationMethod>
            <BatteryType>HPBS</BatteryType>
            <RatedCapacity>72.00</RatedCapacity>
            <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
            <JunctionboxIncluded>true</JunctionboxIncluded>
            <TestingTemperature>20</TestingTemperature>
            <OCV>
                <Entry SoC="0" OCV="620.00" />
				<Entry SoC="88" OCV="640.00" />
				<Entry SoC="89" OCV="641.00" />
                <Entry SoC="100" OCV="640.00" />
            </OCV>
            <InternalResistance>
                <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00" />
				<Entry SoC="88" R_2="13.00" R_10="14.00" R_20="16.00" />
				<Entry SoC="88" R_2="14.00" R_10="14.00" R_20="16.00" />
                <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00" />
            </InternalResistance>
            <CurrentLimits>
                <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00" />
				<Entry SoC="88" maxChargingCurrent="20.00" maxDischargingCurrent="50.00" />
				<Entry SoC="88" maxChargingCurrent="21.00" maxDischargingCurrent="50.00" />
                <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00" />
            </CurrentLimits>
        </Data>
        <Signature>
            <di:Reference URI="#BAT-asdf">
                <di:Transforms>
                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                </di:Transforms>
                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
                <di:DigestValue>MNKcycaIzgndCWPEFDp84PlujKPkb9QaOxA8yKGNiKI=</di:DigestValue>
            </di:Reference>
        </Signature>
    </tns:BatterySystem>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">    
+<tns:BatterySystem>
+        <Data xsi:type="BatterySystemDataType" id="BAT-asdf">
+            <Manufacturer>a</Manufacturer>
+            <Model>a</Model>
+            <CertificationNumber>token</CertificationNumber>
+            <Date>2021-11-18T14:11:51.3452323Z</Date>
+            <AppVersion>aaaaa</AppVersion>
+            <CertificationMethod>Measured</CertificationMethod>
+            <BatteryType>HPBS</BatteryType>
+            <RatedCapacity>72.00</RatedCapacity>
+            <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded>
+            <JunctionboxIncluded>true</JunctionboxIncluded>
+            <TestingTemperature>20</TestingTemperature>
+            <OCV>
+                <Entry SoC="0" OCV="620.00" />
+				<Entry SoC="88" OCV="640.00" />
+				<Entry SoC="89" OCV="641.00" />
+                <Entry SoC="100" OCV="640.00" />
+            </OCV>
+            <InternalResistance>
+                <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00" />
+				<Entry SoC="88" R_2="13.00" R_10="14.00" R_20="16.00" />
+				<Entry SoC="88" R_2="14.00" R_10="14.00" R_20="16.00" />
+                <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00" />
+            </InternalResistance>
+            <CurrentLimits>
+                <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00" />
+				<Entry SoC="88" maxChargingCurrent="20.00" maxDischargingCurrent="50.00" />
+				<Entry SoC="88" maxChargingCurrent="21.00" maxDischargingCurrent="50.00" />
+                <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00" />
+            </CurrentLimits>
+        </Data>
+        <Signature>
+            <di:Reference URI="#BAT-asdf">
+                <di:Transforms>
+                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </di:Transforms>
+                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <di:DigestValue>MNKcycaIzgndCWPEFDp84PlujKPkb9QaOxA8yKGNiKI=</di:DigestValue>
+            </di:Reference>
+        </Signature>
+    </tns:BatterySystem>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/CapacitorSystem_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/CapacitorSystem_1.xml
index e5b487f34b5834a9c03503f5fc7616beb2dd1879..c4ce096b917b9d9ff10a6de0d27019feeba7395b 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/CapacitorSystem_1.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/CapacitorSystem_1.xml
@@ -1 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">      
<tns:CapacitorSystem>
        <Data xsi:type="CapacitorSystemDataType" id="CAP-asdf">
            <Manufacturer>a</Manufacturer>
            <Model>a</Model>
            <CertificationNumber>token</CertificationNumber>
            <Date>2021-11-18T14:14:06.0791626Z</Date>
            <AppVersion>aaaaa</AppVersion>
            <CertificationMethod>Measured</CertificationMethod>
            <Capacitance>1.00</Capacitance>
            <InternalResistance>23.45</InternalResistance>
            <MinVoltage>3.55</MinVoltage>
            <MaxVoltage>30.45</MaxVoltage>
            <MaxChargingCurrent>100.00</MaxChargingCurrent>
            <MaxDischargingCurrent>99.45</MaxDischargingCurrent>
            <TestingTemperature>30</TestingTemperature>
        </Data>
        <Signature>
            <di:Reference URI="#CAP-asdf">
                <di:Transforms>
                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                </di:Transforms>
                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
                <di:DigestValue>dBadIN60l8Iqcanj/nrx1EbD+KixtDxLAusUcutITk8=</di:DigestValue>
            </di:Reference>
        </Signature>
    </tns:CapacitorSystem>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">      
+<tns:CapacitorSystem>
+        <Data xsi:type="CapacitorSystemDataType" id="CAP-asdf">
+            <Manufacturer>a</Manufacturer>
+            <Model>a</Model>
+            <CertificationNumber>token</CertificationNumber>
+            <Date>2021-11-18T14:14:06.0791626Z</Date>
+            <AppVersion>aaaaa</AppVersion>
+            <CertificationMethod>Measured</CertificationMethod>
+            <Capacitance>1.00</Capacitance>
+            <InternalResistance>23.45</InternalResistance>
+            <MinVoltage>3.55</MinVoltage>
+            <MaxVoltage>30.45</MaxVoltage>
+            <MaxChargingCurrent>100.00</MaxChargingCurrent>
+            <MaxDischargingCurrent>99.45</MaxDischargingCurrent>
+            <TestingTemperature>30</TestingTemperature>
+        </Data>
+        <Signature>
+            <di:Reference URI="#CAP-asdf">
+                <di:Transforms>
+                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </di:Transforms>
+                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <di:DigestValue>dBadIN60l8Iqcanj/nrx1EbD+KixtDxLAusUcutITk8=</di:DigestValue>
+            </di:Reference>
+        </Signature>
+    </tns:CapacitorSystem>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem-IHPC_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem-IHPC_1.xml
index e4a747d93d7b5a3cea768e3ed300b0fd86f2ae92..a24ceee877f8a4dac6a897895fedc6720ab14a77 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem-IHPC_1.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem-IHPC_1.xml
@@ -1 +1,152 @@
-<?xml version="1.0" encoding="utf-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">  
    <tns:ElectricMachineSystem>
        <Data  xsi:type="ElectricMachineSystemIHPCMeasuredDataDeclarationType" id="EM-asdf">
            <Manufacturer>a</Manufacturer>
            <Model>a</Model>
            <CertificationNumber>token</CertificationNumber>
            <Date>2021-11-18T14:22:33.399635Z</Date>
            <AppVersion>aaaaa</AppVersion>
            <ElectricMachineType>ASM</ElectricMachineType>
            <CertificationMethod>Measured</CertificationMethod>
            <R85RatedPower>1</R85RatedPower>
            <RotationalInertia>0.10</RotationalInertia>
            <DcDcConverterIncluded>true</DcDcConverterIncluded>
            <IHPCType>IHPC Type 1</IHPCType>
            <VoltageLevel>
                <Voltage>400</Voltage>
                <ContinuousTorque>200.00</ContinuousTorque>
				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
				<OverloadTorque>400.00</OverloadTorque>
				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
				<OverloadDuration>30.00</OverloadDuration>
                <MaxTorqueCurve>
                    <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
                    <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
					<Entry outShaftSpeed="4001.00" maxTorque="101.00" minTorque="-100.00"/>
                </MaxTorqueCurve>
                <PowerMap gear="1">
                    <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
                    <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
                    <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
                    <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
                </PowerMap>
                <PowerMap gear="2">
                    <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
                    <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
                    <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
                    <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
                </PowerMap>
				<PowerMap gear="3">
					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
				</PowerMap>
            </VoltageLevel>
			<VoltageLevel>
				<Voltage>500</Voltage>
				<ContinuousTorque>200.00</ContinuousTorque>
				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
				<OverloadTorque>400.00</OverloadTorque>
				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
				<OverloadDuration>30.00</OverloadDuration>
				<MaxTorqueCurve>
					<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
					<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
					<Entry outShaftSpeed="5000.00" maxTorque="100.00" minTorque="-100.00"/>
				</MaxTorqueCurve>
				<PowerMap gear="1">
					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
				</PowerMap>
				<PowerMap gear="2">
					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
				</PowerMap>
				<PowerMap gear="3">
					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
				</PowerMap>
			</VoltageLevel>
			<VoltageLevel>
                <Voltage>600</Voltage>
                <ContinuousTorque>200.00</ContinuousTorque>
				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
				<OverloadTorque>400.00</OverloadTorque>
				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
				<OverloadDuration>30.00</OverloadDuration>
                <MaxTorqueCurve>
                    <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
                    <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
					<Entry outShaftSpeed="4001.00" maxTorque="101.00" minTorque="-100.00"/>
                </MaxTorqueCurve>
                <PowerMap gear="1">
                    <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
                    <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
                    <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
                    <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
                </PowerMap>
                <PowerMap gear="2">
                    <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
                    <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
                    <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
                    <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
                </PowerMap>
				<PowerMap gear="3">
					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
				</PowerMap>
            </VoltageLevel>
            <DragCurve>
                <Entry outShaftSpeed="0.00" dragTorque="10.00" />
                <Entry outShaftSpeed="4000.00" dragTorque="30.00" />
				<Entry outShaftSpeed="5000.00" dragTorque="30.00" />
            </DragCurve>
            <Conditioning>
                <Entry coolantTempInlet="30" coolingPower="5000" />
				<Entry coolantTempInlet="50" coolingPower="5000" />
				<Entry coolantTempInlet="60" coolingPower="5000" />
            </Conditioning>
        </Data>
        <Signature>
            <di:Reference URI="#EM-asdf">
                <di:Transforms>
                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                </di:Transforms>
                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
                <di:DigestValue>6VgGv3QToPDXpr7nSg1fupTLZ8qACAOEshZ8l5pUNI4=</di:DigestValue>
            </di:Reference>
        </Signature>
    </tns:ElectricMachineSystem>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">  
+    <tns:ElectricMachineSystem>
+        <Data  xsi:type="ElectricMachineSystemIHPCMeasuredDataDeclarationType" id="EM-asdf">
+            <Manufacturer>a</Manufacturer>
+            <Model>a</Model>
+            <CertificationNumber>token</CertificationNumber>
+            <Date>2021-11-18T14:22:33.399635Z</Date>
+            <AppVersion>aaaaa</AppVersion>
+            <ElectricMachineType>ASM</ElectricMachineType>
+            <CertificationMethod>Measured</CertificationMethod>
+            <R85RatedPower>1</R85RatedPower>
+            <RotationalInertia>0.10</RotationalInertia>
+            <DcDcConverterIncluded>true</DcDcConverterIncluded>
+            <IHPCType>IHPC Type 1</IHPCType>
+            <VoltageLevel>
+                <Voltage>400</Voltage>
+                <ContinuousTorque>200.00</ContinuousTorque>
+				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+				<OverloadTorque>400.00</OverloadTorque>
+				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+				<OverloadDuration>30.00</OverloadDuration>
+                <MaxTorqueCurve>
+                    <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+                    <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+					<Entry outShaftSpeed="4001.00" maxTorque="101.00" minTorque="-100.00"/>
+                </MaxTorqueCurve>
+                <PowerMap gear="1">
+                    <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+                    <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+                    <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+                    <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+                </PowerMap>
+                <PowerMap gear="2">
+                    <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+                    <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+                    <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+                    <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+                </PowerMap>
+				<PowerMap gear="3">
+					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+				</PowerMap>
+            </VoltageLevel>
+			<VoltageLevel>
+				<Voltage>500</Voltage>
+				<ContinuousTorque>200.00</ContinuousTorque>
+				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+				<OverloadTorque>400.00</OverloadTorque>
+				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+				<OverloadDuration>30.00</OverloadDuration>
+				<MaxTorqueCurve>
+					<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+					<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+					<Entry outShaftSpeed="5000.00" maxTorque="100.00" minTorque="-100.00"/>
+				</MaxTorqueCurve>
+				<PowerMap gear="1">
+					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+				</PowerMap>
+				<PowerMap gear="2">
+					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+				</PowerMap>
+				<PowerMap gear="3">
+					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+				</PowerMap>
+			</VoltageLevel>
+			<VoltageLevel>
+                <Voltage>600</Voltage>
+                <ContinuousTorque>200.00</ContinuousTorque>
+				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+				<OverloadTorque>400.00</OverloadTorque>
+				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+				<OverloadDuration>30.00</OverloadDuration>
+                <MaxTorqueCurve>
+                    <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+                    <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+					<Entry outShaftSpeed="4001.00" maxTorque="101.00" minTorque="-100.00"/>
+                </MaxTorqueCurve>
+                <PowerMap gear="1">
+                    <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+                    <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+                    <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+                    <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+                </PowerMap>
+                <PowerMap gear="2">
+                    <Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+                    <Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+                    <Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+                    <Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+                </PowerMap>
+				<PowerMap gear="3">
+					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="20000.00"/>
+				</PowerMap>
+            </VoltageLevel>
+            <DragCurve>
+                <Entry outShaftSpeed="0.00" dragTorque="10.00" />
+                <Entry outShaftSpeed="4000.00" dragTorque="30.00" />
+				<Entry outShaftSpeed="5000.00" dragTorque="30.00" />
+            </DragCurve>
+            <Conditioning>
+                <Entry coolantTempInlet="30" coolingPower="5000" />
+				<Entry coolantTempInlet="50" coolingPower="5000" />
+				<Entry coolantTempInlet="60" coolingPower="5000" />
+            </Conditioning>
+        </Data>
+        <Signature>
+            <di:Reference URI="#EM-asdf">
+                <di:Transforms>
+                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </di:Transforms>
+                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <di:DigestValue>6VgGv3QToPDXpr7nSg1fupTLZ8qACAOEshZ8l5pUNI4=</di:DigestValue>
+            </di:Reference>
+        </Signature>
+    </tns:ElectricMachineSystem>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem_1.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem_1.xml
index c0f099b1a64f3dba3b527a8fbe6a3b562a89834e..792032d4c9c18eeb82e798c9c9320c0bf3b50b2f 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem_1.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem_1.xml
@@ -1 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">  
	<tns:ElectricMachineSystem>
		<Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-asdf">
			<Manufacturer>a</Manufacturer>
			<Model>a</Model>
			<CertificationNumber>token</CertificationNumber>
			<Date>2021-11-18T14:20:11.60244Z</Date>
			<AppVersion>aaaaa</AppVersion>
			<ElectricMachineType>ASM</ElectricMachineType>
			<CertificationMethod>Measured</CertificationMethod>
			<R85RatedPower>1</R85RatedPower>
			<RotationalInertia>0.10</RotationalInertia>
			<DcDcConverterIncluded>true</DcDcConverterIncluded>
			<IHPCType>None</IHPCType>
			<VoltageLevel>
				<Voltage>400</Voltage>
				<ContinuousTorque>200.00</ContinuousTorque>
				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
				<OverloadTorque>400.00</OverloadTorque>
				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
				<OverloadDuration>30.00</OverloadDuration>
				<MaxTorqueCurve>
					<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
					<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
				</MaxTorqueCurve>
				<PowerMap>
					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
				</PowerMap>
			</VoltageLevel>
			<VoltageLevel>
				<Voltage>600</Voltage>
				<ContinuousTorque>200.00</ContinuousTorque>
				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
				<OverloadTorque>400.00</OverloadTorque>
				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
				<OverloadDuration>30.00</OverloadDuration>
				<MaxTorqueCurve>
					<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
					<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
				</MaxTorqueCurve>
				<PowerMap>
					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
				</PowerMap>
			</VoltageLevel>
			<DragCurve>
				<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
				<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
			</DragCurve>
			<Conditioning>
				<Entry coolantTempInlet="30" coolingPower="5000"/>
				<Entry coolantTempInlet="60" coolingPower="6000"/>
			</Conditioning>
		</Data>
		<Signature>
			<di:Reference URI="#EM-asdf">
				<di:Transforms>
					<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
					<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
				</di:Transforms>
				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
				<di:DigestValue>wLFLpJxFZ6mDXeqdlZCGVOLCoXTCf7XTL0q9ZKkmt7o=</di:DigestValue>
			</di:Reference>
		</Signature>
	</tns:ElectricMachineSystem>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">  
+	<tns:ElectricMachineSystem>
+		<Data xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-asdf">
+			<Manufacturer>a</Manufacturer>
+			<Model>a</Model>
+			<CertificationNumber>token</CertificationNumber>
+			<Date>2021-11-18T14:20:11.60244Z</Date>
+			<AppVersion>aaaaa</AppVersion>
+			<ElectricMachineType>ASM</ElectricMachineType>
+			<CertificationMethod>Measured</CertificationMethod>
+			<R85RatedPower>1</R85RatedPower>
+			<RotationalInertia>0.10</RotationalInertia>
+			<DcDcConverterIncluded>true</DcDcConverterIncluded>
+			<IHPCType>None</IHPCType>
+			<VoltageLevel>
+				<Voltage>400</Voltage>
+				<ContinuousTorque>200.00</ContinuousTorque>
+				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+				<OverloadTorque>400.00</OverloadTorque>
+				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+				<OverloadDuration>30.00</OverloadDuration>
+				<MaxTorqueCurve>
+					<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+					<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+				</MaxTorqueCurve>
+				<PowerMap>
+					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+				</PowerMap>
+			</VoltageLevel>
+			<VoltageLevel>
+				<Voltage>600</Voltage>
+				<ContinuousTorque>200.00</ContinuousTorque>
+				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+				<OverloadTorque>400.00</OverloadTorque>
+				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+				<OverloadDuration>30.00</OverloadDuration>
+				<MaxTorqueCurve>
+					<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+					<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+				</MaxTorqueCurve>
+				<PowerMap>
+					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+				</PowerMap>
+			</VoltageLevel>
+			<DragCurve>
+				<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+				<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+			</DragCurve>
+			<Conditioning>
+				<Entry coolantTempInlet="30" coolingPower="5000"/>
+				<Entry coolantTempInlet="60" coolingPower="6000"/>
+			</Conditioning>
+		</Data>
+		<Signature>
+			<di:Reference URI="#EM-asdf">
+				<di:Transforms>
+					<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+					<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+				</di:Transforms>
+				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+				<di:DigestValue>wLFLpJxFZ6mDXeqdlZCGVOLCoXTCf7XTL0q9ZKkmt7o=</di:DigestValue>
+			</di:Reference>
+		</Signature>
+	</tns:ElectricMachineSystem>
+</tns:VectoInputDeclaration>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem_StdValues.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem_StdValues.xml
index 9d2b6300495e3003fb3c287c6f95d11bc7e32d77..e3b4a1e2035fb92262c253126f4ed14d85791aad 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem_StdValues.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/ElectricMachineSystem_StdValues.xml
@@ -1 +1,53 @@
-<?xml version="1.0" encoding="utf-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">  
	<tns:ElectricMachineSystem>
		<Data xsi:type="ElectricMachineSystemStandardValuesDataDeclarationType" id="EM-asdf">
			<Manufacturer>a</Manufacturer>
			<Model>a</Model>
			<CertificationNumber>token</CertificationNumber>
			<Date>2021-11-18T14:21:25.8564983Z</Date>
			<AppVersion>aaaaa</AppVersion>
			<ElectricMachineType>ASM</ElectricMachineType>
			<CertificationMethod>Standard values</CertificationMethod>
			<R85RatedPower>1</R85RatedPower>
			<RotationalInertia>0.10</RotationalInertia>
			<DcDcConverterIncluded>true</DcDcConverterIncluded>
			<IHPCType>None</IHPCType>
			<VoltageLevel>
				<ContinuousTorque>200.00</ContinuousTorque>
				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
				<OverloadTorque>400.00</OverloadTorque>
				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
				<OverloadDuration>30.00</OverloadDuration>
				<MaxTorqueCurve>
					<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
					<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
					<Entry outShaftSpeed="4000.00" maxTorque="101.00" minTorque="-100.00"/>
				</MaxTorqueCurve>
				<PowerMap>
					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
				</PowerMap>
			</VoltageLevel>
			<DragCurve>
				<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
				<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
			</DragCurve>
		</Data>
		<Signature>
			<di:Reference URI="#EM-asdf">
				<di:Transforms>
					<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
					<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
				</di:Transforms>
				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
				<di:DigestValue>qP2WjwhL0iXRHZN7OK1Bz3jEpdP4cuYvOWSeJUu6Rl8=</di:DigestValue>
			</di:Reference>
		</Signature>
	</tns:ElectricMachineSystem>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">  
+	<tns:ElectricMachineSystem>
+		<Data xsi:type="ElectricMachineSystemStandardValuesDataDeclarationType" id="EM-asdf">
+			<Manufacturer>a</Manufacturer>
+			<Model>a</Model>
+			<CertificationNumber>token</CertificationNumber>
+			<Date>2021-11-18T14:21:25.8564983Z</Date>
+			<AppVersion>aaaaa</AppVersion>
+			<ElectricMachineType>ASM</ElectricMachineType>
+			<CertificationMethod>Standard values</CertificationMethod>
+			<R85RatedPower>1</R85RatedPower>
+			<RotationalInertia>0.10</RotationalInertia>
+			<DcDcConverterIncluded>true</DcDcConverterIncluded>
+			<IHPCType>None</IHPCType>
+			<VoltageLevel>
+				<ContinuousTorque>200.00</ContinuousTorque>
+				<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+				<OverloadTorque>400.00</OverloadTorque>
+				<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+				<OverloadDuration>30.00</OverloadDuration>
+				<MaxTorqueCurve>
+					<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
+					<Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/>
+					<Entry outShaftSpeed="4000.00" maxTorque="101.00" minTorque="-100.00"/>
+				</MaxTorqueCurve>
+				<PowerMap>
+					<Entry outShaftSpeed="0.00" torque="-400.00" electricPower="-1000.00"/>
+					<Entry outShaftSpeed="0.00" torque="400.00" electricPower="1000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="-4000.00" electricPower="-20000.00"/>
+					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
+				</PowerMap>
+			</VoltageLevel>
+			<DragCurve>
+				<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
+				<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
+			</DragCurve>
+		</Data>
+		<Signature>
+			<di:Reference URI="#EM-asdf">
+				<di:Transforms>
+					<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+					<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+				</di:Transforms>
+				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+				<di:DigestValue>qP2WjwhL0iXRHZN7OK1Bz3jEpdP4cuYvOWSeJUu6Rl8=</di:DigestValue>
+			</di:Reference>
+		</Signature>
+	</tns:ElectricMachineSystem>
+</tns:VectoInputDeclaration>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_FWD.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_FWD.xml
index 1d9d940f3f79b9b1a4a1b057785e6190fd6ac4b1..1958726849e0ce0178b9742a8d281b1451863a79 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_FWD.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Sorted/Gearbox_FWD.xml
@@ -1 +1,97 @@
-<?xml version="1.0" encoding="utf-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
    <tns:Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
        <v2.0:Data xsi:type="GearboxFWDDataDeclarationType" id="GBX-asdf">
            <Manufacturer>Generic Vendor</Manufacturer>
            <Model>GB_12-gear</Model>
            <CertificationNumber>GBX-GB_12-gear</CertificationNumber>
            <Date>2021-11-18T14:23:31.4958567Z</Date>
            <AppVersion>VectoCore</AppVersion>
            <TransmissionType>APT-P</TransmissionType>
            <MainCertificationMethod>Standard values</MainCertificationMethod>
            <DifferentialIncluded>true</DifferentialIncluded>
            <AxlegearRatio>1.000</AxlegearRatio>
            <v2.3:Gears xsi:type="GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
                <Gear number="1">
                    <Ratio>14.930</Ratio>
                    <MaxTorque>1000</MaxTorque>
                    <MaxSpeed>100</MaxSpeed>
                    <TorqueLossMap>
                        <Entry inputSpeed="0.00" inputTorque="-50000.10" torqueLoss="2000.10" />
                        <Entry inputSpeed="0.00" inputTorque="-125.10" torqueLoss="5.10" />
                        <Entry inputSpeed="0.00" inputTorque="0.10" torqueLoss="5.10" />
                        <Entry inputSpeed="0.00" inputTorque="125.10" torqueLoss="5.10" />
                        <Entry inputSpeed="0.00" inputTorque="50000.10" torqueLoss="2000.10" />
                        <Entry inputSpeed="5000.00" inputTorque="-50000.10" torqueLoss="2000.10" />
                        <Entry inputSpeed="5000.00" inputTorque="-780.10" torqueLoss="31.10" />
                        <Entry inputSpeed="5000.00" inputTorque="0.10" torqueLoss="31.10" />
                        <Entry inputSpeed="5000.00" inputTorque="780.10" torqueLoss="31.10" />
                        <Entry inputSpeed="5000.00" inputTorque="50000.10" torqueLoss="2000.10" />
						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
                    </TorqueLossMap>
                </Gear>
                <Gear number="2">
                    <Ratio>11.640</Ratio>
                    <MaxTorque>1200</MaxTorque>
                    <MaxSpeed>110</MaxSpeed>
                    <TorqueLossMap>
                        <Entry inputSpeed="0.00" inputTorque="-50000.20" torqueLoss="2000.20" />
                        <Entry inputSpeed="0.00" inputTorque="-125.20" torqueLoss="5.20" />
                        <Entry inputSpeed="0.00" inputTorque="0.20" torqueLoss="5.20" />
                        <Entry inputSpeed="0.00" inputTorque="125.20" torqueLoss="5.20" />
                        <Entry inputSpeed="0.00" inputTorque="50000.20" torqueLoss="2000.20" />
                        <Entry inputSpeed="5000.00" inputTorque="-50000.20" torqueLoss="2000.20" />
                        <Entry inputSpeed="5000.00" inputTorque="-780.20" torqueLoss="31.20" />
                        <Entry inputSpeed="5000.00" inputTorque="0.20" torqueLoss="31.20" />
                        <Entry inputSpeed="5000.00" inputTorque="780.20" torqueLoss="31.20" />
                        <Entry inputSpeed="5000.00" inputTorque="50000.20" torqueLoss="2000.20" />
						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
                    </TorqueLossMap>
                </Gear>
                <Gear number="3">
                    <Ratio>9.020</Ratio>
                    <MaxTorque>1300</MaxTorque>
                    <MaxSpeed>112</MaxSpeed>
                    <TorqueLossMap>
                        <Entry inputSpeed="0.00" inputTorque="-50000.30" torqueLoss="2000.30" />
                        <Entry inputSpeed="0.00" inputTorque="-125.30" torqueLoss="5.30" />
                        <Entry inputSpeed="0.00" inputTorque="0.30" torqueLoss="5.30" />
                        <Entry inputSpeed="0.00" inputTorque="125.30" torqueLoss="5.30" />
                        <Entry inputSpeed="0.00" inputTorque="50000.30" torqueLoss="2000.30" />
                        <Entry inputSpeed="5000.00" inputTorque="-50000.30" torqueLoss="2000.30" />
                        <Entry inputSpeed="5000.00" inputTorque="-780.30" torqueLoss="31.30" />
                        <Entry inputSpeed="5000.00" inputTorque="0.30" torqueLoss="31.30" />
                        <Entry inputSpeed="5000.00" inputTorque="780.30" torqueLoss="31.30" />
                        <Entry inputSpeed="5000.00" inputTorque="50000.30" torqueLoss="2000.30" />
						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
                    </TorqueLossMap>
                </Gear>
            </v2.3:Gears>
        </v2.0:Data>
        <v2.0:Signature>
            <di:Reference URI="#GBX-asdf">
                <di:Transforms>
                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                </di:Transforms>
                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
                <di:DigestValue>BlXQyrK6qVsW5MHt74jB1Y1+a9toEwNC5KXYUmKawfQ=</di:DigestValue>
            </di:Reference>
        </v2.0:Signature>
    </tns:Gearbox>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
+        <v2.0:Data xsi:type="GearboxFWDDataDeclarationType" id="GBX-asdf">
+            <Manufacturer>Generic Vendor</Manufacturer>
+            <Model>GB_12-gear</Model>
+            <CertificationNumber>GBX-GB_12-gear</CertificationNumber>
+            <Date>2021-11-18T14:23:31.4958567Z</Date>
+            <AppVersion>VectoCore</AppVersion>
+            <TransmissionType>APT-P</TransmissionType>
+            <MainCertificationMethod>Standard values</MainCertificationMethod>
+            <DifferentialIncluded>true</DifferentialIncluded>
+            <AxlegearRatio>1.000</AxlegearRatio>
+            <v2.3:Gears xsi:type="GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+                <Gear number="1">
+                    <Ratio>14.930</Ratio>
+                    <MaxTorque>1000</MaxTorque>
+                    <MaxSpeed>100</MaxSpeed>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="0.00" inputTorque="-50000.10" torqueLoss="2000.10" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.10" torqueLoss="5.10" />
+                        <Entry inputSpeed="0.00" inputTorque="0.10" torqueLoss="5.10" />
+                        <Entry inputSpeed="0.00" inputTorque="125.10" torqueLoss="5.10" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.10" torqueLoss="2000.10" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.10" torqueLoss="2000.10" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.10" torqueLoss="31.10" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.10" torqueLoss="31.10" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.10" torqueLoss="31.10" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.10" torqueLoss="2000.10" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+                <Gear number="2">
+                    <Ratio>11.640</Ratio>
+                    <MaxTorque>1200</MaxTorque>
+                    <MaxSpeed>110</MaxSpeed>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="0.00" inputTorque="-50000.20" torqueLoss="2000.20" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.20" torqueLoss="5.20" />
+                        <Entry inputSpeed="0.00" inputTorque="0.20" torqueLoss="5.20" />
+                        <Entry inputSpeed="0.00" inputTorque="125.20" torqueLoss="5.20" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.20" torqueLoss="2000.20" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.20" torqueLoss="2000.20" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.20" torqueLoss="31.20" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.20" torqueLoss="31.20" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.20" torqueLoss="31.20" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.20" torqueLoss="2000.20" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+                <Gear number="3">
+                    <Ratio>9.020</Ratio>
+                    <MaxTorque>1300</MaxTorque>
+                    <MaxSpeed>112</MaxSpeed>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="0.00" inputTorque="-50000.30" torqueLoss="2000.30" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.30" torqueLoss="5.30" />
+                        <Entry inputSpeed="0.00" inputTorque="0.30" torqueLoss="5.30" />
+                        <Entry inputSpeed="0.00" inputTorque="125.30" torqueLoss="5.30" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.30" torqueLoss="2000.30" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.30" torqueLoss="2000.30" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.30" torqueLoss="31.30" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.30" torqueLoss="31.30" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.30" torqueLoss="31.30" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.30" torqueLoss="2000.30" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+            </v2.3:Gears>
+        </v2.0:Data>
+        <v2.0:Signature>
+            <di:Reference URI="#GBX-asdf">
+                <di:Transforms>
+                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </di:Transforms>
+                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <di:DigestValue>BlXQyrK6qVsW5MHt74jB1Y1+a9toEwNC5KXYUmKawfQ=</di:DigestValue>
+            </di:Reference>
+        </v2.0:Signature>
+    </tns:Gearbox>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Angledrive.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Angledrive.xml
index 3293f48b50192d7871dfbd4c29572e5c103c10ef..552f22c2f7710d37c38fb0d8cdbc3e1a0eac0653 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Angledrive.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Angledrive.xml
@@ -1 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
    <tns:Angledrive>
        <v2.0:Data xsi:type="AngledriveDataDeclarationType" id="ANGL-asdf">           
         <Manufacturer>Generic Vendor</Manufacturer>
         <Model>Generic Model</Model>
         <CertificationNumber>ANGL-1234</CertificationNumber>
         <Date>2021-11-18T14:09:17.2810263Z</Date>
         <AppVersion>aaaaa</AppVersion>
         <Ratio>1.123</Ratio>
         <CertificationMethod>Option 1</CertificationMethod>
		<TorqueLossMap>
			<Entry inputSpeed="800.00" inputTorque="0.00" torqueLoss="10.00" />
			<Entry inputSpeed="800.00" inputTorque="1200.00" torqueLoss="100.00" />
			<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00" />
			<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00" />
			<Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00" />
			<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00" />
			<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00" />
			<Entry inputSpeed="800.00" inputTorque="-1200.00" torqueLoss="100.00" />

			<Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00" />

		</TorqueLossMap>
        </v2.0:Data>
        <v2.0:Signature>
            <di:Reference URI="#ANGL-asdf">
                <di:Transforms>
                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                </di:Transforms>
                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
                <di:DigestValue>lFLmCC4J39gaYU+VNw4q6ScyWOBzKoeVqmQ8/mQizBQ=</di:DigestValue>
            </di:Reference>
        </v2.0:Signature>
    </tns:Angledrive>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:Angledrive>
+        <v2.0:Data xsi:type="AngledriveDataDeclarationType" id="ANGL-asdf">           
+         <Manufacturer>Generic Vendor</Manufacturer>
+         <Model>Generic Model</Model>
+         <CertificationNumber>ANGL-1234</CertificationNumber>
+         <Date>2021-11-18T14:09:17.2810263Z</Date>
+         <AppVersion>aaaaa</AppVersion>
+         <Ratio>1.123</Ratio>
+         <CertificationMethod>Option 1</CertificationMethod>
+		<TorqueLossMap>
+			<Entry inputSpeed="800.00" inputTorque="0.00" torqueLoss="10.00" />
+			<Entry inputSpeed="800.00" inputTorque="1200.00" torqueLoss="100.00" />
+			<Entry inputSpeed="0.00" inputTorque="-10000.00" torqueLoss="100.00" />
+			<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="10.00" />
+			<Entry inputSpeed="1000.00" inputTorque="0.00" torqueLoss="10.00" />
+			<Entry inputSpeed="1000.00" inputTorque="1000.00" torqueLoss="100.00" />
+			<Entry inputSpeed="0.00" inputTorque="10000.00" torqueLoss="100.00" />
+			<Entry inputSpeed="800.00" inputTorque="-1200.00" torqueLoss="100.00" />
+
+			<Entry inputSpeed="1000.00" inputTorque="-1000.00" torqueLoss="100.00" />
+
+		</TorqueLossMap>
+        </v2.0:Data>
+        <v2.0:Signature>
+            <di:Reference URI="#ANGL-asdf">
+                <di:Transforms>
+                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </di:Transforms>
+                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <di:DigestValue>lFLmCC4J39gaYU+VNw4q6ScyWOBzKoeVqmQ8/mQizBQ=</di:DigestValue>
+            </di:Reference>
+        </v2.0:Signature>
+    </tns:Angledrive>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_FWD.xml b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_FWD.xml
index 6e45405432d6935a5c9ae03b839f9a0636c6be5e..0d30c4996af1dfce12e42dc147b4e5b3821f49ab 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_FWD.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/Sort/Component/Unsorted/Gearbox_FWD.xml
@@ -1 +1,103 @@
-<?xml version="1.0" encoding="utf-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
    <tns:Gearbox>
        <v2.0:Data xsi:type="GearboxFWDDataDeclarationType" id="GBX-asdf">
            <Manufacturer>Generic Vendor</Manufacturer>
            <Model>GB_12-gear</Model>
            <CertificationNumber>GBX-GB_12-gear</CertificationNumber>
            <Date>2021-11-18T14:23:31.4958567Z</Date>
            <AppVersion>VectoCore</AppVersion>
            <TransmissionType>APT-P</TransmissionType>
            <MainCertificationMethod>Standard values</MainCertificationMethod>
            <DifferentialIncluded>true</DifferentialIncluded>
            <AxlegearRatio>1.000</AxlegearRatio>
            <v2.3:Gears xsi:type="GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
			    <Gear number="3">
                    <Ratio>9.020</Ratio>
                    <MaxTorque>1300</MaxTorque>
                    <MaxSpeed>112</MaxSpeed>
                    <TorqueLossMap>
					    <Entry inputSpeed="5000.00" inputTorque="0.30" torqueLoss="31.30" />
                        <Entry inputSpeed="5000.00" inputTorque="780.30" torqueLoss="31.30" />
                        <Entry inputSpeed="5000.00" inputTorque="50000.30" torqueLoss="2000.30" />
						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
                        <Entry inputSpeed="0.00" inputTorque="-50000.30" torqueLoss="2000.30" />
                        <Entry inputSpeed="0.00" inputTorque="-125.30" torqueLoss="5.30" />
                        <Entry inputSpeed="0.00" inputTorque="0.30" torqueLoss="5.30" />
                        <Entry inputSpeed="0.00" inputTorque="125.30" torqueLoss="5.30" />
                        <Entry inputSpeed="0.00" inputTorque="50000.30" torqueLoss="2000.30" />
                        <Entry inputSpeed="5000.00" inputTorque="-50000.30" torqueLoss="2000.30" />
                        <Entry inputSpeed="5000.00" inputTorque="-780.30" torqueLoss="31.30" />

						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
                    </TorqueLossMap>
                </Gear>
			    <Gear number="2">
                    <Ratio>11.640</Ratio>
                    <MaxTorque>1200</MaxTorque>
                    <MaxSpeed>110</MaxSpeed>
                    <TorqueLossMap>
						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
					
                        <Entry inputSpeed="0.00" inputTorque="-50000.20" torqueLoss="2000.20" />
                        <Entry inputSpeed="0.00" inputTorque="-125.20" torqueLoss="5.20" />
                        <Entry inputSpeed="0.00" inputTorque="0.20" torqueLoss="5.20" />
                        <Entry inputSpeed="0.00" inputTorque="125.20" torqueLoss="5.20" />

                        <Entry inputSpeed="5000.00" inputTorque="-780.20" torqueLoss="31.20" />
                        <Entry inputSpeed="5000.00" inputTorque="0.20" torqueLoss="31.20" />
                        <Entry inputSpeed="5000.00" inputTorque="780.20" torqueLoss="31.20" />
                        <Entry inputSpeed="5000.00" inputTorque="50000.20" torqueLoss="2000.20" />
						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
                        <Entry inputSpeed="0.00" inputTorque="50000.20" torqueLoss="2000.20" />
                        <Entry inputSpeed="5000.00" inputTorque="-50000.20" torqueLoss="2000.20" />
                    </TorqueLossMap>
                </Gear>
                <Gear number="1">
                    <Ratio>14.930</Ratio>
                    <MaxTorque>1000</MaxTorque>
                    <MaxSpeed>100</MaxSpeed>
                    <TorqueLossMap>
					    <Entry inputSpeed="5000.00" inputTorque="-50000.10" torqueLoss="2000.10" />
                        <Entry inputSpeed="5000.00" inputTorque="-780.10" torqueLoss="31.10" />
                        <Entry inputSpeed="5000.00" inputTorque="0.10" torqueLoss="31.10" />
					
                        <Entry inputSpeed="0.00" inputTorque="-50000.10" torqueLoss="2000.10" />
                        <Entry inputSpeed="0.00" inputTorque="-125.10" torqueLoss="5.10" />
                        <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
						<Entry inputSpeed="0.00" inputTorque="0.10" torqueLoss="5.10" />
                        <Entry inputSpeed="0.00" inputTorque="125.10" torqueLoss="5.10" />
                        <Entry inputSpeed="0.00" inputTorque="50000.10" torqueLoss="2000.10" />

                        <Entry inputSpeed="5000.00" inputTorque="780.10" torqueLoss="31.10" />
                        <Entry inputSpeed="5000.00" inputTorque="50000.10" torqueLoss="2000.10" />
						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />

                    </TorqueLossMap>
                </Gear>
            </v2.3:Gears>
        </v2.0:Data>
        <v2.0:Signature>
            <di:Reference URI="#GBX-asdf">
                <di:Transforms>
                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
                </di:Transforms>
                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
                <di:DigestValue>BlXQyrK6qVsW5MHt74jB1Y1+a9toEwNC5KXYUmKawfQ=</di:DigestValue>
            </di:Reference>
        </v2.0:Signature>
    </tns:Gearbox>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.1" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationComponent.xsd">
+    <tns:Gearbox>
+        <v2.0:Data xsi:type="GearboxFWDDataDeclarationType" id="GBX-asdf">
+            <Manufacturer>Generic Vendor</Manufacturer>
+            <Model>GB_12-gear</Model>
+            <CertificationNumber>GBX-GB_12-gear</CertificationNumber>
+            <Date>2021-11-18T14:23:31.4958567Z</Date>
+            <AppVersion>VectoCore</AppVersion>
+            <TransmissionType>APT-P</TransmissionType>
+            <MainCertificationMethod>Standard values</MainCertificationMethod>
+            <DifferentialIncluded>true</DifferentialIncluded>
+            <AxlegearRatio>1.000</AxlegearRatio>
+            <v2.3:Gears xsi:type="GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+			    <Gear number="3">
+                    <Ratio>9.020</Ratio>
+                    <MaxTorque>1300</MaxTorque>
+                    <MaxSpeed>112</MaxSpeed>
+                    <TorqueLossMap>
+					    <Entry inputSpeed="5000.00" inputTorque="0.30" torqueLoss="31.30" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.30" torqueLoss="31.30" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.30" torqueLoss="2000.30" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-50000.30" torqueLoss="2000.30" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.30" torqueLoss="5.30" />
+                        <Entry inputSpeed="0.00" inputTorque="0.30" torqueLoss="5.30" />
+                        <Entry inputSpeed="0.00" inputTorque="125.30" torqueLoss="5.30" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.30" torqueLoss="2000.30" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.30" torqueLoss="2000.30" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.30" torqueLoss="31.30" />
+
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+                    </TorqueLossMap>
+                </Gear>
+			    <Gear number="2">
+                    <Ratio>11.640</Ratio>
+                    <MaxTorque>1200</MaxTorque>
+                    <MaxSpeed>110</MaxSpeed>
+                    <TorqueLossMap>
+						<Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+					
+                        <Entry inputSpeed="0.00" inputTorque="-50000.20" torqueLoss="2000.20" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.20" torqueLoss="5.20" />
+                        <Entry inputSpeed="0.00" inputTorque="0.20" torqueLoss="5.20" />
+                        <Entry inputSpeed="0.00" inputTorque="125.20" torqueLoss="5.20" />
+
+                        <Entry inputSpeed="5000.00" inputTorque="-780.20" torqueLoss="31.20" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.20" torqueLoss="31.20" />
+                        <Entry inputSpeed="5000.00" inputTorque="780.20" torqueLoss="31.20" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.20" torqueLoss="2000.20" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.20" torqueLoss="2000.20" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.20" torqueLoss="2000.20" />
+                    </TorqueLossMap>
+                </Gear>
+                <Gear number="1">
+                    <Ratio>14.930</Ratio>
+                    <MaxTorque>1000</MaxTorque>
+                    <MaxSpeed>100</MaxSpeed>
+                    <TorqueLossMap>
+					    <Entry inputSpeed="5000.00" inputTorque="-50000.10" torqueLoss="2000.10" />
+                        <Entry inputSpeed="5000.00" inputTorque="-780.10" torqueLoss="31.10" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.10" torqueLoss="31.10" />
+					
+                        <Entry inputSpeed="0.00" inputTorque="-50000.10" torqueLoss="2000.10" />
+                        <Entry inputSpeed="0.00" inputTorque="-125.10" torqueLoss="5.10" />
+                        <Entry inputSpeed="6000.00" inputTorque="0.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="780.00" torqueLoss="31.00" />
+						<Entry inputSpeed="6000.00" inputTorque="50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="0.00" inputTorque="0.10" torqueLoss="5.10" />
+                        <Entry inputSpeed="0.00" inputTorque="125.10" torqueLoss="5.10" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.10" torqueLoss="2000.10" />
+
+                        <Entry inputSpeed="5000.00" inputTorque="780.10" torqueLoss="31.10" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.10" torqueLoss="2000.10" />
+						<Entry inputSpeed="6000.00" inputTorque="-50000.00" torqueLoss="2000.00" />
+						<Entry inputSpeed="6000.00" inputTorque="-780.00" torqueLoss="31.00" />
+
+                    </TorqueLossMap>
+                </Gear>
+            </v2.3:Gears>
+        </v2.0:Data>
+        <v2.0:Signature>
+            <di:Reference URI="#GBX-asdf">
+                <di:Transforms>
+                    <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                    <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                </di:Transforms>
+                <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                <di:DigestValue>BlXQyrK6qVsW5MHt74jB1Y1+a9toEwNC5KXYUmKawfQ=</di:DigestValue>
+            </di:Reference>
+        </v2.0:Signature>
+    </tns:Gearbox>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCommon/VectoHashingTest/VectoComponentHashSortTest.cs b/VectoCommon/VectoHashingTest/VectoComponentHashSortTest.cs
new file mode 100644
index 0000000000000000000000000000000000000000..ea0a729c101bfaf3544630b709f5e537d8e1b762
--- /dev/null
+++ b/VectoCommon/VectoHashingTest/VectoComponentHashSortTest.cs
@@ -0,0 +1,148 @@
+using System.IO;
+using NUnit.Framework;
+using TUGraz.VectoCommon.Hashing;
+using TUGraz.VectoHashing;
+
+namespace VectoHashingTest
+{
+	public class VectoComponentHashSortTest
+	{
+		private const string UnsortedComponentPath = @"Testdata\XML\Sort\Component\Unsorted\";
+		private const string SortedComponentPath = @"Testdata\XML\Sort\Component\Sorted\";
+		
+		[OneTimeSetUp]
+		public void RunBeforeAnyTests()
+		{
+			Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
+		}
+		
+		[TestCase("sYOwPn3VlMw71bjQFfACuekdAjZ8QRT3S8c71w7810A=", SortedComponentPath + "Engine.xml"),
+		TestCase("sYOwPn3VlMw71bjQFfACuekdAjZ8QRT3S8c71w7810A=",  UnsortedComponentPath + "Engine.xml")]
+		public void TestEngineHashSort(string expectedHash, string filePath)
+		{
+			var loadedFile = VectoHash.Load(filePath);
+			Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.Engine));
+		}
+
+		[TestCase("lYoUAB6Xob1azFaCPJBLK1HIT5Jr0K24H2jJec3r5BM=", SortedComponentPath + "Gearbox_APT-N.xml"),
+		TestCase("lYoUAB6Xob1azFaCPJBLK1HIT5Jr0K24H2jJec3r5BM=", UnsortedComponentPath + "Gearbox_APT-N.xml")]
+		public void TestGearboxAPT_NComponentHashSort(string expectedHash, string filePath)
+		{
+			var loadedFile = VectoHash.Load(filePath);
+			Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.Gearbox));
+		}
+		
+		[TestCase("BlXQyrK6qVsW5MHt74jB1Y1+a9toEwNC5KXYUmKawfQ=", SortedComponentPath + "Gearbox_FWD.xml"),
+		TestCase("BlXQyrK6qVsW5MHt74jB1Y1+a9toEwNC5KXYUmKawfQ=", UnsortedComponentPath + "Gearbox_FWD.xml")]
+		public void TestGearboxFWDComponentHashSort(string expectedHash, string filePath)
+		{
+			var loadedFile = VectoHash.Load(filePath);
+			Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.Gearbox));
+		}
+
+		[TestCase("QVPf1HhUClM3JoxJHTVqcp2gPXMiqaZ5vFTVyjnG1Co=", SortedComponentPath + "Gearbox_IHPC.xml"),
+		TestCase("QVPf1HhUClM3JoxJHTVqcp2gPXMiqaZ5vFTVyjnG1Co=", UnsortedComponentPath + "Gearbox_IHPC.xml")]
+		public void TestGearboxIHPCComponentHashSort(string expectedHash, string filePath)
+		{
+			var loadedFile = VectoHash.Load(filePath);
+			Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.Gearbox));
+		}
+		
+		[TestCase("MCdQW6mfKSC6WVU+1A5UVLkxKc7eBbg4GWQp6KpzjEw=", SortedComponentPath + "Axlegear.xml"),
+		TestCase("MCdQW6mfKSC6WVU+1A5UVLkxKc7eBbg4GWQp6KpzjEw=", UnsortedComponentPath + "Axlegear.xml")]
+		public void TestAxlegearComponentHashSort(string expectedHash, string filePath)
+		{
+			var loadedFile = VectoHash.Load(filePath);
+			Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.Axlegear));
+		}
+		
+		[TestCase("lFLmCC4J39gaYU+VNw4q6ScyWOBzKoeVqmQ8/mQizBQ=", SortedComponentPath + "Angledrive.xml"),
+		TestCase("lFLmCC4J39gaYU+VNw4q6ScyWOBzKoeVqmQ8/mQizBQ=", UnsortedComponentPath + "Angledrive.xml")]
+		public void TestAngledriveComponentHashSort(string expectedHash, string filePath)
+		{
+			var loadedFile = VectoHash.Load(filePath);
+			Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.Angledrive));
+		}
+		
+		[TestCase("HWRjRcjJ/S1JBoUv+xjhWQDAsRn5c7D4LbwB04yyxrQ=", SortedComponentPath + "ADC.xml"),
+		 TestCase("HWRjRcjJ/S1JBoUv+xjhWQDAsRn5c7D4LbwB04yyxrQ=", UnsortedComponentPath + "ADC.xml")]
+		public void TestADCHashSort(string expectedHash, string filePath)
+		{
+			var loadedFile = VectoHash.Load(filePath);
+			Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.ADC));
+		}
+
+		[TestCase("MNKcycaIzgndCWPEFDp84PlujKPkb9QaOxA8yKGNiKI=", SortedComponentPath + "BatterySystem_1.xml"),
+		TestCase("MNKcycaIzgndCWPEFDp84PlujKPkb9QaOxA8yKGNiKI=", UnsortedComponentPath + "BatterySystem_1.xml")]
+		public void TestBatterySystemHashSort(string expectedHash, string filePath)
+		{
+			var loadedFile = VectoHash.Load(filePath);
+			Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.BatterySystem));
+		}
+
+		[TestCase("dBadIN60l8Iqcanj/nrx1EbD+KixtDxLAusUcutITk8=", SortedComponentPath + "CapacitorSystem_1.xml"),
+		 TestCase("dBadIN60l8Iqcanj/nrx1EbD+KixtDxLAusUcutITk8=", UnsortedComponentPath + "CapacitorSystem_1.xml")]
+		public void TestCapacitorHashSort(string expectedHash, string filePath)
+		{
+			var loadedFile = VectoHash.Load(filePath);
+			Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.CapacitorSystem));
+		}
+
+		[TestCase("6VgGv3QToPDXpr7nSg1fupTLZ8qACAOEshZ8l5pUNI4=", SortedComponentPath + "ElectricMachineSystem-IHPC_1.xml"),
+		TestCase("6VgGv3QToPDXpr7nSg1fupTLZ8qACAOEshZ8l5pUNI4=", UnsortedComponentPath + "ElectricMachineSystem-IHPC_1.xml")]
+		public void TestElectricMachineIHPCHashSort(string expectedHash, string filePath)
+		{
+			var loadedFile = VectoHash.Load(filePath);
+			Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.ElectricMachineSystem));
+		}
+		
+		[TestCase("wLFLpJxFZ6mDXeqdlZCGVOLCoXTCf7XTL0q9ZKkmt7o=", SortedComponentPath + "ElectricMachineSystem_1.xml"),
+		TestCase("wLFLpJxFZ6mDXeqdlZCGVOLCoXTCf7XTL0q9ZKkmt7o=", UnsortedComponentPath + "ElectricMachineSystem_1.xml")]
+		public void TestElectricMachineHashSort(string expectedHash, string filePath)
+		{
+			var loadedFile = VectoHash.Load(filePath);
+			Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.ElectricMachineSystem));
+		}
+
+		[TestCase("qP2WjwhL0iXRHZN7OK1Bz3jEpdP4cuYvOWSeJUu6Rl8=", SortedComponentPath + "ElectricMachineSystem_StdValues.xml"),
+		TestCase("qP2WjwhL0iXRHZN7OK1Bz3jEpdP4cuYvOWSeJUu6Rl8=", UnsortedComponentPath + "ElectricMachineSystem_StdValues.xml")]
+		public void TestElectricMachineStdValuesHashSort(string expectedHash, string filePath)
+		{
+			var loadedFile = VectoHash.Load(filePath);
+			Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.ElectricMachineSystem));
+		}
+
+		[TestCase("3L/fYxKTdIwzADHQMnUBPxcNwZNEHM+sKEC2M32UnEA=", SortedComponentPath + "IEPC_1.xml"),
+		TestCase("3L/fYxKTdIwzADHQMnUBPxcNwZNEHM+sKEC2M32UnEA=", UnsortedComponentPath + "IEPC_1.xml")]
+		public void TestIEPCHashSort(string expectedHash, string filePath)
+		{
+			var loadedFile = VectoHash.Load(filePath);
+			Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.IEPC));
+		}
+		
+		[TestCase("BTHs/Hh2SgycIwU5OSuTgU/2SptMvmRFvPXr2X1Y7XQ=", SortedComponentPath + "IEPC_StdValues.xml"),
+		TestCase("BTHs/Hh2SgycIwU5OSuTgU/2SptMvmRFvPXr2X1Y7XQ=", UnsortedComponentPath + "IEPC_StdValues.xml")]
+		public void TestIEPCStdHashSort(string expectedHash, string filePath)
+		{
+			var loadedFile = VectoHash.Load(filePath);
+			Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.IEPC));
+		}
+
+		[TestCase("fo5vyZY6IeQgfFpGmNV49YdfJlcEsGycJoNa3qqVChM=", SortedComponentPath + "Retarder.xml"),
+		TestCase("fo5vyZY6IeQgfFpGmNV49YdfJlcEsGycJoNa3qqVChM=", UnsortedComponentPath + "Retarder.xml")]
+		public void TestRetarderComponentHashSort(string expectedHash, string filePath)
+		{
+			var loadedFile = VectoHash.Load(filePath);
+			Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.Retarder));
+		}
+		
+		[TestCase("mxPXYmGbF6eUzjxqAp9KXjy96DzMCGm5Xq9WLvNHwVA=", SortedComponentPath + "TorqueConverter.xml"),
+		TestCase("mxPXYmGbF6eUzjxqAp9KXjy96DzMCGm5Xq9WLvNHwVA=", UnsortedComponentPath + "TorqueConverter.xml")]
+		public void TestTorqueConverterComponentHashSort(string expectedHash, string filePath)
+		{
+			var loadedFile = VectoHash.Load(filePath);
+			Assert.AreEqual(expectedHash, loadedFile.ComputeHash(VectoComponents.TorqueConverter));
+		}
+		
+	}
+}
diff --git a/VectoCore/VectoCore/Resources/XSD/ParameterDocumentation.xsd b/VectoCore/VectoCore/Resources/XSD/ParameterDocumentation.xsd
index b0ec9347972f13f506276671f3bb54dcdbc1a48d..09fa6c900e495c7e3570548688cd80995f292b2b 100644
--- a/VectoCore/VectoCore/Resources/XSD/ParameterDocumentation.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/ParameterDocumentation.xsd
@@ -39,6 +39,24 @@
 											<xs:enumeration value="Vehicle/TorqueLimits"/>
 											<xs:enumeration value="Gearshiftstrategy"/>
 											<xs:enumeration value="Vehicle/ADAS"/>
+											<xs:enumeration value="ElectricMachine"/>
+											<xs:enumeration value="ElectricMachine/VoltageLevel"/>
+											<xs:enumeration value="ElectricMachine/MaxMinTorque"/>
+											<xs:enumeration value="ElectricMachine/DragTorque"/>
+											<xs:enumeration value="ElectricMachine/PowerMap"/>
+											<xs:enumeration value="ElectricMachine/Conditioning"/>
+											<xs:enumeration value="IEPC"/>
+											<xs:enumeration value="IEPC/Gear"/>
+											<xs:enumeration value="IEPC/VoltageLevel"/>
+											<xs:enumeration value="IEPC/MaxMinTorque"/>
+											<xs:enumeration value="IEPC/PowerMap"/>
+											<xs:enumeration value="IEPC/Conditioning"/>
+											<xs:enumeration value="BatterySystem"/>
+											<xs:enumeration value="BatterySystem/OCV"/>
+											<xs:enumeration value="BatterySystem/DCIR"/>
+											<xs:enumeration value="BatterySystem/CurrentLimits"/>
+											<xs:enumeration value="CapacitorSystem"/>
+											<xs:enumeration value="IEPC/DragTorque"/>
 										</xs:restriction>
 									</xs:simpleType>
 								</xs:attribute>
@@ -84,6 +102,12 @@
 							<xs:enumeration value="km/h"/>
 							<xs:enumeration value="m/s"/>
 							<xs:enumeration value="mm"/>
+							<xs:enumeration value="V"/>
+							<xs:enumeration value="A"/>
+							<xs:enumeration value="°C"/>
+							<xs:enumeration value="F"/>
+							<xs:enumeration value="mOhm"/>
+							<xs:enumeration value="Ah"/>
 						</xs:restriction>
 					</xs:simpleType>
 				</xs:element>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoComponent.2.1.xsd b/VectoCore/VectoCore/Resources/XSD/VectoComponent.2.1.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..636aa3ed2cd4de3f5d55c0f78261fefb68110099
--- /dev/null
+++ b/VectoCore/VectoCore/Resources/XSD/VectoComponent.2.1.xsd
@@ -0,0 +1,37 @@
+<?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.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:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3.xsd"/>
+	<xs:element name="VectoInputDeclaration">
+		<xs:annotation>
+			<xs:documentation>Root Node Declaration Data</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:choice>
+				<xs:element name="Engine" type="vdecdef2.0:EngineComponentDeclarationType"/>
+				<xs:element name="Gearbox" type="vdecdef2.0:GearboxComponentDeclarationType"/>
+				<xs:element name="TorqueConverter" type="vdecdef2.0:TorqueConverterComponentDeclarationType"/>
+				<xs:element name="Retarder" type="vdecdef2.0:RetarderComponentDeclarationType"/>
+				<xs:element name="Axlegear" type="vdecdef2.0:AxlegearComponentDeclarationType"/>
+				<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.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>
+					<xs:restriction base="xs:decimal">
+						<xs:minExclusive value="0"/>
+						<xs:fractionDigits value="1"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd
index 7052c4d1ab16b2c6475bb4625ee437f61a730fc8..4446bde2f98d1574e43654e8c5a4858d88114e5b 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd
@@ -8,5 +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.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.3.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..35d1a1850b8990913920f8f5c323784ea7f49e60
--- /dev/null
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3.xsd
@@ -0,0 +1,2365 @@
+<?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: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:complexType name="AbstractADCDataDeclarationType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="v1.0:AbstractAngledriveDataDeclarationType"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="AbstractBatterySystemDataType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="v2.3:AbstractREESSDataType"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="AbstractCapacitorSystemDataType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="v2.3:AbstractREESSDataType"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="AbstractElectricMachineSystemDataType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="v1.0:VectoSimulationComponent"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="AbstractElectricMachineSystemVoltageLevelType" abstract="true"/>
+	<xs:complexType name="AbstractIEPCDataType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="v1.0:VectoSimulationComponent"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="AbstractIEPCGearsDeclarationType" abstract="true"/>
+	<xs:complexType name="AbstractREESSDataType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="v1.0:VectoSimulationComponent"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="ADCComponentDeclarationType">
+		<xs:sequence>
+			<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.3:AbstractADCDataDeclarationType">
+				<xs:sequence>
+					<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+						<xs:annotation>
+							<xs:documentation>P220 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Model" type="v1.0:ModelType">
+						<xs:annotation>
+							<xs:documentation>P221 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+						<xs:annotation>
+							<xs:documentation>P265 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+						<xs:annotation>
+							<xs:documentation>P223 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="AppVersion" type="v1.0:AppVersionType">
+						<xs:annotation>
+							<xs:documentation>P224 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Ratio" type="v1.0:AngledriveRatioType">
+						<xs:annotation>
+							<xs:documentation>P176 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="CertificationMethod" type="v1.0:AngledriveCertificationOptionType">
+						<xs:annotation>
+							<xs:documentation>P258 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TorqueLossMap">
+						<xs:complexType>
+							<xs:sequence minOccurs="4" maxOccurs="unbounded">
+								<xs:element name="Entry" type="v2.0:AngledriveLossMapEntryType"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="BatteryComponentDeclarationType">
+		<xs:sequence>
+			<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.3:BatterySoCType" use="required">
+			<xs:annotation>
+				<xs:documentation>P529 - [%]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="maxChargingCurrent" type="v2.3:BatteryMaxCurrentType" use="required">
+			<xs:annotation>
+				<xs:documentation>P530 - A]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="maxDischargingCurrent" type="v2.3:BatteryMaxCurrentType" use="required">
+			<xs:annotation>
+				<xs:documentation>P531 - [A]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="BatterySystemDataType">
+		<xs:complexContent>
+			<xs:extension base="v2.3:AbstractBatterySystemDataType">
+				<xs:sequence>
+					<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+						<xs:annotation>
+							<xs:documentation>P511 - [-]</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="BatterySystem">511</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Model" type="v1.0:ModelType">
+						<xs:annotation>
+							<xs:documentation>P512 - [-]</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="BatterySystem">512</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+						<xs:annotation>
+							<xs:documentation>P513 - [-]</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="BatterySystem">513</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+						<xs:annotation>
+							<xs:documentation>P514 - [-]</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="BatterySystem">514</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="AppVersion" type="v1.0:AppVersionType">
+						<xs:annotation>
+							<xs:documentation>P515 - [-]</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="BatterySystem">515</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="CertificationMethod" type="v2.3:CertificationMethodType">
+						<xs:annotation>
+							<xs:documentation>P516 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="BatteryType" type="v2.3:BatteryTypeType">
+						<xs:annotation>
+							<xs:documentation>P517 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="RatedCapacity">
+						<xs:annotation>
+							<xs:documentation>P518 - [Ah]</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="BatterySystem">518</vectoParam:parameterId>
+									<vectoParam:unit>Ah</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+						<xs:simpleType>
+							<xs:restriction base="v1.0:Double2">
+								<xs:minExclusive value="0.00"/>
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+					<xs:element name="ConnectorsSubsystemsIncluded" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P519 - bool</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="BatterySystem">519</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="JunctionboxIncluded" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P520 - bool</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="BatterySystem">520</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TestingTemperature" type="xs:int" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>P521 - [°C]</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="BatterySystem">521</vectoParam:parameterId>
+									<vectoParam:unit>°C</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="OCV">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Entry" type="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.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.3:BatterySystemCurrentLimitsEntryType" minOccurs="2" maxOccurs="unbounded"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="BatterySystemInternalResistanceEntryType">
+		<xs:attribute name="SoC" type="v2.3:BatterySoCType" use="required">
+			<xs:annotation>
+				<xs:documentation>P524 - [%]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="R_2" type="v2.3:InternalResistanceType" use="required">
+			<xs:annotation>
+				<xs:documentation>P525 - [mOhm]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="R_10" type="v2.3:InternalResistanceType" use="required">
+			<xs:annotation>
+				<xs:documentation>P526 - [mOhm]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="R_20" type="v2.3:InternalResistanceType" use="required">
+			<xs:annotation>
+				<xs:documentation>P527 - [mOhm]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="R_120" type="v2.3:InternalResistanceType">
+			<xs:annotation>
+				<xs:documentation>P528 - [mOhm]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="BatterySystemOCVEntryType">
+		<xs:attribute name="SoC" type="v2.3:BatterySoCType" use="required">
+			<xs:annotation>
+				<xs:documentation>P522 - [%]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="OCV" type="v2.3:BatteryOCVType" use="required">
+			<xs:annotation>
+				<xs:documentation>P523 - [V]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="CapacitorSystemComponentDeclarationType">
+		<xs:sequence>
+			<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.3:AbstractCapacitorSystemDataType">
+				<xs:sequence>
+					<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+						<xs:annotation>
+							<xs:documentation>P532 - [-]</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="CapacitorSystem">532</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Model" type="v1.0:ModelType">
+						<xs:annotation>
+							<xs:documentation>P533 - [-]</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="CapacitorSystem">533</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+						<xs:annotation>
+							<xs:documentation>P534 - [-]</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="CapacitorSystem">534</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+						<xs:annotation>
+							<xs:documentation>P535 - [-]</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="CapacitorSystem">535</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="AppVersion" type="v1.0:AppVersionType">
+						<xs:annotation>
+							<xs:documentation>P536 - [-]</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="CapacitorSystem">536</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="CertificationMethod" type="v2.3:CertificationMethodType">
+						<xs:annotation>
+							<xs:documentation>P537 - enum</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="CapacitorSystem">537</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Capacitance" type="v2.3:CapacitanceType">
+						<xs:annotation>
+							<xs:documentation>P538 - [F]</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="CapacitorSystem">538</vectoParam:parameterId>
+									<vectoParam:unit>F</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="InternalResistance" type="v2.3:InternalResistanceType">
+						<xs:annotation>
+							<xs:documentation>P539 - [mOhm]</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="CapacitorSystem">539</vectoParam:parameterId>
+									<vectoParam:unit>mOhm</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MinVoltage" type="v2.3:CapacitorVoltageType">
+						<xs:annotation>
+							<xs:documentation>P540 - [V]</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="CapacitorSystem">540</vectoParam:parameterId>
+									<vectoParam:unit>V</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MaxVoltage" type="v2.3:CapacitorVoltageType">
+						<xs:annotation>
+							<xs:documentation>P541 - [V]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MaxChargingCurrent" type="v2.3:CapacitorMaxCurrentType">
+						<xs:annotation>
+							<xs:documentation>P542 - [A]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MaxDischargingCurrent" type="v2.3:CapacitorMaxCurrentType">
+						<xs:annotation>
+							<xs:documentation>P543 - [A]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TestingTemperature" type="xs:int" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>P544 - [°C]</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="CapacitorSystem">544</vectoParam:parameterId>
+									<vectoParam:unit>°C</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="ElectricMachineSystemComponentDeclarationType">
+		<xs:sequence>
+			<xs:element name="Data" type="v2.3:AbstractElectricMachineSystemDataType"/>
+			<xs:element name="Signature" type="v2.0:SignatureType"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="ElectricMachineSystemConditioningEntryType">
+		<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.3:CoolingPowerType" use="required">
+			<xs:annotation>
+				<xs:documentation>P477 - [W]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="ElectricMachineSystemDragTorqueEntryType">
+		<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.3:DragTorqueType" use="required">
+			<xs:annotation>
+				<xs:documentation>P472 - [Nm]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="ElectricMachineSystemIHPCMeasuredDataDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="v2.3:AbstractElectricMachineSystemDataType">
+				<xs:sequence>
+					<xs:group ref="v2.3:ElectricMachineSystemCommonParametersSequenceGroup"/>
+					<xs:element name="CertificationMethod">
+						<xs:annotation>
+							<xs:documentation>P456 - enum</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">456</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+						<xs:simpleType>
+							<xs:restriction base="v2.3:CertificationMethodType">
+								<xs:enumeration value="Measured"/>
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+					<xs:group ref="v2.3:ElectricMachineSystemPowerRatingsSequenceGroup"/>
+					<xs:element name="DcDcConverterIncluded" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P465 - bool</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">465</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="IHPCType">
+						<xs:annotation>
+							<xs:documentation>P466 - enum</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">466</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+						<xs:simpleType>
+							<xs:restriction base="v2.3:IHPCTypeType">
+								<xs:enumeration value="IHPC Type 1"/>
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+					<xs:element name="VoltageLevel" type="v2.3:ElectricMachineSystemIHPCVoltageLevelMeasuredType" minOccurs="2" maxOccurs="unbounded"/>
+					<xs:element name="DragCurve">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Entry" type="v2.3:ElectricMachineSystemDragTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="Conditioning" minOccurs="0">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Entry" type="v2.3:ElectricMachineSystemConditioningEntryType" maxOccurs="unbounded"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="ElectricMachineSystemIHPCVoltageLevelMeasuredType">
+		<xs:complexContent>
+			<xs:extension base="v2.3:AbstractElectricMachineSystemVoltageLevelType">
+				<xs:sequence>
+					<xs:element name="Voltage" type="v2.3:VoltageLevelVoltageType">
+						<xs:annotation>
+							<xs:documentation>P467 - [V]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ContinuousTorque" type="v2.3:MaxTorqueType">
+						<xs:annotation>
+							<xs:documentation>P459 - [Nm]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TestSpeedContinuousTorque" type="v2.3:TestSpeedType">
+						<xs:annotation>
+							<xs:documentation>P460 - [1/min]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="OverloadTorque" type="v2.3:MaxTorqueType">
+						<xs:annotation>
+							<xs:documentation>P461 - [Nm]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TestSpeedOverloadTorque" type="v2.3:TestSpeedType">
+						<xs:annotation>
+							<xs:documentation>P462 - [1/min]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="OverloadDuration" type="v2.3:OverloadDurationType">
+						<xs:annotation>
+							<xs:documentation>P463 - [s]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MaxTorqueCurve">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Entry" type="v2.3:ElectricMachineSystemMaxTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="PowerMap" maxOccurs="unbounded">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Entry" type="v2.3:ElectricMachineSystemPowerMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
+							</xs:sequence>
+							<xs:attribute name="gear" use="required">
+								<xs:simpleType>
+									<xs:restriction base="xs:int">
+										<xs:minInclusive value="1"/>
+									</xs:restriction>
+								</xs:simpleType>
+							</xs:attribute>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="ElectricMachineSystemMaxTorqueCurveType">
+		<xs:sequence>
+			<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.3:OutShaftSpeedType" use="required">
+			<xs:annotation>
+				<xs:documentation>P468 - [rpm]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<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.3:minTorqueType" use="required">
+			<xs:annotation>
+				<xs:documentation>P470 - [Nm]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="ElectricMachineSystemMeasuredDataDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="v2.3:AbstractElectricMachineSystemDataType">
+				<xs:sequence>
+					<xs:group ref="v2.3:ElectricMachineSystemCommonParametersSequenceGroup"/>
+					<xs:element name="CertificationMethod">
+						<xs:annotation>
+							<xs:documentation>P456 - enum</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">456</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+						<xs:simpleType>
+							<xs:restriction base="v2.3:CertificationMethodType">
+								<xs:enumeration value="Measured"/>
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+					<xs:group ref="v2.3:ElectricMachineSystemPowerRatingsSequenceGroup"/>
+					<xs:element name="DcDcConverterIncluded" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P465 - bool</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">465</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="IHPCType">
+						<xs:annotation>
+							<xs:documentation>P466 - enum</xs:documentation>
+						</xs:annotation>
+						<xs:simpleType>
+							<xs:restriction base="v2.3:IHPCTypeType">
+								<xs:enumeration value="None"/>
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+					<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.3:ElectricMachineSystemDragTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="Conditioning" minOccurs="0">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Entry" type="v2.3:ElectricMachineSystemConditioningEntryType" maxOccurs="unbounded"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="ElectricMachineSystemPowerMapEntryType">
+		<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.3:PowerMapTorqueType" use="required">
+			<xs:annotation>
+				<xs:documentation>P474 - [Nm]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="electricPower" type="v2.3:PowerMapElectricPowerType" use="required">
+			<xs:annotation>
+				<xs:documentation>P475 - [W]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="ElectricMachineSystemStandardValuesDataDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="v2.3:AbstractElectricMachineSystemDataType">
+				<xs:sequence>
+					<xs:group ref="v2.3:ElectricMachineSystemCommonParametersSequenceGroup"/>
+					<xs:element name="CertificationMethod">
+						<xs:annotation>
+							<xs:documentation>P456 - enum</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">456</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+						<xs:simpleType>
+							<xs:restriction base="v2.3:CertificationMethodType">
+								<xs:enumeration value="Standard values"/>
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+					<xs:group ref="v2.3:ElectricMachineSystemPowerRatingsSequenceGroup"/>
+					<xs:element name="DcDcConverterIncluded" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P465 - bool</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">465</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="IHPCType">
+						<xs:annotation>
+							<xs:documentation>P466 - enum</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">466</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+						<xs:simpleType>
+							<xs:restriction base="v2.3:IHPCTypeType">
+								<xs:enumeration value="None"/>
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+					<xs:element name="VoltageLevel" type="v2.3:ElectricMachineSystemVoltageLevelStandardValuesType"/>
+					<xs:element name="DragCurve">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Entry" type="v2.3:ElectricMachineSystemDragTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="ElectricMachineSystemVoltageLevelMeasuredType">
+		<xs:complexContent>
+			<xs:extension base="v2.3:AbstractElectricMachineSystemVoltageLevelType">
+				<xs:sequence>
+					<xs:element name="Voltage" type="v2.3:VoltageLevelVoltageType">
+						<xs:annotation>
+							<xs:documentation>P467 - [V]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ContinuousTorque" type="v2.3:MaxTorqueType">
+						<xs:annotation>
+							<xs:documentation>P459 - [Nm]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TestSpeedContinuousTorque" type="v2.3:TestSpeedType">
+						<xs:annotation>
+							<xs:documentation>P460 - [1/min]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="OverloadTorque" type="v2.3:MaxTorqueType">
+						<xs:annotation>
+							<xs:documentation>P461 - [Nm]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TestSpeedOverloadTorque" type="v2.3:TestSpeedType">
+						<xs:annotation>
+							<xs:documentation>P462 - [1/min]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="OverloadDuration" type="v2.3:OverloadDurationType">
+						<xs:annotation>
+							<xs:documentation>P463 - [s]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MaxTorqueCurve" type="v2.3:ElectricMachineSystemMaxTorqueCurveType"/>
+					<xs:element name="PowerMap">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Entry" type="v2.3:ElectricMachineSystemPowerMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="ElectricMachineSystemVoltageLevelStandardValuesType">
+		<xs:complexContent>
+			<xs:extension base="v2.3:AbstractElectricMachineSystemVoltageLevelType">
+				<xs:sequence>
+					<xs:element name="ContinuousTorque" type="v2.3:MaxTorqueType">
+						<xs:annotation>
+							<xs:documentation>P459 - [Nm]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TestSpeedContinuousTorque" type="v2.3:TestSpeedType">
+						<xs:annotation>
+							<xs:documentation>P460 - [1/min]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="OverloadTorque" type="v2.3:MaxTorqueType">
+						<xs:annotation>
+							<xs:documentation>P461 - [Nm]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TestSpeedOverloadTorque" type="v2.3:TestSpeedType">
+						<xs:annotation>
+							<xs:documentation>P462 - [1/min]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="OverloadDuration" type="v2.3:OverloadDurationType">
+						<xs:annotation>
+							<xs:documentation>P463 - [s]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MaxTorqueCurve">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Entry" type="v2.3:ElectricMachineSystemMaxTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="PowerMap">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Entry" type="v2.3:ElectricMachineSystemPowerMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<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="GearboxDataDeclarationType">
+		<xs:annotation>
+			<xs:documentation>Gearbox Component</xs:documentation>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="v1.0:AbstractTransmissionDataDeclarationType">
+				<xs:sequence>
+					<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+						<xs:annotation>
+							<xs:documentation>P205 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Model" type="v1.0:ModelType">
+						<xs:annotation>
+							<xs:documentation>P206 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+						<xs:annotation>
+							<xs:documentation>P262 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+						<xs:annotation>
+							<xs:documentation>P208 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="AppVersion" type="v1.0:AppVersionType">
+						<xs:annotation>
+							<xs:documentation>P209 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TransmissionType" type="v2.3:GearboxTransmissionTypeType">
+						<xs:annotation>
+							<xs:documentation>P076 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MainCertificationMethod" type="v1.0:GearboxCertificationOptionType">
+						<xs:annotation>
+							<xs:documentation>P254 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Gears" type="v2.0:AbstractGearsDeclarationType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="GearboxFWDDataDeclarationType">
+		<xs:annotation>
+			<xs:documentation>Gearbox Component</xs:documentation>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="v1.0:AbstractTransmissionDataDeclarationType">
+				<xs:sequence>
+					<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+						<xs:annotation>
+							<xs:documentation>P205 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Model" type="v1.0:ModelType">
+						<xs:annotation>
+							<xs:documentation>P206 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+						<xs:annotation>
+							<xs:documentation>P262 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+						<xs:annotation>
+							<xs:documentation>P208 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="AppVersion" type="v1.0:AppVersionType">
+						<xs:annotation>
+							<xs:documentation>P209 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TransmissionType" type="v1.0:GearboxTransmissionTypeType">
+						<xs:annotation>
+							<xs:documentation>P076 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MainCertificationMethod" type="v1.0:GearboxCertificationOptionType">
+						<xs:annotation>
+							<xs:documentation>P254 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DifferentialIncluded" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P353 - [bool]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="AxlegearRatio" type="v1.0:Double3">
+						<xs:annotation>
+							<xs:documentation>P150 - [-]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Gears" type="v2.0:AbstractGearsDeclarationType"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="IEPCComponentDeclarationType">
+		<xs:sequence>
+			<xs:element name="Data" type="v2.3:AbstractIEPCDataType"/>
+			<xs:element name="Signature" type="v2.0:SignatureType"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="IEPCGearDeclarationType">
+		<xs:sequence>
+			<xs:element name="Ratio" type="v1.0:GearboxGearRatioType">
+				<xs:annotation>
+					<xs:documentation>P497 - [-]</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="MaxOutShaftTorque" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>P498 - [Nm]</xs:documentation>
+				</xs:annotation>
+				<xs:simpleType>
+					<xs:restriction base="xs:int">
+						<xs:minExclusive value="0"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="MaxOutShaftSpeed" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>P499 - [1/min]</xs:documentation>
+				</xs:annotation>
+				<xs:simpleType>
+					<xs:restriction base="xs:int">
+						<xs:minExclusive value="0"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+		</xs:sequence>
+		<xs:attribute name="number" type="v1.0:GearboxGearNumberType" use="required">
+			<xs:annotation>
+				<xs:documentation>P496 - [-]</xs:documentation>
+				<xs:appinfo>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="IEPCGearsDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="v2.3:AbstractIEPCGearsDeclarationType">
+				<xs:sequence>
+					<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.3:AbstractIEPCDataType">
+				<xs:sequence>
+					<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.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.3:IEPCPowerRatingsSequenceGroup"/>
+					<xs:element name="DifferentialIncluded" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P493 - bool</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="IEPC">493</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DesignTypeWheelMotor" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P494 - bool</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="IEPC">494</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="NrOfDesignTypeWheelMotorMeasured" type="v2.3:NrOfDesignTypeWheelMotorMeasuredType" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>P495 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Gears" type="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.3:IEPCSystemDragTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
+							</xs:sequence>
+							<xs:attribute name="gear" use="required">
+								<xs:simpleType>
+									<xs:restriction base="xs:int">
+										<xs:minInclusive value="1"/>
+									</xs:restriction>
+								</xs:simpleType>
+							</xs:attribute>
+						</xs:complexType>
+					</xs:element>
+					<xs:element name="Conditioning" minOccurs="0">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Entry" type="v2.3:IEPCSystemConditioningEntryType"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="IEPCStandardValuesDataDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="v2.3:AbstractIEPCDataType">
+				<xs:sequence>
+					<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.3:IEPCCertificationMethodType">
+								<xs:enumeration value="Standard values for all components"/>
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+					<xs:group ref="v2.3:IEPCPowerRatingsSequenceGroup"/>
+					<xs:element name="DifferentialIncluded" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P493 - bool</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DesignTypeWheelMotor" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P494 - bool</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="NrOfDesignTypeWheelMotorMeasured" type="v2.3:NrOfDesignTypeWheelMotorMeasuredType" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>P495 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Gears" type="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.3:IEPCSystemDragTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="IEPCSystemConditioningEntryType">
+		<xs:attribute name="coolantTempInlet" type="v2.3:CoolantTempInletType" use="required">
+			<xs:annotation>
+				<xs:documentation>P509 - [°C]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="coolingPower" type="v2.3:CoolingPowerType" use="required">
+			<xs:annotation>
+				<xs:documentation>P510 - [W]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="IEPCSystemDragTorqueEntryType">
+		<xs:attribute name="outShaftSpeed" type="v2.3:OutShaftSpeedType" use="required">
+			<xs:annotation>
+				<xs:documentation>P504 - [rpm]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="dragTorque" type="v2.3:DragTorqueType" use="required">
+			<xs:annotation>
+				<xs:documentation>P505 - [Nm]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="IEPCSystemMaxTorqueEntryType">
+		<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.3:maxTorqueType" use="required">
+			<xs:annotation>
+				<xs:documentation>P502 - [Nm]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<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.3:OutShaftSpeedType" use="required">
+			<xs:annotation>
+				<xs:documentation>P506 - [rpm]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<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.3:PowerMapElectricPowerType" use="required">
+			<xs:annotation>
+				<xs:documentation>P508 - [W]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+	</xs:complexType>
+	<xs:complexType name="IEPCSystemVoltageLevelMeasuredType">
+		<xs:complexContent>
+			<xs:extension base="v2.3:AbstractElectricMachineSystemVoltageLevelType">
+				<xs:sequence>
+					<xs:element name="Voltage" type="v2.3:VoltageLevelVoltageType">
+						<xs:annotation>
+							<xs:documentation>P500 - [V]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="ContinuousTorque" type="v2.3:MaxTorqueType">
+						<xs:annotation>
+							<xs:documentation>P487 - [Nm]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TestSpeedContinuousTorque" type="v2.3:TestSpeedType">
+						<xs:annotation>
+							<xs:documentation>P488 - [1/min]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="OverloadTorque" type="v2.3:MaxTorqueType">
+						<xs:annotation>
+							<xs:documentation>P489 - [Nm]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TestSpeedOverloadTorque" type="v2.3:TestSpeedType">
+						<xs:annotation>
+							<xs:documentation>P490 - [1/min]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="OverloadDuration" type="v2.3:OverloadDurationType">
+						<xs:annotation>
+							<xs:documentation>P491 - [s]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MaxTorqueCurve" type="v2.3:ElectricMachineSystemMaxTorqueCurveType"/>
+					<xs:element name="PowerMap" maxOccurs="unbounded">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="Entry" type="v2.3:IEPCSystemPowerMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
+							</xs:sequence>
+							<xs:attribute name="gear" use="required">
+								<xs:simpleType>
+									<xs:restriction base="xs:int">
+										<xs:minInclusive value="1"/>
+									</xs:restriction>
+								</xs:simpleType>
+							</xs:attribute>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="IEPCSystemVoltageLevelStandardValuesType">
+		<xs:complexContent>
+			<xs:extension base="v2.3:AbstractElectricMachineSystemVoltageLevelType">
+				<xs:sequence>
+					<xs:element name="ContinuousTorque" type="v2.3:MaxTorqueType">
+						<xs:annotation>
+							<xs:documentation>P487 - [Nm]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TestSpeedContinuousTorque" type="v2.3:TestSpeedType">
+						<xs:annotation>
+							<xs:documentation>P488 - [1/min]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="OverloadTorque" type="v2.3:MaxTorqueType">
+						<xs:annotation>
+							<xs:documentation>P489 - [Nm]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TestSpeedOverloadTorque" type="v2.3:TestSpeedType">
+						<xs:annotation>
+							<xs:documentation>P490 - [1/min]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="OverloadDuration" type="v2.3:OverloadDurationType">
+						<xs:annotation>
+							<xs:documentation>P491 - [s]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="MaxTorqueCurve">
+						<xs:complexType>
+							<xs:sequence>
+								<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.3:IEPCSystemPowerMapEntryType" minOccurs="4" maxOccurs="unbounded"/>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="REESSComponentDeclarationType">
+		<xs:sequence>
+			<xs:element name="Data" type="v2.3:AbstractREESSDataType"/>
+			<xs:element name="Signature" type="v2.0:SignatureType"/>
+		</xs:sequence>
+	</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="BatteryMaxCurrentType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="BatterySystem/CurrentLimits">530</vectoParam:parameterId>
+					<vectoParam:parameterId component="BatterySystem/CurrentLimits">531</vectoParam:parameterId>
+					<vectoParam:unit>A</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="v1.0:Double2">
+			<xs:minInclusive value="0.00"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="BatteryOCVType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="BatterySystem/OCV">523</vectoParam:parameterId>
+					<vectoParam:unit>V</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="v1.0:Double2">
+			<xs:minExclusive value="0.00"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="BatterySoCType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="BatterySystem/OCV">522</vectoParam:parameterId>
+					<vectoParam:parameterId component="BatterySystem/DCIR">524</vectoParam:parameterId>
+					<vectoParam:parameterId component="BatterySystem/CurrentLimits">529</vectoParam:parameterId>
+					<vectoParam:unit>%</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:int">
+			<xs:minInclusive value="0"/>
+			<xs:maxInclusive value="100"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="BatteryTypeType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="BatterySystem">517</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="HPBS"/>
+			<xs:enumeration value="HEBS"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="CapacitanceType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="CapacitorSystem">538</vectoParam:parameterId>
+					<vectoParam:unit>F</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="v1.0:Double2">
+			<xs:minExclusive value="0.00"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="CapacitorMaxCurrentType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="CapacitorSystem">542</vectoParam:parameterId>
+					<vectoParam:parameterId component="CapacitorSystem">543</vectoParam:parameterId>
+					<vectoParam:unit>A</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="v1.0:Double2">
+			<xs:minExclusive value="0.00"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="CapacitorVoltageType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="CapacitorSystem">540</vectoParam:parameterId>
+					<vectoParam:parameterId component="CapacitorSystem">541</vectoParam:parameterId>
+					<vectoParam:unit>V</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="v1.0:Double2">
+			<xs:minInclusive value="0.00"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="CertificationMethodType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="ElectricMachine">456</vectoParam:parameterId>
+					<vectoParam:parameterId component="IEPC">484</vectoParam:parameterId>
+					<vectoParam:parameterId component="BatterySystem">516</vectoParam:parameterId>
+					<vectoParam:parameterId component="CapacitorSystem">537</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Measured"/>
+			<xs:enumeration value="Standard values"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="CoolantTempInletType">
+		<xs:annotation>
+			<xs:documentation>P476, P509 - [°C]</xs:documentation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="ElectricMachine/Conditioning">476</vectoParam:parameterId>
+					<vectoParam:parameterId component="IEPC/Conditioning">509</vectoParam:parameterId>
+					<vectoParam:unit>°C</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:int"/>
+	</xs:simpleType>
+	<xs:simpleType name="CoolingPowerType">
+		<xs:annotation>
+			<xs:documentation>P477, P510 - [W]</xs:documentation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="ElectricMachine/Conditioning">477</vectoParam:parameterId>
+					<vectoParam:parameterId component="IEPC/Conditioning">510</vectoParam:parameterId>
+					<vectoParam:unit>W</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:int"/>
+	</xs:simpleType>
+	<xs:simpleType name="DragTorqueType">
+		<xs:annotation>
+			<xs:documentation>P472, P505 - [Nm]</xs:documentation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="ElectricMachine/DragTorque">472</vectoParam:parameterId>
+					<vectoParam:parameterId component="IEPC/DragTorque">505</vectoParam:parameterId>
+					<vectoParam:unit>Nm</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="v1.0:Double2"/>
+	</xs:simpleType>
+	<xs:simpleType name="ElectricMachineTypeType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="ElectricMachine">455</vectoParam:parameterId>
+					<vectoParam:parameterId component="IEPC">483</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="ASM"/>
+			<xs:enumeration value="ESM"/>
+			<xs:enumeration value="PSM"/>
+			<xs:enumeration value="RM"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="GearboxTransmissionTypeType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Gearbox">076</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+			<xs:documentation>P076 - [-]</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="SMT"/>
+			<xs:enumeration value="AMT"/>
+			<xs:enumeration value="APT-S"/>
+			<xs:enumeration value="APT-P"/>
+			<xs:enumeration value="APT-N"/>
+			<xs:enumeration value="IHPC Type 1"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="IEPCCertificationMethodType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Measured for complete component"/>
+			<xs:enumeration value="Measured for EM and standard values for other components"/>
+			<xs:enumeration value="Standard values for all components"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="IHPCTypeType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="ElectricMachine">466</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="None"/>
+			<xs:enumeration value="IHPC Type 1"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="InternalResistanceType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="BatterySystem/DCIR">525</vectoParam:parameterId>
+					<vectoParam:parameterId component="BatterySystem/DCIR">526</vectoParam:parameterId>
+					<vectoParam:parameterId component="BatterySystem/DCIR">527</vectoParam:parameterId>
+					<vectoParam:parameterId component="BatterySystem/DCIR">528</vectoParam:parameterId>
+					<vectoParam:unit>mOhm</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="v1.0:Double2">
+			<xs:minExclusive value="0.00"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="MaxTorqueType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="ElectricMachine">459</vectoParam:parameterId>
+					<vectoParam:parameterId component="ElectricMachine">461</vectoParam:parameterId>
+					<vectoParam:parameterId component="IEPC">487</vectoParam:parameterId>
+					<vectoParam:parameterId component="IEPC">489</vectoParam:parameterId>
+					<vectoParam:unit>Nm</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="v1.0:Double2">
+			<xs:minExclusive value="0.00"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="maxTorqueType">
+		<xs:annotation>
+			<xs:documentation>P469, P502 - [Nm]</xs:documentation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="ElectricMachine/MaxMinTorque">469</vectoParam:parameterId>
+					<vectoParam:parameterId component="IEPC/MaxMinTorque">502</vectoParam:parameterId>
+					<vectoParam:unit>Nm</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="v1.0:Double2">
+			<xs:minInclusive value="0.00"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="minTorqueType">
+		<xs:annotation>
+			<xs:documentation>P470, P503 - [Nm]</xs:documentation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="ElectricMachine/MaxMinTorque">470</vectoParam:parameterId>
+					<vectoParam:parameterId component="IEPC/MaxMinTorque">503</vectoParam:parameterId>
+					<vectoParam:unit>Nm</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="v1.0:Double2">
+			<xs:maxInclusive value="0.00"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="NrOfDesignTypeWheelMotorMeasuredType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="IEPC">495</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:int">
+			<xs:enumeration value="1"/>
+			<xs:enumeration value="2"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="OutShaftSpeedType">
+		<xs:annotation>
+			<xs:documentation>P468, P471, P473, P501, P504, P506 - [rpm]</xs:documentation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="ElectricMachine/MaxMinTorque">468</vectoParam:parameterId>
+					<vectoParam:parameterId component="ElectricMachine/PowerMap">473</vectoParam:parameterId>
+					<vectoParam:parameterId component="IEPC/MaxMinTorque">501</vectoParam:parameterId>
+					<vectoParam:parameterId component="IEPC/PowerMap">506</vectoParam:parameterId>
+					<vectoParam:parameterId component="ElectricMachine/DragTorque">471</vectoParam:parameterId>
+					<vectoParam:parameterId component="IEPC/DragTorque">504</vectoParam:parameterId>
+					<vectoParam:unit>1/min</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="v1.0:Double2">
+			<xs:minInclusive value="0.00"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="OverloadDurationType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="ElectricMachine">463</vectoParam:parameterId>
+					<vectoParam:unit>s</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="v1.0:Double2">
+			<xs:minExclusive value="0.00"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="PowerMapElectricPowerType">
+		<xs:annotation>
+			<xs:documentation>P475, P508 - [W]</xs:documentation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="ElectricMachine/PowerMap">475</vectoParam:parameterId>
+					<vectoParam:parameterId component="IEPC/PowerMap">508</vectoParam:parameterId>
+					<vectoParam:unit>W</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="v1.0:Double2"/>
+	</xs:simpleType>
+	<xs:simpleType name="PowerMapTorqueType">
+		<xs:annotation>
+			<xs:documentation>P474, P507 - [Nm]</xs:documentation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="ElectricMachine/PowerMap">474</vectoParam:parameterId>
+					<vectoParam:parameterId component="IEPC/PowerMap">507</vectoParam:parameterId>
+					<vectoParam:unit>Nm</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="v1.0:Double2"/>
+	</xs:simpleType>
+	<xs:simpleType name="R85RatedPowerType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="ElectricMachine">457</vectoParam:parameterId>
+					<vectoParam:parameterId component="IEPC">483</vectoParam:parameterId>
+					<vectoParam:unit>W</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:int">
+			<xs:minExclusive value="0"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="RotationalInertiaType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="ElectricMachine">458</vectoParam:parameterId>
+					<vectoParam:parameterId component="IEPC">486</vectoParam:parameterId>
+					<vectoParam:unit>kgm²</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="v1.0:Double2">
+			<xs:minExclusive value="0.00"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="TestSpeedType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="ElectricMachine">460</vectoParam:parameterId>
+					<vectoParam:parameterId component="ElectricMachine">462</vectoParam:parameterId>
+					<vectoParam:parameterId component="IEPC">488</vectoParam:parameterId>
+					<vectoParam:parameterId component="IEPC">490</vectoParam:parameterId>
+					<vectoParam:unit>1/min</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="v1.0:Double2">
+			<xs:minExclusive value="0.00"/>
+		</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:enumeration value="425/55 R19.5"/>
+			<xs:enumeration value="425/55 R19.5"/>
+			<xs:enumeration value="205/80 R 15"/>
+			<xs:enumeration value="205/70 R 15"/>
+			<xs:enumeration value="205/70 R17C"/>
+			<xs:enumeration value="285/55 R16C"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="VoltageLevelVoltageType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="ElectricMachine/VoltageLevel">467</vectoParam:parameterId>
+					<vectoParam:parameterId component="IEPC/VoltageLevel">500</vectoParam:parameterId>
+					<vectoParam:unit>V</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:int">
+			<xs:minExclusive value="0"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:group name="ElectricMachineSystemCommonParametersSequenceGroup">
+		<xs:sequence>
+			<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+				<xs:annotation>
+					<xs:documentation>P450 - [-]</xs:documentation>
+					<xs:appinfo>
+						<vectoParam:description>
+							<vectoParam:parameterId component="ElectricMachine">450</vectoParam:parameterId>
+							<vectoParam:unit>-</vectoParam:unit>
+						</vectoParam:description>
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Model" type="v1.0:ModelType">
+				<xs:annotation>
+					<xs:documentation>P451 - [-]</xs:documentation>
+					<xs:appinfo>
+						<vectoParam:description>
+							<vectoParam:parameterId component="ElectricMachine">451</vectoParam:parameterId>
+							<vectoParam:unit>-</vectoParam:unit>
+						</vectoParam:description>
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+				<xs:annotation>
+					<xs:documentation>P452 - [-]</xs:documentation>
+					<xs:appinfo>
+						<vectoParam:description>
+							<vectoParam:parameterId component="ElectricMachine">452</vectoParam:parameterId>
+							<vectoParam:unit>-</vectoParam:unit>
+						</vectoParam:description>
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+				<xs:annotation>
+					<xs:documentation>P453 - [-]</xs:documentation>
+					<xs:appinfo>
+						<vectoParam:description>
+							<vectoParam:parameterId component="ElectricMachine">453</vectoParam:parameterId>
+							<vectoParam:unit>-</vectoParam:unit>
+						</vectoParam:description>
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AppVersion" type="v1.0:AppVersionType">
+				<xs:annotation>
+					<xs:documentation>P454 - [-]</xs:documentation>
+					<xs:appinfo>
+						<vectoParam:description>
+							<vectoParam:parameterId component="ElectricMachine">454</vectoParam:parameterId>
+							<vectoParam:unit>-</vectoParam:unit>
+						</vectoParam:description>
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ElectricMachineType" type="v2.3:ElectricMachineTypeType">
+				<xs:annotation>
+					<xs:documentation>P455 - enum</xs:documentation>
+					<xs:appinfo>
+						<vectoParam:description>
+							<vectoParam:parameterId component="ElectricMachine">455</vectoParam:parameterId>
+							<vectoParam:unit>-</vectoParam:unit>
+						</vectoParam:description>
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:group>
+	<xs:group name="ElectricMachineSystemPowerRatingsSequenceGroup">
+		<xs:sequence>
+			<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.3:RotationalInertiaType">
+				<xs:annotation>
+					<xs:documentation>P458 - [kgm²]</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:group>
+	<xs:group name="IEPCCommonParametersSequenceGroup">
+		<xs:sequence>
+			<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
+				<xs:annotation>
+					<xs:documentation>P478 - [-]</xs:documentation>
+					<xs:appinfo>
+						<vectoParam:description>
+							<vectoParam:parameterId component="IEPC">478</vectoParam:parameterId>
+							<vectoParam:unit>-</vectoParam:unit>
+						</vectoParam:description>
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Model" type="v1.0:ModelType">
+				<xs:annotation>
+					<xs:documentation>P479 - [-]</xs:documentation>
+					<xs:appinfo>
+						<vectoParam:description>
+							<vectoParam:parameterId component="IEPC">479</vectoParam:parameterId>
+							<vectoParam:unit>-</vectoParam:unit>
+						</vectoParam:description>
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
+				<xs:annotation>
+					<xs:documentation>P480 - [-]</xs:documentation>
+					<xs:appinfo>
+						<vectoParam:description>
+							<vectoParam:parameterId component="IEPC">480</vectoParam:parameterId>
+							<vectoParam:unit>-</vectoParam:unit>
+						</vectoParam:description>
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Date" type="v1.0:DateTimeWithTimezone">
+				<xs:annotation>
+					<xs:documentation>P481 - [-]</xs:documentation>
+					<xs:appinfo>
+						<vectoParam:description>
+							<vectoParam:parameterId component="IEPC">481</vectoParam:parameterId>
+							<vectoParam:unit>-</vectoParam:unit>
+						</vectoParam:description>
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="AppVersion" type="v1.0:AppVersionType">
+				<xs:annotation>
+					<xs:documentation>P482 - [-]</xs:documentation>
+					<xs:appinfo>
+						<vectoParam:description>
+							<vectoParam:parameterId component="IEPC">482</vectoParam:parameterId>
+							<vectoParam:unit>-</vectoParam:unit>
+						</vectoParam:description>
+					</xs:appinfo>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ElectricMachineType" type="v2.3:ElectricMachineTypeType">
+				<xs:annotation>
+					<xs:documentation>P483 - enum</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:group>
+	<xs:group name="IEPCPowerRatingsSequenceGroup">
+		<xs:sequence>
+			<xs:element name="R85RatedPower" type="v2.3:R85RatedPowerType">
+				<xs:annotation>
+					<xs:documentation>P485 - [W]</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RotationalInertia" type="v2.3:RotationalInertiaType">
+				<xs:annotation>
+					<xs:documentation>P486 [ kgm2]</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:group>
+</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
index d85651e68a3908dbc4f115ae9df6334edbf19dc0..63cf939381b7ffba241a36a32cca9d56df607db4 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:vdj="urn:tugraz:ivt:VectoAPI:DeclarationJob" xmlns:vdi="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:vdd="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" 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.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
+<!-- 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:vdj="urn:tugraz:ivt:VectoAPI:DeclarationJob" xmlns:vdi="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:vdd="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" 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.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2.1" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
 	<!-- 
 
          This is a convienience file that imports all supported declaration definitions
@@ -11,4 +11,5 @@
 	<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:v2.2.1" schemaLocation="VectoDeclarationDefinitions.2.2.1.xsd"/>
+	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" schemaLocation="VectoDeclarationDefinitions.2.3.xsd"/>
 </xs:schema>
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index b10a02208b746e2c244e625bb6e89f799212a9cc..c905b2c120b3d4a7afda49d26f40be7c67d897af 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -825,6 +825,12 @@
     <EmbeddedResource Include="Resources\Declaration\VAUXBus\SP-Factors_Bus.csv" />
     <None Include="Resources\Declaration\ADASParameters.json" />
     <None Include="Resources\Declaration\EffShiftParameters.vtcu" />
+    <EmbeddedResource Include="Resources\XSD\VectoDeclarationDefinitions.2.3.xsd">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\XSD\VectoComponent.2.1.xsd">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <None Include="Utils\VectoVersionCore.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>VectoVersionCore.cs</LastGenOutput>
diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp
index 6e7c92ec7eecd985e96829dcf9a42dfe3e10190e..8424ec9eea2428c6a66b00ad14f5ad76e077563c 100644
--- a/VectoCore/VectoXML.spp
+++ b/VectoCore/VectoXML.spp
@@ -47,6 +47,45 @@
 			<File FilePath="VectoCoreTest\TestData\XML\EngineeringJob\SampleJobEngineering1.0.xml" HomeFolder="Yes"/>
 			<File FilePath="VectoCoreTest\TestData\XML\EngineeringJob\SampleJobEngineering1.1.xml" HomeFolder="Yes"/>
 		</Folder>
+		<Folder FolderName="HashingTests">
+			<Folder FolderName="Sorted">
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Sorted\ADC.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Sorted\Angledrive.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Sorted\Axlegear.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Sorted\BatterySystem_1.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Sorted\CapacitorSystem_1.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Sorted\ElectricMachineSystem-IHPC_1.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Sorted\ElectricMachineSystem_1.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Sorted\ElectricMachineSystem_StdValues.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Sorted\Engine.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Sorted\Gearbox_APT-N.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Sorted\Gearbox_FWD.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Sorted\Gearbox_IHPC.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Sorted\IEPC_1.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Sorted\IEPC_StdValues.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Sorted\Retarder.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Sorted\TorqueConverter.xml" HomeFolder="Yes"/>
+			</Folder>
+			<Folder FolderName="Unsorted">
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Unsorted\ADC.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Unsorted\Angledrive.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Unsorted\Axlegear.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Unsorted\BatterySystem_1.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Unsorted\CapacitorSystem_1.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Unsorted\ElectricMachineSystem-IHPC_1.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Unsorted\ElectricMachineSystem_1.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Unsorted\ElectricMachineSystem_StdValues.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Unsorted\Engine.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Unsorted\Gearbox_APT-N.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Unsorted\Gearbox_FWD.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Unsorted\Gearbox_IHPC.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Unsorted\IEPC_1.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Unsorted\IEPC_StdValues.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Unsorted\Retarder.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Unsorted\TorqueConverter.xml" HomeFolder="Yes"/>
+				<File FilePath="..\VectoCommon\VectoHashingTest\Testdata\XML\Sort\Component\Unsorted\TrailerAerodynamicDevice.xml" HomeFolder="Yes"/>
+			</Folder>
+		</Folder>
 	</Folder>
 	<Folder FolderName="XSL Files" ExtStr="xsl;xslt">
 		<File FilePath="E:\QUAM\Workspace\VECTO_quam\Documentation\XML\RenderTable.xslt" HomeFolder="Yes"/>
@@ -66,6 +105,7 @@
 			<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.1.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.2.1.xsd" HomeFolder="Yes"/>
 			<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.2.xsd" HomeFolder="Yes"/>
+			<File FilePath="VectoCore\Resources\XSD\VectoDeclarationDefinitions.2.3.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"/>