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 30cf6955f2b85a6c4f6a2aa06f4e673cb1668393..50f037629129b4d088e72b2c32920c9a6f78cb22 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
@@ -561,6 +561,12 @@
 					<xs:element name="IHPCType">
 						<xs:annotation>
 							<xs:documentation>P466 - enum</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+										<vectoParam:parameterId component="ElectricMachine">466</vectoParam:parameterId>
+										<vectoParam:unit>-</vectoParam:unit>
+									</vectoParam:description>
+								</xs:appinfo>
 						</xs:annotation>
 						<xs:simpleType>
 							<xs:restriction base="v2.10.1:IHPCTypeType">
@@ -740,6 +746,12 @@
 					<xs:element name="IHPCType">
 						<xs:annotation>
 							<xs:documentation>P466 - enum</xs:documentation>
+							<xs:appinfo>
+								<vectoParam:description>
+										<vectoParam:parameterId component="ElectricMachine">466</vectoParam:parameterId>
+										<vectoParam:unit>-</vectoParam:unit>
+								</vectoParam:description>
+							</xs:appinfo>
 						</xs:annotation>
 						<xs:simpleType>
 							<xs:restriction base="v2.10.1:IHPCTypeType">
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd
index 52af1807b00a279892ca81bd41d651d5dbfb8344..e512899c94747f3153ad15b729c0ca6a9415687a 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd
@@ -1435,7 +1435,7 @@
 			<xs:element name="REESS">
 				<xs:complexType>
 					<xs:sequence>
-						<xs:element name="Data" type="v2.10.1:AbstractBatteryDataType"/>
+						<xs:element name="Data" type="v2.10.1:BatterySystemDataType"/>
 						<xs:element name="Signature" type="v2.0:SignatureType"/>
 					</xs:sequence>
 				</xs:complexType>
@@ -1468,7 +1468,7 @@
 	</xs:complexType>
 	<xs:complexType name="REESSCapacitorType">
 		<xs:sequence>
-			<xs:element name="Data" type="v2.10.1:AbstractCapacitorDataType"/>
+			<xs:element name="Data" type="v2.10.1:CapacitorDataType"/>
 			<xs:element name="Signature" type="v2.0:SignatureType"/>
 		</xs:sequence>
 	</xs:complexType>