diff --git a/VectoCore/VectoCore/Resources/XSD/ParameterDocumentation.xsd b/VectoCore/VectoCore/Resources/XSD/ParameterDocumentation.xsd
index b0ec9347972f13f506276671f3bb54dcdbc1a48d..891714ce35e1936dc737d09d2c0ebd33125e75b5 100644
--- a/VectoCore/VectoCore/Resources/XSD/ParameterDocumentation.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/ParameterDocumentation.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
+<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) -->
 <xs:schema xmlns:tns="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" elementFormDefault="qualified" attributeFormDefault="unqualified">
 	<xs:element name="description">
 		<xs:complexType>
@@ -8,40 +8,7 @@
 					<xs:complexType>
 						<xs:simpleContent>
 							<xs:extension base="xs:int">
-								<xs:attribute name="component" use="required">
-									<xs:simpleType>
-										<xs:restriction base="xs:token">
-											<xs:enumeration value="Engine"/>
-											<xs:enumeration value="Engine/FLD"/>
-											<xs:enumeration value="Engine/FC-map"/>
-											<xs:enumeration value="Airdrag"/>
-											<xs:enumeration value="Angledrive"/>
-											<xs:enumeration value="Angledrive/Lossmap"/>
-											<xs:enumeration value="Auxiliaries"/>
-											<xs:enumeration value="Axlegear"/>
-											<xs:enumeration value="Axlegear/Lossmap"/>
-											<xs:enumeration value="Driver"/>
-											<xs:enumeration value="Engine"/>
-											<xs:enumeration value="ADAS"/>
-											<xs:enumeration value="Gearbox"/>
-											<xs:enumeration value="Gearbox/Gear"/>
-											<xs:enumeration value="Gearbox/Gear/Lossmap"/>
-											<xs:enumeration value="Gearbox/Gear/Shiftpolygon"/>
-											<xs:enumeration value="Job"/>
-											<xs:enumeration value="Retarder"/>
-											<xs:enumeration value="Retarder/Lossmap"/>
-											<xs:enumeration value="Torqueconverter"/>
-											<xs:enumeration value="Torqueconverter/Characteristics"/>
-											<xs:enumeration value="Tyre"/>
-											<xs:enumeration value="Vehicle"/>
-											<xs:enumeration value="Vehicle/Auxiliaries"/>
-											<xs:enumeration value="Vehicle/Axle"/>
-											<xs:enumeration value="Vehicle/TorqueLimits"/>
-											<xs:enumeration value="Gearshiftstrategy"/>
-											<xs:enumeration value="Vehicle/ADAS"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:attribute>
+								<xs:attribute name="component" type="tns:ComponentType" use="required"/>
 								<xs:attribute name="status">
 									<xs:simpleType>
 										<xs:restriction base="xs:string">
@@ -63,30 +30,7 @@
 						</xs:simpleContent>
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="unit">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="kg"/>
-							<xs:enumeration value="m"/>
-							<xs:enumeration value="s"/>
-							<xs:enumeration value="m/s²"/>
-							<xs:enumeration value="1/min"/>
-							<xs:enumeration value="°"/>
-							<xs:enumeration value="kgm²"/>
-							<xs:enumeration value="m²"/>
-							<xs:enumeration value="-"/>
-							<xs:enumeration value="N"/>
-							<xs:enumeration value="W"/>
-							<xs:enumeration value="cm³"/>
-							<xs:enumeration value="Nm"/>
-							<xs:enumeration value="g/h"/>
-							<xs:enumeration value="%"/>
-							<xs:enumeration value="km/h"/>
-							<xs:enumeration value="m/s"/>
-							<xs:enumeration value="mm"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:element>
+				<xs:element name="unit" type="tns:UnitType"/>
 				<xs:element name="genericValueType" minOccurs="0">
 					<xs:simpleType>
 						<xs:restriction base="xs:string">
