diff --git a/HashingTool/Helper/HashingHelper.cs b/HashingTool/Helper/HashingHelper.cs
index b9bffa7867358816115723c619b72329a3dda691..9d1f1db7b722b5d5f72a256230be90b230498291 100644
--- a/HashingTool/Helper/HashingHelper.cs
+++ b/HashingTool/Helper/HashingHelper.cs
@@ -105,7 +105,9 @@ namespace HashingTool.Helper
 			var localName = x.DocumentElement.FirstChild.LocalName;
 			var components = new[] {
 				VectoComponents.Engine, VectoComponents.Airdrag, VectoComponents.Angledrive, VectoComponents.Axlegear,
-				VectoComponents.Gearbox, VectoComponents.Retarder, VectoComponents.TorqueConverter, VectoComponents.Tyre
+				VectoComponents.Gearbox, VectoComponents.Retarder, VectoComponents.TorqueConverter, VectoComponents.Tyre,
+				VectoComponents.BatterySystem, VectoComponents.CapacitorSystem, VectoComponents.ElectricMachineSystem,
+				VectoComponents.IEPC, VectoComponents.ADC
 			};
 			var valid = components.Where(c => c.XMLElementName() == localName).Any();
 			if (!valid) {
diff --git a/VectoCommon/VectoCommon/Hashing/VectoComponents.cs b/VectoCommon/VectoCommon/Hashing/VectoComponents.cs
index c9e480966fd5307e3873dd36de3b0b7f1a5c6eb4..cf4150dab29158655bef5c174170228c02eff4a1 100644
--- a/VectoCommon/VectoCommon/Hashing/VectoComponents.cs
+++ b/VectoCommon/VectoCommon/Hashing/VectoComponents.cs
@@ -48,7 +48,12 @@ namespace TUGraz.VectoCommon.Hashing
 		VectoOutput,
 		VectoCustomerInformation,
 		VectoPrimaryVehicleInformation,
-		VectoManufacturingStage
+		VectoManufacturingStage, 
+		BatterySystem,
+		CapacitorSystem,
+		ElectricMachineSystem,
+		IEPC,
+		ADC
 	}
 
 	public static class VectoComponentsExtensionMethods
@@ -82,6 +87,16 @@ namespace TUGraz.VectoCommon.Hashing
 					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;
 				default:
 					throw new ArgumentOutOfRangeException("VectoComponents", component, null);
 			}
@@ -116,6 +131,16 @@ namespace TUGraz.VectoCommon.Hashing
 					return "VEH-";
 				case VectoComponents.VectoManufacturingStage:
 					return "MST-";
+				case VectoComponents.BatterySystem:
+					return "BAT-";
+				case VectoComponents.CapacitorSystem:
+					return "CAP-";
+				case VectoComponents.ElectricMachineSystem:
+					return "EM-";
+				case VectoComponents.IEPC:
+					return "IEPC-";
+				case VectoComponents.ADC:
+					return "ADC-";
 				default:
 					throw new ArgumentOutOfRangeException("VectoComponents", component, null);
 			}
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
index 7fcdf080b1d3d7f3adfd96326fa1610d51f7bb0d..5800ec7894830c20237281b5584cd496a26fd7af 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
@@ -1455,6 +1455,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>
@@ -1509,6 +1518,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>
@@ -1581,6 +1608,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>
@@ -1617,6 +1653,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>
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx
index 6df12b723835495cc88631c12f956382610f6944..1663d199908c98bc550f8e5b7e803266017f29d4 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.resx
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx
@@ -1863,4 +1863,19 @@
   <data name="DragCurve_Gear" xml:space="preserve">
     <value>gear</value>
   </data>
+  <data name="Component_ADC" xml:space="preserve">
+    <value>ADC</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>
 </root>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ADC.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ADC.xml