@@ -107,4 +51,81 @@
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
+	<xs:simpleType name="ComponentType">
+		<xs:restriction base="xs:token">
+			<xs:enumeration value="Engine"/>
+			<xs:enumeration value="Engine/FLD"/>
+			<xs:enumeration value="Engine/FC-map"/>
+			<xs:enumeration value="Airdrag"/>
+			<xs:enumeration value="Angledrive"/>
+			<xs:enumeration value="Angledrive/Lossmap"/>
+			<xs:enumeration value="Auxiliaries"/>
+			<xs:enumeration value="Axlegear"/>
+			<xs:enumeration value="Axlegear/Lossmap"/>
+			<xs:enumeration value="Driver"/>
+			<xs:enumeration value="Engine"/>
+			<xs:enumeration value="ADAS"/>
+			<xs:enumeration value="Gearbox"/>
+			<xs:enumeration value="Gearbox/Gear"/>
+			<xs:enumeration value="Gearbox/Gear/Lossmap"/>
+			<xs:enumeration value="Gearbox/Gear/Shiftpolygon"/>
+			<xs:enumeration value="Job"/>
+			<xs:enumeration value="Retarder"/>
+			<xs:enumeration value="Retarder/Lossmap"/>
+			<xs:enumeration value="Torqueconverter"/>
+			<xs:enumeration value="Torqueconverter/Characteristics"/>
+			<xs:enumeration value="Tyre"/>
+			<xs:enumeration value="Vehicle"/>
+			<xs:enumeration value="Vehicle/Auxiliaries"/>
+			<xs:enumeration value="Vehicle/Axle"/>
+			<xs:enumeration value="Vehicle/TorqueLimits"/>
+			<xs:enumeration value="Gearshiftstrategy"/>
+			<xs:enumeration value="Vehicle/ADAS"/>
+			<xs:enumeration value="ElectricMachine"/>
+			<xs:enumeration value="ElectricMachine/VoltageLevel"/>
+			<xs:enumeration value="ElectricMachine/MaxMinTorque"/>
+			<xs:enumeration value="ElectricMachine/DragTorque"/>
+			<xs:enumeration value="ElectricMachine/PowerMap"/>
+			<xs:enumeration value="ElectricMachine/Conditioning"/>
+			<xs:enumeration value="IEPC"/>
+			<xs:enumeration value="IEPC/Gear"/>
+			<xs:enumeration value="IEPC/VoltageLevel"/>
+			<xs:enumeration value="IEPC/MaxMinTorque"/>
+			<xs:enumeration value="IEPC/PowerMap"/>
+			<xs:enumeration value="IEPC/Conditioning"/>
+			<xs:enumeration value="BatterySystem"/>
+			<xs:enumeration value="BatterySystem/OCV"/>
+			<xs:enumeration value="BatterySystem/DCIR"/>
+			<xs:enumeration value="BatterySystem/CurrentLimits"/>
+			<xs:enumeration value="CapacitorSystem"/>
+			<xs:enumeration value="IEPC/DragTorque"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="UnitType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="kg"/>
+			<xs:enumeration value="m"/>
+			<xs:enumeration value="s"/>
+			<xs:enumeration value="m/s²"/>
+			<xs:enumeration value="1/min"/>
+			<xs:enumeration value="°"/>
+			<xs:enumeration value="kgm²"/>
+			<xs:enumeration value="m²"/>
+			<xs:enumeration value="-"/>
+			<xs:enumeration value="N"/>
+			<xs:enumeration value="W"/>
+			<xs:enumeration value="cm³"/>
+			<xs:enumeration value="Nm"/>
+			<xs:enumeration value="g/h"/>
+			<xs:enumeration value="%"/>
+			<xs:enumeration value="km/h"/>
+			<xs:enumeration value="m/s"/>
+			<xs:enumeration value="mm"/>
+			<xs:enumeration value="V"/>
+			<xs:enumeration value="A"/>
+			<xs:enumeration value="°C"/>
+			<xs:enumeration value="F"/>
+			<xs:enumeration value="mOhm"/>
+		</xs:restriction>
+	</xs:simpleType>
 </xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd
index 7b38a74b82370fb19c7fdce3354cfef254f60d2f..4acb4f92bc987b30b321e11698586bc4da692131 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationComponent.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:c2.0="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" xmlns:vdc="urn:tugraz:ivt:VectoAPI:DeclarationComponent" xmlns:vdd="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationComponent" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:c2.0="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.0" xmlns:vdc="urn:tugraz:ivt:VectoAPI:DeclarationComponent" xmlns:vdd="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:ns1="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0" xmlns:ns2="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v2.10" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationComponent" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
 	<!-- 
 
          This is a convienience file that imports the schema for declaration input (i.e., job data) and all supported declaration definitions
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.1_xEV_Components.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.1_xEV_Components.xsd
index 0414be81875e7e498ddf887dea9faa37b138a12a..9569b2937c6cfe8afa5c11f5709f947c0a688c82 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.1_xEV_Components.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.1_xEV_Components.xsd
@@ -251,11 +251,43 @@
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="ElectricMachineSystemConditioningEntryType">
-		<xs:attribute name="coolantTempInlet" type="xs:int" use="required"/>
-		<xs:attribute name="coolingPower" type="xs:int" use="required"/>
+		<xs:attribute name="coolantTempInlet" type="xs:int" use="required">
+			<xs:annotation>
+				<xs:documentation>P476, P509 - [°C]</xs:documentation>
+				<xs:appinfo>
+					<vectoParam:description>
+						<vectoParam:parameterId component="ElectricMachine/Conditioning">476</vectoParam:parameterId>
+						<vectoParam:parameterId component="IEPC/Conditioning">509</vectoParam:parameterId>
+						<vectoParam:unit>°C</vectoParam:unit>
+					</vectoParam:description>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="coolingPower" type="xs:int" use="required">
+			<xs:annotation>
+				<xs:documentation>P477, P510 - [W]</xs:documentation>
+				<xs:appinfo>
+					<vectoParam:description>
+						<vectoParam:parameterId component="ElectricMachine/Conditioning">477</vectoParam:parameterId>
+						<vectoParam:parameterId component="IEPC/Conditioning">510</vectoParam:parameterId>
+						<vectoParam:unit>W</vectoParam:unit>
+					</vectoParam:description>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:attribute>
 	</xs:complexType>
 	<xs:complexType name="ElectricMachineSystemDragTorqueEntryType">
 		<xs:attribute name="outShaftSpeed" use="required">
+			<xs:annotation>
+				<xs:documentation>P471, P504 - [rpm]</xs:documentation>
+				<xs:appinfo>
+					<vectoParam:description>
+						<vectoParam:parameterId component="ElectricMachine/DragTorque">471</vectoParam:parameterId>
+						<vectoParam:parameterId component="IEPC/DragTorque">504</vectoParam:parameterId>
+						<vectoParam:unit>1/min</vectoParam:unit>
+					</vectoParam:description>
+				</xs:appinfo>
+			</xs:annotation>
 			<xs:simpleType>
 				<xs:restriction base="v1.0:Double2">
 					<xs:minInclusive value="0.00"/>
@@ -263,6 +295,16 @@
 			</xs:simpleType>
 		</xs:attribute>
 		<xs:attribute name="dragTorque" use="required">
+			<xs:annotation>
+				<xs:documentation>P472, P505 - [Nm]</xs:documentation>
+				<xs:appinfo>
+					<vectoParam:description>
+						<vectoParam:parameterId component="ElectricMachine/DragTorque">472</vectoParam:parameterId>
+						<vectoParam:parameterId component="IEPC/DragTorque">505</vectoParam:parameterId>
+						<vectoParam:unit>Nm</vectoParam:unit>
+					</vectoParam:description>
+				</xs:appinfo>
+			</xs:annotation>
 			<xs:simpleType>
 				<xs:restriction base="v1.0:Double2">
 					<xs:minInclusive value="0.00"/>