new file mode 100644
index 0000000000000000000000000000000000000000..37962382b1e653c4fcbb6fd839f4ebeaaaf2eb70
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ADC.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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 xsi:type="v2.10.1:ADCComponentDeclarationType" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+        <Data xsi:type="v2.10.1:ADCDataDeclarationType" id="ADC-123" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1">
+            <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="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.10.1: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>NiyH2Xp0rQswwXIOf52Jm0wvK4Yc2/PL/T+zQCWQGFo=</di:DigestValue>
+            </di:Reference>
+        </v2.10.1:Signature>
+    </tns:ADC>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/BatterySystem_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/BatterySystem_1.xml
index f31d0108db2b9eb082a52182c519f2b723775a5a..c0e380cb74d5dd18aebb2482766c0ec9928a0c91 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/BatterySystem_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/BatterySystem_1.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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 xsi:type="v2.10.1:BatteryComponentDeclarationType">
-		<v2.10.1:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
-			<Manufacturer>a</Manufacturer>
-			<Model>a</Model>
-			<CertificationNumber>token</CertificationNumber>
-			<Date>2017-01-01T00:00:00Z</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="100" OCV="640.00"/>
-			</OCV>
-			<InternalResistance>
-				<Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.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="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/>
-			</CurrentLimits>
-		</v2.10.1:Data>
-		<v2.10.1:Signature>
-			<di:Reference URI="#ENG-gooZah3D">
-				<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>JWEwzKSP0lXvwRgQZTiWJm9dpdtQ72FOX0CC5Vy6f2Y=</di:DigestValue>
-			</di:Reference>
-		</v2.10.1:Signature>
-	</tns:BatterySystem>
-</tns:VectoInputDeclaration>
+    <tns:BatterySystem xsi:type="v2.10.1:BatteryComponentDeclarationType">
+        <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="BatterySystemDataType" id="BAT-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+            <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="100" OCV="640.00" />
+            </OCV>
+            <InternalResistance>
+                <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.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="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00" />
+            </CurrentLimits>
+        </Data>
+        <v2.10.1: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>tam1LGpdznHGFGo+rp0WVr0/6+F2yU2Kv4G4tYvAe+Y=</di:DigestValue>
+            </di:Reference>
+        </v2.10.1:Signature>
+    </tns:BatterySystem>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/CapacitorSystem_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/CapacitorSystem_1.xml
index f50e719ed9f6fca20f28d3f598785732bab88b7d..ce66b98270fffe168e9382f2154aec210c8ad1a4 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/CapacitorSystem_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/CapacitorSystem_1.xml
@@ -1 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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 xsi:type="v2.10.1:CapacitorComponentDeclarationType">
		<v2.10.1:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="CapacitorDataType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
			<Manufacturer>a</Manufacturer>
			<Model>a</Model>
			<CertificationNumber>token</CertificationNumber>
			<Date>2017-01-01T00:00:00Z</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>
		</v2.10.1:Data>
		<v2.10.1:Signature>
			<di:Reference URI="#ENG-gooZah3D">
				<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>JWEwzKSP0lXvwRgQZTiWJm9dpdtQ72FOX0CC5Vy6f2Y=</di:DigestValue>
			</di:Reference>
		</v2.10.1: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.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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 xsi:type="v2.10.1:CapacitorComponentDeclarationType">
+        <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="CapacitorDataType" id="CAP-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+            <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>
+        <v2.10.1: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>
+        </v2.10.1:Signature>
+    </tns:CapacitorSystem>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem-IHPC_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem-IHPC_1.xml
index d0ef9410c05abec0b35b6af50d8ebeb30f1f5b0a..f855a928cbb2f3db1d5b7504fd54998c383f608f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem-IHPC_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem-IHPC_1.xml
@@ -1,79 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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 xsi:type="v2.10.1:ElectricMachineSystemComponentDeclarationType">
-		<v2.10.1:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="ElectricMachineSystemIHPCMeasuredDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
-			<Manufacturer>a</Manufacturer>
-			<Model>a</Model>
-			<CertificationNumber>token</CertificationNumber>
-			<Date>2017-01-01T00:00:00Z</Date>
-			<AppVersion>aaaaa</AppVersion>
-			<ElectricMachineType>ASM</ElectricMachineType>
-			<CertificationMethod>Measured</CertificationMethod>
-			<R85RatedPower>1</R85RatedPower>
-			<RotationalInertia>0.10</RotationalInertia>
-			<ContinuousTorque>200.00</ContinuousTorque>
-			<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
-			<OverloadTorque>400.00</OverloadTorque>
-			<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
-			<OverloadDuration>30.00</OverloadDuration>
-			<TestVoltageOverload>483</TestVoltageOverload>
-			<DcDcConverterIncluded>true</DcDcConverterIncluded>
-			<IHPCType>IHPC Type 1</IHPCType>
-			<VoltageLevel>
-				<Voltage>400</Voltage>
-				<MaxTorqueCurve>
-					<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
-					<Entry outShaftSpeed="4000.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"/>
-				</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"/>
-				</PowerMap>
-			</VoltageLevel>
-			<VoltageLevel>
-				<Voltage>600</Voltage>
-				<MaxTorqueCurve>
-					<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
-					<Entry outShaftSpeed="4000.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"/>
-				</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"/>
-				</PowerMap>
-			</VoltageLevel>
-			<DragCurve>
-				<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
-				<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
-			</DragCurve>
-			<Conditioning>
-				<Entry coolantTempInlet="30" coolingPower="5000"/>
-			</Conditioning>
-		</v2.10.1:Data>
-		<v2.10.1:Signature>
-			<di:Reference URI="#ENG-gooZah3D">
-				<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>JWEwzKSP0lXvwRgQZTiWJm9dpdtQ72FOX0CC5Vy6f2Y=</di:DigestValue>
-			</di:Reference>
-		</v2.10.1:Signature>
-	</tns:ElectricMachineSystem>
-</tns:VectoInputDeclaration>
+    <tns:ElectricMachineSystem xsi:type="v2.10.1:ElectricMachineSystemComponentDeclarationType">
+        <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="ElectricMachineSystemIHPCMeasuredDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+            <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>
+            <ContinuousTorque>200.00</ContinuousTorque>
+            <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+            <OverloadTorque>400.00</OverloadTorque>
+            <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+            <OverloadDuration>30.00</OverloadDuration>
+            <TestVoltageOverload>483</TestVoltageOverload>
+            <DcDcConverterIncluded>true</DcDcConverterIncluded>
+            <IHPCType>IHPC Type 1</IHPCType>
+            <VoltageLevel>
+                <Voltage>400</Voltage>
+                <MaxTorqueCurve>
+                    <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00" />
+                    <Entry outShaftSpeed="4000.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" />
+                </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" />
+                </PowerMap>
+            </VoltageLevel>
+            <VoltageLevel>
+                <Voltage>600</Voltage>
+                <MaxTorqueCurve>
+                    <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00" />
+                    <Entry outShaftSpeed="4000.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" />
+                </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" />
+                </PowerMap>
+            </VoltageLevel>
+            <DragCurve>
+                <Entry outShaftSpeed="0.00" dragTorque="10.00" />
+                <Entry outShaftSpeed="4000.00" dragTorque="30.00" />
+            </DragCurve>
+            <Conditioning>
+                <Entry coolantTempInlet="30" coolingPower="5000" />
+            </Conditioning>
+        </Data>
+        <v2.10.1: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>655T60jN3MstLvX3j5bmvY4kLft2uJbQz2kEk/LIfo8=</di:DigestValue>
+            </di:Reference>
+        </v2.10.1:Signature>
+    </tns:ElectricMachineSystem>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_1.xml
index e58207c3368464f0d8165df7b92a4b968a48bdef..faf7e866d0852959ccd18f74801550cb72bbcf17 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_1.xml
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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 xsi:type="v2.10.1:ElectricMachineSystemComponentDeclarationType">
-		<v2.10.1:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
-			<Manufacturer>a</Manufacturer>
-			<Model>a</Model>
-			<CertificationNumber>token</CertificationNumber>
-			<Date>2017-01-01T00:00:00Z</Date>
-			<AppVersion>aaaaa</AppVersion>
-			<ElectricMachineType>ASM</ElectricMachineType>
-			<CertificationMethod>Measured</CertificationMethod>
-			<R85RatedPower>1</R85RatedPower>
-			<RotationalInertia>0.10</RotationalInertia>
-			<ContinuousTorque>200.00</ContinuousTorque>
-			<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
-			<OverloadTorque>400.00</OverloadTorque>
-			<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
-			<OverloadDuration>30.00</OverloadDuration>
-			<TestVoltageOverload>483</TestVoltageOverload>
-			<DcDcConverterIncluded>true</DcDcConverterIncluded>
-			<IHPCType>None</IHPCType>
-			<VoltageLevel>
-				<Voltage>400</Voltage>
-				<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>
-				<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"/>
-			</Conditioning>
-		</v2.10.1:Data>
-		<v2.10.1:Signature>
-			<di:Reference URI="#ENG-gooZah3D">
-				<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>JWEwzKSP0lXvwRgQZTiWJm9dpdtQ72FOX0CC5Vy6f2Y=</di:DigestValue>
-			</di:Reference>
-		</v2.10.1:Signature>
-	</tns:ElectricMachineSystem>
-</tns:VectoInputDeclaration>
+    <tns:ElectricMachineSystem xsi:type="v2.10.1:ElectricMachineSystemComponentDeclarationType">
+        <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="ElectricMachineSystemMeasuredDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+            <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>
+            <ContinuousTorque>200.00</ContinuousTorque>
+            <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+            <OverloadTorque>400.00</OverloadTorque>
+            <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+            <OverloadDuration>30.00</OverloadDuration>
+            <TestVoltageOverload>483</TestVoltageOverload>
+            <DcDcConverterIncluded>true</DcDcConverterIncluded>
+            <IHPCType>None</IHPCType>
+            <VoltageLevel>
+                <Voltage>400</Voltage>
+                <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>
+                <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" />
+            </Conditioning>
+        </Data>
+        <v2.10.1: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>s2YFYllDgw5jrF+W6Pc9cF4aQfsswnICqlWYgqg9NPI=</di:DigestValue>
+            </di:Reference>
+        </v2.10.1:Signature>
+    </tns:ElectricMachineSystem>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_StdValues.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_StdValues.xml
index 7ce0d0f29da22c1dc3344c7c48d266355a18eca7..7f4838061a9782838c37eb3004c9043531ac3189 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_StdValues.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/ElectricMachineSystem_StdValues.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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 xsi:type="v2.10.1:ElectricMachineSystemComponentDeclarationType">
-		<v2.10.1:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="ElectricMachineSystemStandardValuesDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
-			<Manufacturer>a</Manufacturer>
-			<Model>a</Model>
-			<CertificationNumber>token</CertificationNumber>
-			<Date>2017-01-01T00:00:00Z</Date>
-			<AppVersion>aaaaa</AppVersion>
-			<ElectricMachineType>ASM</ElectricMachineType>
-			<CertificationMethod>Standard values</CertificationMethod>
-			<R85RatedPower>1</R85RatedPower>
-			<RotationalInertia>0.10</RotationalInertia>
-			<ContinuousTorque>200.00</ContinuousTorque>
-			<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
-			<OverloadTorque>400.00</OverloadTorque>
-			<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
-			<OverloadDuration>30.00</OverloadDuration>
-			<DcDcConverterIncluded>true</DcDcConverterIncluded>
-			<IHPCType>None</IHPCType>
-			<VoltageLevel>
-				<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>
-		</v2.10.1:Data>
-		<v2.10.1:Signature>
-			<di:Reference URI="#ENG-gooZah3D">
-				<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>JWEwzKSP0lXvwRgQZTiWJm9dpdtQ72FOX0CC5Vy6f2Y=</di:DigestValue>
-			</di:Reference>
-		</v2.10.1:Signature>
-	</tns:ElectricMachineSystem>
-</tns:VectoInputDeclaration>
+    <tns:ElectricMachineSystem xsi:type="v2.10.1:ElectricMachineSystemComponentDeclarationType">
+        <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="ElectricMachineSystemStandardValuesDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+            <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>
+            <ContinuousTorque>200.00</ContinuousTorque>
+            <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+            <OverloadTorque>400.00</OverloadTorque>
+            <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+            <OverloadDuration>30.00</OverloadDuration>
+            <DcDcConverterIncluded>true</DcDcConverterIncluded>
+            <IHPCType>None</IHPCType>
+            <VoltageLevel>
+                <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>
+        </Data>
+        <v2.10.1: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>ZDzYMLXTbvq6O8mR3OE8ii2v4SHgJ6nieqw6XXINaF0=</di:DigestValue>
+            </di:Reference>
+        </v2.10.1:Signature>
+    </tns:ElectricMachineSystem>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/Gearbox_APT-N.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/Gearbox_APT-N.xml
index 05da3ce2a9cbdec665bb7936f60ec4c3f5d5fa1a..04dce1e72e46ad3c52035803f832366ac6550e09 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/Gearbox_APT-N.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/Gearbox_APT-N.xml
@@ -1,71 +1,71 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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 xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="v2.10.1:GearboxDataDeclarationType" id="EM-asdf">
-			<Manufacturer>Generic Vendor</Manufacturer>
-			<Model>GB_12-gear</Model>
-			<CertificationNumber>GBX-GB_12-gear</CertificationNumber>
-			<Date>2017-09-26T15:33:45.0954248Z</Date>
-			<AppVersion>VectoCore</AppVersion>
-			<TransmissionType>APT-N</TransmissionType>
-			<MainCertificationMethod>Standard values</MainCertificationMethod>
-			<v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
-				<Gear number="1">
-					<Ratio>14.930</Ratio>
-					<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="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>
-				</Gear>
-				<Gear number="2">
-					<Ratio>11.640</Ratio>
-					<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="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>
-				</Gear>
-				<Gear number="3">
-					<Ratio>9.020</Ratio>
-					<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="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>
-				</Gear>
-			</v2.10.1:Gears>
-		</v2.0:Data>
-		<v2.0:Signature>
-			<di:Reference URI="#ENG-gooZah3D">
-				<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>JWEwzKSP0lXvwRgQZTiWJm9dpdtQ72FOX0CC5Vy6f2Y=</di:DigestValue>
-			</di:Reference>
-		</v2.0:Signature>
-	</tns:Gearbox>
-</tns:VectoInputDeclaration>
+    <tns:Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
+        <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="v2.10.1:GearboxDataDeclarationType" 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-N</TransmissionType>
+            <MainCertificationMethod>Standard values</MainCertificationMethod>
+            <v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+                <Gear number="1">
+                    <Ratio>14.930</Ratio>
+                    <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="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>
+                </Gear>
+                <Gear number="2">
+                    <Ratio>11.640</Ratio>
+                    <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="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>
+                </Gear>
+                <Gear number="3">
+                    <Ratio>9.020</Ratio>
+                    <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="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>
+                </Gear>
+            </v2.10.1: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>hRzWfx3/El/LwEtP86Utm3dgBAF6CagrpEREsca7+/0=</di:DigestValue>
+            </di:Reference>
+        </v2.0:Signature>
+    </tns:Gearbox>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/Gearbox_IHPC.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/Gearbox_IHPC.xml
index f016aedcd5db8f9a65ba56e5c9fa0da5cb17261b..3f696ad69a424b413028c5248320c30240eb339e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/Gearbox_IHPC.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/Gearbox_IHPC.xml
@@ -1,207 +1,206 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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 xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="v2.10.1:GearboxDataDeclarationType" id="EM-asdf">
-			<!--<v2.0:Data id="GBX-GB_12-gear" xsi:type="v2.6:GearboxDataDeclarationType"> -->
-			<Manufacturer>Generic Vendor</Manufacturer>
-			<Model>GB_12-gear</Model>
-			<CertificationNumber>GBX-GB_12-gear</CertificationNumber>
-			<Date>2017-09-26T15:33:45.0954248Z</Date>
-			<AppVersion>VectoCore</AppVersion>
-			<TransmissionType>IHPC Type 1</TransmissionType>
-			<MainCertificationMethod>Standard values</MainCertificationMethod>
-			<v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
-				<Gear number="1">
-					<Ratio>14.930</Ratio>
-					<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="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>
-				</Gear>
-				<Gear number="2">
-					<Ratio>11.640</Ratio>
-					<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="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>
-				</Gear>
-				<Gear number="3">
-					<Ratio>9.020</Ratio>
-					<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="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>
-				</Gear>
-				<Gear number="4">
-					<Ratio>7.040</Ratio>
-					<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="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>
-				</Gear>
-				<Gear number="5">
-					<Ratio>5.640</Ratio>
-					<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="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>
-				</Gear>
-				<Gear number="6">
-					<Ratio>4.400</Ratio>
-					<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="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>
-				</Gear>
-				<Gear number="7">
-					<Ratio>3.390</Ratio>
-					<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="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>
-				</Gear>
-				<Gear number="8">
-					<Ratio>2.650</Ratio>
-					<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="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>
-				</Gear>
-				<Gear number="9">
-					<Ratio>2.050</Ratio>
-					<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="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>
-				</Gear>
-				<Gear number="10">
-					<Ratio>1.600</Ratio>
-					<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="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>
-				</Gear>
-				<Gear number="11">
-					<Ratio>1.280</Ratio>
-					<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="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>
-				</Gear>
-				<Gear number="12">
-					<Ratio>1.000</Ratio>
-					<TorqueLossMap>
-						<Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="1000.00"/>
-						<Entry inputSpeed="0.00" inputTorque="-250.00" torqueLoss="5.00"/>
-						<Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00"/>
-						<Entry inputSpeed="0.00" inputTorque="250.00" torqueLoss="5.00"/>
-						<Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="1000.00"/>
-						<Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="1000.00"/>
-						<Entry inputSpeed="5000.00" inputTorque="-845.00" torqueLoss="17.00"/>
-						<Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="17.00"/>
-						<Entry inputSpeed="5000.00" inputTorque="845.00" torqueLoss="17.00"/>
-						<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="1000.00"/>
-					</TorqueLossMap>
-				</Gear>
-			</v2.10.1:Gears>
-		</v2.0:Data>
-		<v2.0:Signature>
-			<di:Reference URI="#ENG-gooZah3D">
-				<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>JWEwzKSP0lXvwRgQZTiWJm9dpdtQ72FOX0CC5Vy6f2Y=</di:DigestValue>
-			</di:Reference>
-		</v2.0:Signature>
-	</tns:Gearbox>
-</tns:VectoInputDeclaration>
+    <tns:Gearbox xsi:type="v2.0:GearboxComponentDeclarationType">
+        <v2.0:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="v2.10.1:GearboxDataDeclarationType" id="GBX-asdf">
+            <Manufacturer>Generic Vendor</Manufacturer>
+            <Model>GB_12-gear</Model>
+            <CertificationNumber>GBX-GB_12-gear</CertificationNumber>
+            <Date>2021-11-18T14:30:10.5091769Z</Date>
+            <AppVersion>VectoCore</AppVersion>
+            <TransmissionType>IHPC Type 1</TransmissionType>
+            <MainCertificationMethod>Standard values</MainCertificationMethod>
+            <v2.10.1:Gears xsi:type="v2.0:GearsDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+                <Gear number="1">
+                    <Ratio>14.930</Ratio>
+                    <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="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>
+                </Gear>
+                <Gear number="2">
+                    <Ratio>11.640</Ratio>
+                    <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="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>
+                </Gear>
+                <Gear number="3">
+                    <Ratio>9.020</Ratio>
+                    <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="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>
+                </Gear>
+                <Gear number="4">
+                    <Ratio>7.040</Ratio>
+                    <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="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>
+                </Gear>
+                <Gear number="5">
+                    <Ratio>5.640</Ratio>
+                    <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="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>
+                </Gear>
+                <Gear number="6">
+                    <Ratio>4.400</Ratio>
+                    <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="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>
+                </Gear>
+                <Gear number="7">
+                    <Ratio>3.390</Ratio>
+                    <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="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>
+                </Gear>
+                <Gear number="8">
+                    <Ratio>2.650</Ratio>
+                    <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="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>
+                </Gear>
+                <Gear number="9">
+                    <Ratio>2.050</Ratio>
+                    <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="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>
+                </Gear>
+                <Gear number="10">
+                    <Ratio>1.600</Ratio>
+                    <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="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>
+                </Gear>
+                <Gear number="11">
+                    <Ratio>1.280</Ratio>
+                    <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="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>
+                </Gear>
+                <Gear number="12">
+                    <Ratio>1.000</Ratio>
+                    <TorqueLossMap>
+                        <Entry inputSpeed="0.00" inputTorque="-50000.00" torqueLoss="1000.00" />
+                        <Entry inputSpeed="0.00" inputTorque="-250.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="0.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="250.00" torqueLoss="5.00" />
+                        <Entry inputSpeed="0.00" inputTorque="50000.00" torqueLoss="1000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-50000.00" torqueLoss="1000.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="-845.00" torqueLoss="17.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="0.00" torqueLoss="17.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="845.00" torqueLoss="17.00" />
+                        <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="1000.00" />
+                    </TorqueLossMap>
+                </Gear>
+            </v2.10.1: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>XZCluPiG05mOAj5rTjTllCWbhCTEYVxCbE940ck3XsA=</di:DigestValue>
+            </di:Reference>
+        </v2.0:Signature>
+    </tns:Gearbox>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_1.xml
index dc844cd475a8c6f4e02a5c2c588bbd4586c23507..0b54d001c090881a28eeb51664286de8ca05b78a 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_1.xml
@@ -1 +1,92 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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:IEPC xsi:type="v2.10.1:IEPCComponentDeclarationType">
		<v2.10.1:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="IEPCMeasuredDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
			<Manufacturer>a</Manufacturer>
			<Model>a</Model>
			<CertificationNumber>token</CertificationNumber>
			<Date>2017-01-01T00:00:00Z</Date>
			<AppVersion>aaaaa</AppVersion>
			<ElectricMachineType>ASM</ElectricMachineType>
			<CertificationMethod>Measured for complete component</CertificationMethod>
			<R85RatedPower>1</R85RatedPower>
			<RotationalInertia>0.10</RotationalInertia>
			<ContinuousTorque>200.00</ContinuousTorque>
			<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
			<OverloadTorque>400.00</OverloadTorque>
			<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
			<OverloadDuration>30.00</OverloadDuration>
			<TestVoltageOverload>483</TestVoltageOverload>
			<DifferentialIncluded>false</DifferentialIncluded>
			<DesignTypeWheelMotor>true</DesignTypeWheelMotor>
			<Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
				<Gear number="1">
					<Ratio>3.000</Ratio>
				</Gear>
				<Gear number="2">
					<Ratio>1.000</Ratio>
					<MaxOutShaftTorque>2000</MaxOutShaftTorque>
				</Gear>
			</Gears>
			<VoltageLevel>
				<Voltage>400</Voltage>
				<MaxTorqueCurve>
					<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
					<Entry outShaftSpeed="4000.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"/>
				</PowerMap>
				<PowerMap gear="2">
					<Entry outShaftSpeed="0.00" torque="500.00" electricPower="1500.00"/>
					<Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.00"/>
				</PowerMap>
			</VoltageLevel>
			<VoltageLevel>
				<Voltage>600</Voltage>
				<MaxTorqueCurve>
					<Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/>
					<Entry outShaftSpeed="4000.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"/>
				</PowerMap>
				<PowerMap gear="2">
					<Entry outShaftSpeed="0.00" torque="500.00" electricPower="1500.00"/>
					<Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00"/>
					<Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00"/>
					<Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.00"/>
				</PowerMap>
			</VoltageLevel>
			<DragCurve gear="1">
				<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
				<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
			</DragCurve>
			<DragCurve gear="2">
				<Entry outShaftSpeed="0.00" dragTorque="15.00"/>
				<Entry outShaftSpeed="4500.00" dragTorque="35.00"/>
			</DragCurve>
			<Conditioning>
				<Entry coolantTempInlet="30" coolingPower="5000"/>
			</Conditioning>
		</v2.10.1:Data>
		<v2.10.1:Signature>
			<di:Reference URI="#ENG-gooZah3D">
				<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>JWEwzKSP0lXvwRgQZTiWJm9dpdtQ72FOX0CC5Vy6f2Y=</di:DigestValue>
			</di:Reference>
		</v2.10.1:Signature>
	</tns:IEPC>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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:IEPC xsi:type="v2.10.1:IEPCComponentDeclarationType">