@@ -417,6 +459,16 @@
 	</xs:complexType>
 	<xs:complexType name="ElectricMachineSystemMaxTorqueEntryType">
 		<xs:attribute name="outShaftSpeed" use="required">
+			<xs:annotation>
+				<xs:documentation>P468, P501 - [rpm]</xs:documentation>
+				<xs:appinfo>
+					<vectoParam:description>
+						<vectoParam:parameterId component="ElectricMachine/MaxMinTorque">468</vectoParam:parameterId>
+						<vectoParam:parameterId component="IEPC/MaxMinTorque">501</vectoParam:parameterId>
+						<vectoParam:unit>1/min</vectoParam:unit>
+					</vectoParam:description>
+				</xs:appinfo>
+			</xs:annotation>
 			<xs:simpleType>
 				<xs:restriction base="v1.0:Double2">
 					<xs:minInclusive value="0.00"/>
@@ -424,6 +476,16 @@
 			</xs:simpleType>
 		</xs:attribute>
 		<xs:attribute name="maxTorque" use="required">
+			<xs:annotation>
+				<xs:documentation>P469, P502 - [Nm]</xs:documentation>
+				<xs:appinfo>
+					<vectoParam:description>
+						<vectoParam:parameterId component="ElectricMachine/MaxMinTorque">469</vectoParam:parameterId>
+						<vectoParam:parameterId component="IEPC/MaxMinTorque">502</vectoParam:parameterId>
+						<vectoParam:unit>Nm</vectoParam:unit>
+					</vectoParam:description>
+				</xs:appinfo>
+			</xs:annotation>
 			<xs:simpleType>
 				<xs:restriction base="v1.0:Double2">
 					<xs:minInclusive value="0.00"/>
@@ -431,6 +493,16 @@
 			</xs:simpleType>
 		</xs:attribute>
 		<xs:attribute name="minTorque" use="required">
+			<xs:annotation>
+				<xs:documentation>P470, P503 - [Nm]</xs:documentation>
+				<xs:appinfo>
+					<vectoParam:description>
+						<vectoParam:parameterId component="ElectricMachine/MaxMinTorque">470</vectoParam:parameterId>
+						<vectoParam:parameterId component="IEPC/MaxMinTorque">503</vectoParam:parameterId>
+						<vectoParam:unit>Nm</vectoParam:unit>
+					</vectoParam:description>
+				</xs:appinfo>
+			</xs:annotation>
 			<xs:simpleType>
 				<xs:restriction base="v1.0:Double2">
 					<xs:maxInclusive value="0.00"/>
@@ -444,94 +516,131 @@
 				<xs:sequence>
 					<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
 						<xs:annotation>
-							<xs:documentation>P200</xs:documentation>
+							<xs:documentation>P450</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">450</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="Model" type="v1.0:ModelType">
 						<xs:annotation>
-							<xs:documentation>P201</xs:documentation>
+							<xs:documentation>P451</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">451</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
 						<xs:annotation>
-							<xs:documentation>P261</xs:documentation>
+							<xs:documentation>P452</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">452</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="Date" type="v1.0:DateTimeWithTimezone">
 						<xs:annotation>
-							<xs:documentation>P203</xs:documentation>
+							<xs:documentation>P453</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">453</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="AppVersion" type="v1.0:AppVersionType">
 						<xs:annotation>
-							<xs:documentation>P204</xs:documentation>
+							<xs:documentation>P454</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">454</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="ElectricMachineType" type="v2.10.1:ElectricMachineTypeType"/>
-					<xs:element name="CertificationMethod" type="v2.10.1:CertificationMethodType"/>
-					<xs:element name="R85RatedPower">
-						<xs:simpleType>
-							<xs:restriction base="xs:int">
-								<xs:minExclusive value="0"/>
-							</xs:restriction>
-						</xs:simpleType>
+					<xs:element name="ElectricMachineType" type="v2.10.1:ElectricMachineTypeType">
+						<xs:annotation>
+							<xs:documentation>P455</xs:documentation>
+						</xs:annotation>
 					</xs:element>