+        <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="IEPCMeasuredDataDeclarationType" id="IEPC-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+            <Manufacturer>a</Manufacturer>
+            <Model>a</Model>
+            <CertificationNumber>token</CertificationNumber>
+            <Date>2021-11-18T14:31:52.4460619Z</Date>
+            <AppVersion>aaaaa</AppVersion>
+            <ElectricMachineType>ASM</ElectricMachineType>
+            <CertificationMethod>Measured for complete component</CertificationMethod>
+            <R85RatedPower>1</R85RatedPower>
+            <RotationalInertia>0.10</RotationalInertia>
+            <ContinuousTorque>200.00</ContinuousTorque>
+            <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+            <OverloadTorque>400.00</OverloadTorque>
+            <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+            <OverloadDuration>30.00</OverloadDuration>
+            <TestVoltageOverload>483</TestVoltageOverload>
+            <DifferentialIncluded>false</DifferentialIncluded>
+            <DesignTypeWheelMotor>true</DesignTypeWheelMotor>
+            <Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+                <Gear number="1">
+                    <Ratio>3.000</Ratio>
+                </Gear>
+                <Gear number="2">
+                    <Ratio>1.000</Ratio>
+                    <MaxOutShaftTorque>2000</MaxOutShaftTorque>
+                </Gear>
+            </Gears>
+            <VoltageLevel>
+                <Voltage>400</Voltage>
+                <MaxTorqueCurve>
+                    <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00" />
+                    <Entry outShaftSpeed="4000.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" />
+                </PowerMap>
+                <PowerMap gear="2">
+                    <Entry outShaftSpeed="0.00" torque="500.00" electricPower="1500.00" />
+                    <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00" />
+                    <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00" />
+                    <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.00" />
+                </PowerMap>
+            </VoltageLevel>
+            <VoltageLevel>
+                <Voltage>600</Voltage>
+                <MaxTorqueCurve>
+                    <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00" />
+                    <Entry outShaftSpeed="4000.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" />
+                </PowerMap>
+                <PowerMap gear="2">
+                    <Entry outShaftSpeed="0.00" torque="500.00" electricPower="1500.00" />
+                    <Entry outShaftSpeed="0.00" torque="-500.00" electricPower="-1500.00" />
+                    <Entry outShaftSpeed="5000.00" torque="5000.00" electricPower="25000.00" />
+                    <Entry outShaftSpeed="5000.00" torque="-5000.00" electricPower="-25000.00" />
+                </PowerMap>
+            </VoltageLevel>
+            <DragCurve gear="1">
+                <Entry outShaftSpeed="0.00" dragTorque="10.00" />
+                <Entry outShaftSpeed="4000.00" dragTorque="30.00" />
+            </DragCurve>
+            <DragCurve gear="2">
+                <Entry outShaftSpeed="0.00" dragTorque="15.00" />
+                <Entry outShaftSpeed="4500.00" dragTorque="35.00" />
+            </DragCurve>
+            <Conditioning>
+                <Entry coolantTempInlet="30" coolingPower="5000" />
+            </Conditioning>
+        </Data>
+        <v2.10.1:Signature>
+            <di:Reference URI="#IEPC-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>YC6JEnUe+0DpaRLPBYJfmJqsXHlIkdKUEyKh6Pv4Qi8=</di:DigestValue>
+            </di:Reference>
+        </v2.10.1:Signature>
+    </tns:IEPC>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_StdValues.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_StdValues.xml
index daa8b99880da8f65246845483b638fbf3bb4e9d1..bd2f411bf902d758ee76330b40d69e7fb01f5754 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_StdValues.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/ComponentData/IEPC_StdValues.xml
@@ -1 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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:IEPC xsi:type="v2.10.1:IEPCComponentDeclarationType">
		<v2.10.1:Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="IEPCStandardValuesDataDeclarationType" id="EM-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
			<Manufacturer>a</Manufacturer>
			<Model>a</Model>
			<CertificationNumber>token</CertificationNumber>
			<Date>2017-01-01T00:00:00Z</Date>
			<AppVersion>aaaaa</AppVersion>
			<ElectricMachineType>ASM</ElectricMachineType>
			<CertificationMethod>Standard values for all components</CertificationMethod>
			<R85RatedPower>1</R85RatedPower>
			<RotationalInertia>0.10</RotationalInertia>
			<ContinuousTorque>200.00</ContinuousTorque>
			<TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
			<OverloadTorque>400.00</OverloadTorque>
			<TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
			<OverloadDuration>30.00</OverloadDuration>
			<DifferentialIncluded>false</DifferentialIncluded>
			<DesignTypeWheelMotor>true</DesignTypeWheelMotor>
			<Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
				<Gear number="1">
					<Ratio>3.000</Ratio>
				</Gear>
				<Gear number="2">
					<Ratio>1.000</Ratio>
					<MaxOutShaftTorque>2000</MaxOutShaftTorque>
				</Gear>
			</Gears>
			<VoltageLevel>
				<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>
		</v2.10.1:Data>
		<v2.10.1:Signature>
			<di:Reference URI="#ENG-gooZah3D">
				<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>JWEwzKSP0lXvwRgQZTiWJm9dpdtQ72FOX0CC5Vy6f2Y=</di:DigestValue>
			</di:Reference>
		</v2.10.1:Signature>
	</tns:IEPC>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.10.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.10.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" 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:IEPC xsi:type="v2.10.1:IEPCComponentDeclarationType">
+        <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.1" xsi:type="IEPCStandardValuesDataDeclarationType" id="IEPC-asdf" xmlns:v2.9="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.9">
+            <Manufacturer>a</Manufacturer>
+            <Model>a</Model>
+            <CertificationNumber>token</CertificationNumber>
+            <Date>2021-11-18T14:33:55.6801441Z</Date>
+            <AppVersion>aaaaa</AppVersion>
+            <ElectricMachineType>ASM</ElectricMachineType>
+            <CertificationMethod>Standard values for all components</CertificationMethod>
+            <R85RatedPower>1</R85RatedPower>
+            <RotationalInertia>0.10</RotationalInertia>
+            <ContinuousTorque>200.00</ContinuousTorque>
+            <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque>
+            <OverloadTorque>400.00</OverloadTorque>
+            <TestSpeedOverloadTorque>2000.00</TestSpeedOverloadTorque>
+            <OverloadDuration>30.00</OverloadDuration>
+            <DifferentialIncluded>false</DifferentialIncluded>
+            <DesignTypeWheelMotor>true</DesignTypeWheelMotor>
+            <Gears xsi:type="v2.10.1:IEPCGearsDeclarationType">
+                <Gear number="1">
+                    <Ratio>3.000</Ratio>
+                </Gear>
+                <Gear number="2">
+                    <Ratio>1.000</Ratio>
+                    <MaxOutShaftTorque>2000</MaxOutShaftTorque>
+                </Gear>
+            </Gears>
+            <VoltageLevel>
+                <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>
+        </Data>
+        <v2.10.1:Signature>
+            <di:Reference URI="#IEPC-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>WjS1g6YMg1hT7Rp+OpK6deh7pUKTwokv1e21eE3TAk8=</di:DigestValue>
+            </di:Reference>
+        </v2.10.1:Signature>
+    </tns:IEPC>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp
index fc68dc5c247f6afe2c68964a46528fe62c1f552e..40de6d3a5d5900aa5a6e26515a70ce52c63fbfde 100644
--- a/VectoCore/VectoXML.spp
+++ b/VectoCore/VectoXML.spp
@@ -72,6 +72,7 @@
 			<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\vecto_vehicle-stage_vif_input.xml" HomeFolder="Yes"/>
 		</Folder>
 		<Folder FolderName="Schema 2.10_Components" ValidFileSet="Yes" ValidFile="VectoCore\Resources\XSD\VectoComponent.2.10.xsd">