-					<xs:element name="RotationalInertia">
-						<xs:simpleType>
-							<xs:restriction base="v1.0:Double2">
-								<xs:minExclusive value="0.00"/>
-							</xs:restriction>
-						</xs:simpleType>
+					<xs:element name="CertificationMethod" type="v2.10.1:CertificationMethodType">
+						<xs:annotation>
+							<xs:documentation>P456</xs:documentation>
+						</xs:annotation>
 					</xs:element>
-					<xs:element name="ContinuousTorque">
-						<xs:simpleType>
-							<xs:restriction base="v1.0:Double2">
-								<xs:minExclusive value="0.00"/>
-							</xs:restriction>
-						</xs:simpleType>
+					<xs:element name="R85RatedPower" type="v2.10.1:R85RatedPowerType">
+						<xs:annotation>
+							<xs:documentation>P457 - [W]</xs:documentation>
+						</xs:annotation>
 					</xs:element>
-					<xs:element name="TestSpeedContinuousTorque">
-						<xs:simpleType>
-							<xs:restriction base="v1.0:Double2">
-								<xs:minExclusive value="0.00"/>
-							</xs:restriction>
-						</xs:simpleType>
+					<xs:element name="RotationalInertia" type="v2.10.1:RotationalInertiaType">
+						<xs:annotation>
+							<xs:documentation>P458 - [kgm²]</xs:documentation>
+							
+						</xs:annotation>
 					</xs:element>
-					<xs:element name="OverloadTorque">
-						<xs:simpleType>
-							<xs:restriction base="v1.0:Double2">
-								<xs:minExclusive value="0.00"/>
-							</xs:restriction>
-						</xs:simpleType>
+					<xs:element name="ContinuousTorque" type="v2.10.1:MaxTorqueType">
+						<xs:annotation>
+							<xs:documentation>P459 - [Nm]</xs:documentation>
+							
+						</xs:annotation>
 					</xs:element>
-					<xs:element name="TestSpeedOverloadTorque">
-						<xs:simpleType>
-							<xs:restriction base="v1.0:Double2">
-								<xs:minExclusive value="0.00"/>
-							</xs:restriction>
-						</xs:simpleType>
+					<xs:element name="TestSpeedContinuousTorque" type="v2.10.1:TestSpeedType">
+						<xs:annotation>
+							<xs:documentation>P460 - [1/min]</xs:documentation>
+							
+						</xs:annotation>
 					</xs:element>
-					<xs:element name="OverloadDuration">
-						<xs:simpleType>
-							<xs:restriction base="v1.0:Double2">
-								<xs:minExclusive value="0.00"/>
-							</xs:restriction>
-						</xs:simpleType>
+					<xs:element name="OverloadTorque" type="v2.10.1:MaxTorqueType">
+						<xs:annotation>
+							<xs:documentation>P461 - [Nm]</xs:documentation>
+							
+						</xs:annotation>
 					</xs:element>
-					<xs:element name="TestVoltageOverload">
-						<xs:simpleType>
-							<xs:restriction base="xs:int">
-								<xs:minExclusive value="0"/>
-							</xs:restriction>
-						</xs:simpleType>
+					<xs:element name="TestSpeedOverloadTorque" type="v2.10.1:TestSpeedType">
+						<xs:annotation>
+							<xs:documentation>P462 - [1/min]</xs:documentation>
+						</xs:annotation>
 					</xs:element>
-					<xs:element name="DcDcConverterIncluded" type="xs:boolean"/>
-					<xs:element name="IHPCType">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:enumeration value="None"/>
-							</xs:restriction>
-						</xs:simpleType>
+					<xs:element name="OverloadDuration" type="v2.10.1:OverloadDurationType">
+						<xs:annotation>
+							<xs:documentation>P463 - [s]</xs:documentation>
+							
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TestVoltageOverload" type="v2.10.1:TestVoltageOverloadType">
+						<xs:annotation>
+							<xs:documentation>P464 - [V]</xs:documentation>
+							
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DcDcConverterIncluded" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P465</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">465</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="IHPCType" type="v2.10.1:IHPCTypeType">
+						<xs:annotation>
+							<xs:documentation>P466</xs:documentation>
+							
+						</xs:annotation>
 					</xs:element>
 					<xs:element name="VoltageLevel" type="v2.10.1:ElectricMachineSystemVoltageLevelMeasuredType" minOccurs="2" maxOccurs="unbounded"/>
 					<xs:element name="DragCurve">
@@ -555,14 +664,46 @@
 	</xs:complexType>
 	<xs:complexType name="ElectricMachineSystemPowerMapEntryType">
 		<xs:attribute name="outShaftSpeed" use="required">
+			<xs:annotation>
+				<xs:documentation>P473, P506 - [rpm]</xs:documentation>
+				<xs:appinfo>
+					<vectoParam:description>
+						<vectoParam:parameterId component="ElectricMachine/PowerMap">473</vectoParam:parameterId>
+						<vectoParam:parameterId component="IEPC/PowerMap">506</vectoParam:parameterId>
+						<vectoParam:unit>1/min</vectoParam:unit>
+					</vectoParam:description>
+				</xs:appinfo>
+			</xs:annotation>
 			<xs:simpleType>
 				<xs:restriction base="v1.0:Double2">
 					<xs:minInclusive value="0.00"/>
 				</xs:restriction>
 			</xs:simpleType>
 		</xs:attribute>
-		<xs:attribute name="torque" type="v1.0:Double2" use="required"/>
-		<xs:attribute name="electricPower" type="v1.0:Double2" use="required"/>
+		<xs:attribute name="torque" type="v1.0:Double2" use="required">
+			<xs:annotation>
+				<xs:documentation>P474, P507 - [Nm]</xs:documentation>
+				<xs:appinfo>
+					<vectoParam:description>
+						<vectoParam:parameterId component="ElectricMachine/PowerMap">474</vectoParam:parameterId>
+						<vectoParam:parameterId component="IEPC/PowerMap">507</vectoParam:parameterId>
+						<vectoParam:unit>Nm</vectoParam:unit>
+					</vectoParam:description>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="electricPower" type="v1.0:Double2" use="required">
+			<xs:annotation>
+				<xs:documentation>P475, P508 - [W]</xs:documentation>
+				<xs:appinfo>
+					<vectoParam:description>
+						<vectoParam:parameterId component="ElectricMachine/PowerMap">475</vectoParam:parameterId>
+						<vectoParam:parameterId component="IEPC/PowerMap">508</vectoParam:parameterId>
+						<vectoParam:unit>W</vectoParam:unit>
+					</vectoParam:description>
+				</xs:appinfo>
+			</xs:annotation>
+		</xs:attribute>
 	</xs:complexType>
 	<xs:complexType name="ElectricMachineSystemStandardValuesDataDeclarationType">
 		<xs:complexContent>
@@ -570,84 +711,115 @@
 				<xs:sequence>
 					<xs:element name="Manufacturer" type="v1.0:ManufacturerType">
 						<xs:annotation>
-							<xs:documentation>P200</xs:documentation>
+							<xs:documentation>P450</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">450</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="Model" type="v1.0:ModelType">
 						<xs:annotation>
-							<xs:documentation>P201</xs:documentation>
+							<xs:documentation>P451</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">451</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="CertificationNumber" type="v1.0:CertificationNumberType">
 						<xs:annotation>
-							<xs:documentation>P261</xs:documentation>
+							<xs:documentation>452</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">451</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="Date" type="v1.0:DateTimeWithTimezone">
 						<xs:annotation>