+			<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ComponentData\ADC.xml"/>
 			<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ComponentData\BatterySystem_1.xml" HomeFolder="Yes"/>
 			<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ComponentData\CapacitorSystem_1.xml" HomeFolder="Yes"/>
 			<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ComponentData\ElectricMachineSystem-IHPC_1.xml" HomeFolder="Yes"/>
@@ -164,6 +165,7 @@
 					<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\CompletedBus\PEV_completedBus_1.xml"/>
 				</Folder>
 				<Folder FolderName="ComponentData">
+					<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ComponentData\ADC.xml" HomeFolder="Yes"/>
 					<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ComponentData\BatterySystem_1.xml"/>
 					<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ComponentData\CapacitorSystem_1.xml"/>
 					<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\ComponentData\ElectricMachineSystem-IHPC_1.xml"/>
@@ -386,7 +388,7 @@
 	</Folder>
 	<Folder FolderName="XSL Files" ExtStr="xsl;xslt">
 		<File FilePath="E:\QUAM\Workspace\VECTO_quam\Documentation\XML\RenderTable.xslt" HomeFolder="Yes"/>
-		<File FilePath="E:\QUAM\Workspace\VECTO_quam\VectoCommon\VectoHashing\Resources\XSLT\SortInputData.xslt" HomeFolder="Yes"/>
+		<File FilePath="V:\VectoCommon\VectoHashing\Resources\XSLT\SortInputData.xslt" HomeFolder="Yes"/>
 	</Folder>
 	<Folder FolderName="XQuery Files" ExtStr="xq;xql;xquery;xqu"/>
 	<Folder FolderName="HTML Files" ExtStr="html;htm;xhtml;asp"/>