-							<xs:documentation>P203</xs:documentation>
+							<xs:documentation>452</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">452</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="AppVersion" type="v1.0:AppVersionType">
 						<xs:annotation>
-							<xs:documentation>P204</xs:documentation>
+							<xs:documentation>454</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">454</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="ElectricMachineType" type="v2.10.1:ElectricMachineTypeType"/>
-					<xs:element name="CertificationMethod" type="v2.10.1:CertificationMethodType"/>
-					<xs:element name="R85RatedPower">
-						<xs:simpleType>
-							<xs:restriction base="xs:int">
-								<xs:minExclusive value="0"/>
-							</xs:restriction>
-						</xs:simpleType>
+					<xs:element name="ElectricMachineType" type="v2.10.1:ElectricMachineTypeType">
+						<xs:annotation>
+							<xs:documentation>P455</xs:documentation>
+						</xs:annotation>
 					</xs:element>
-					<xs:element name="RotationalInertia">
-						<xs:simpleType>
-							<xs:restriction base="v1.0:Double2">
-								<xs:minExclusive value="0.00"/>
-							</xs:restriction>
-						</xs:simpleType>
+					<xs:element name="CertificationMethod" type="v2.10.1:CertificationMethodType">
+						<xs:annotation>
+							<xs:documentation>P456</xs:documentation>
+						</xs:annotation>
 					</xs:element>
-					<xs:element name="ContinuousTorque">
-						<xs:simpleType>
-							<xs:restriction base="v1.0:Double2">
-								<xs:minExclusive value="0.00"/>
-							</xs:restriction>
-						</xs:simpleType>
+					<xs:element name="R85RatedPower" type="v2.10.1:R85RatedPowerType">
+						<xs:annotation>
+							<xs:documentation>P457</xs:documentation>
+						</xs:annotation>
 					</xs:element>
-					<xs:element name="TestSpeedContinuousTorque">
-						<xs:simpleType>
-							<xs:restriction base="v1.0:Double2">
-								<xs:minExclusive value="0.00"/>
-							</xs:restriction>
-						</xs:simpleType>
+					<xs:element name="RotationalInertia" type="v2.10.1:RotationalInertiaType">
+						<xs:annotation>
+							<xs:documentation>P458 - [kgm2]</xs:documentation>
+						</xs:annotation>
 					</xs:element>
-					<xs:element name="OverloadTorque">
-						<xs:simpleType>
-							<xs:restriction base="v1.0:Double2">
-								<xs:minExclusive value="0.00"/>
-							</xs:restriction>
-						</xs:simpleType>
+					<xs:element name="ContinuousTorque" type="v2.10.1:MaxTorqueType">
+						<xs:annotation>
+							<xs:documentation>P459 - [Nm]</xs:documentation>
+						</xs:annotation>
 					</xs:element>
-					<xs:element name="TestSpeedOverloadTorque">
-						<xs:simpleType>
-							<xs:restriction base="v1.0:Double2">
-								<xs:minExclusive value="0.00"/>
-							</xs:restriction>
-						</xs:simpleType>
+					<xs:element name="TestSpeedContinuousTorque" type="v2.10.1:TestSpeedType">
+						<xs:annotation>
+							<xs:documentation>P460 - [1/min]</xs:documentation>
+						</xs:annotation>
 					</xs:element>
-					<xs:element name="OverloadDuration">
-						<xs:simpleType>
-							<xs:restriction base="v1.0:Double2">
-								<xs:minExclusive value="0.00"/>
-							</xs:restriction>
-						</xs:simpleType>
+					<xs:element name="OverloadTorque" type="v2.10.1:MaxTorqueType">
+						<xs:annotation>
+							<xs:documentation>P461 - [Nm]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TestSpeedOverloadTorque" type="v2.10.1:TestSpeedType">
+						<xs:annotation>
+							<xs:documentation>P462 - [1/min]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="OverloadDuration" type="v2.10.1:OverloadDurationType">
+						<xs:annotation>
+							<xs:documentation>P463 - [s]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DcDcConverterIncluded" type="xs:boolean">
+						<xs:annotation>
+							<xs:documentation>P465 - [-]</xs:documentation>
+						</xs:annotation>
 					</xs:element>
-					<xs:element name="DcDcConverterIncluded" type="xs:boolean"/>
 					<xs:element name="IHPCType">
+						<xs:annotation>
+							<xs:documentation>P466 - [-]</xs:documentation>
+						</xs:annotation>
 						<xs:simpleType>
-							<xs:restriction base="xs:string">
+							<xs:restriction base="v2.10.1:IHPCTypeType">
 								<xs:enumeration value="None"/>
 							</xs:restriction>
 						</xs:simpleType>
@@ -669,6 +841,16 @@
 			<xs:extension base="v2.10.1:AbstractElectricMachineSystemVoltageLevelType">
 				<xs:sequence>
 					<xs:element name="Voltage">
+						<xs:annotation>
+							<xs:documentation>P467, P500 - [V]</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine/VoltageLevel">467</vectoParam:parameterId>
+									<vectoParam:parameterId component="IEPC/VoltageLevel">500</vectoParam:parameterId>
+									<vectoParam:unit>V</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+						</xs:annotation>
 						<xs:simpleType>
 							<xs:restriction base="xs:int">
 								<xs:minExclusive value="0"/>
@@ -1074,6 +1256,14 @@
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="ElectricMachineTypeType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="ElectricMachine">455</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="ASM"/>
 			<xs:enumeration value="ESM"/>
@@ -1173,4 +1363,98 @@
 			<xs:element name="Entry" type="v2.10.1:ElectricMachineSystemMaxTorqueEntryType" minOccurs="2" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
+	<xs:simpleType name="R85RatedPowerType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="ElectricMachine">457</vectoParam:parameterId>
+					<vectoParam:unit>W</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:int">
+			<xs:minExclusive value="0"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="RotationalInertiaType">
+	<xs:annotation>
+	<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">458</vectoParam:parameterId>
+									<vectoParam:unit>kgm²</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
+							</xs:annotation>
+		<xs:restriction base="v1.0:Double2">
+			<xs:minExclusive value="0.00"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="MaxTorqueType">
+	<xs:annotation>
+<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">459</vectoParam:parameterId>
+									<vectoParam:parameterId component="ElectricMachine">461</vectoParam:parameterId>
+									<vectoParam:unit>Nm</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>	
+	</xs:annotation>
+		<xs:restriction base="v1.0:Double2">
+			<xs:minExclusive value="0.00"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="TestSpeedType">
+	<xs:annotation>
+<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">460</vectoParam:parameterId>
+									<vectoParam:parameterId component="ElectricMachine">462</vectoParam:parameterId>
+									<vectoParam:unit>1/min</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>	
+	</xs:annotation>
+		<xs:restriction base="v1.0:Double2">
+			<xs:minExclusive value="0.00"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="OverloadDurationType">
+	<xs:annotation>
+<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">463</vectoParam:parameterId>
+									<vectoParam:unit>s</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>	
+	</xs:annotation>
+		<xs:restriction base="v1.0:Double2">
+			<xs:minExclusive value="0.00"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="TestVoltageOverloadType">
+	<xs:annotation>
+<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">464</vectoParam:parameterId>
+									<vectoParam:unit>V</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>	
+	</xs:annotation>
+		<xs:restriction base="xs:int">
+			<xs:minExclusive value="0"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="IHPCTypeType">
+	<xs:annotation>
+<xs:appinfo>
+								<vectoParam:description>
+									<vectoParam:parameterId component="ElectricMachine">466</vectoParam:parameterId>
+									<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>	
+	</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="None"/>
+			<xs:enumeration value="IHPC Type 1"/>
+		</xs:restriction>
+	</xs:simpleType>
 </xs:schema>