diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3_DF.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3_DF.xsd
index ba0883e4ca0ee7b4253c6dc688c1e330706469f5..5e7000afa00fb1a1374e877fc22311b2a0a917a9 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3_DF.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.3_DF.xsd
@@ -55,16 +55,7 @@
 							<xs:documentation>P259 - [Nm]</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="WHRType">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:enumeration value="none"/>
-								<xs:enumeration value="mechanical only"/>
-								<xs:enumeration value="electrical only"/>
-								<xs:enumeration value="mechanical and electrical"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
+					<xs:element name="WHRType" type="tns:WHRTypeType"/>
 					<xs:element name="Mode" type="tns:EngineFuelModeType" maxOccurs="unbounded"/>
 				</xs:sequence>
 			</xs:extension>
@@ -86,7 +77,16 @@
 				<xs:documentation>P074 - [g/h]</xs:documentation>
 			</xs:annotation>
 		</xs:attribute>
-		<xs:attribute name="electricPower" type="v1.0:Double2"/>
+		<xs:attribute name="electricPower" type="v1.0:Double2">
+			<xs:annotation>
+				<xs:documentation>Pxxx - [W]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
+		<xs:attribute name="mechanicalPower" type="v1.0:Double2">
+			<xs:annotation>
+				<xs:documentation>Pxxx - [W]</xs:documentation>
+			</xs:annotation>
+		</xs:attribute>
 	</xs:complexType>
 	<xs:complexType name="EngineFuelModeType">
 		<xs:sequence>
@@ -137,7 +137,14 @@
 					<xs:documentation>P260 - [-]</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="WHRCorrectionFactors" type="tns:WHRCorrectionFactorsType" minOccurs="0"/>
+			<xs:element name="WHRCorrectionFactors" minOccurs="0">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Electrical" type="tns:WHRCorrectionFactorsType" minOccurs="0"/>
+						<xs:element name="Mechanical" type="tns:WHRCorrectionFactorsType" minOccurs="0"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
 			<xs:element name="FuelConsumptionMap">
 				<xs:complexType>
 					<xs:sequence>
@@ -191,4 +198,11 @@
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
+	<xs:complexType name="WHRTypeType">
+		<xs:sequence>
+			<xs:element name="MechanicalOutputICE" type="xs:boolean"/>
+			<xs:element name="MechanicalOutputDrivetrain" type="xs:boolean"/>
+			<xs:element name="ElectricalOutput" type="xs:boolean"/>
+		</xs:sequence>
+	</xs:complexType>
 </xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoEngineeringDefinitions.1.1.xsd b/VectoCore/VectoCore/Resources/XSD/VectoEngineeringDefinitions.1.1.xsd
index 1478405bf503158a6d833277250adbd31dd95550..fae420a2727db437fdb45ac3bcee0fb37416e0a3 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoEngineeringDefinitions.1.1.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoEngineeringDefinitions.1.1.xsd
@@ -49,19 +49,46 @@
 												<xs:element name="WasteHeatRecovery" minOccurs="0">
 													<xs:complexType>
 														<xs:sequence>
-															<xs:element name="WHRCorrection">
-																<xs:simpleType>
-																	<xs:restriction base="xs:double">
-																		<xs:minExclusive value="0"/>
-																	</xs:restriction>
-																</xs:simpleType>
+															<xs:element name="Electrical" minOccurs="0">
+																<xs:complexType>
+																	<xs:sequence>
+																		<xs:element name="WHRCorrection">
+																			<xs:simpleType>
+																				<xs:restriction base="xs:double">
+																					<xs:minExclusive value="0"/>
+																				</xs:restriction>
+																			</xs:simpleType>
+																		</xs:element>
+																		<xs:element name="WHRMap">
+																			<xs:complexType>
+																				<xs:choice>
+																					<xs:element name="Entry" type="tns:WHREngryEngineeringType" minOccurs="4" maxOccurs="unbounded"/>
+																					<xs:element name="Resource" type="ve1.0:ExtResourceEngineeringType"/>
+																				</xs:choice>
+																			</xs:complexType>
+																		</xs:element>
+																	</xs:sequence>
+																</xs:complexType>
 															</xs:element>
-															<xs:element name="WHRMap">
+															<xs:element name="Mechanical" minOccurs="0">
 																<xs:complexType>
-																	<xs:choice>
-																		<xs:element name="Entry" type="tns:WHREngryEngineeringType" minOccurs="4" maxOccurs="unbounded"/>
-																		<xs:element name="Resource" type="ve1.0:ExtResourceEngineeringType"/>
-																	</xs:choice>
+																	<xs:sequence>
+																		<xs:element name="WHRCorrection">
+																			<xs:simpleType>
+																				<xs:restriction base="xs:double">
+																					<xs:minExclusive value="0"/>
+																				</xs:restriction>
+																			</xs:simpleType>
+																		</xs:element>
+																		<xs:element name="WHRMap">
+																			<xs:complexType>
+																				<xs:choice>
+																					<xs:element name="Entry" type="tns:WHREngryEngineeringType" minOccurs="4" maxOccurs="unbounded"/>
+																					<xs:element name="Resource" type="ve1.0:ExtResourceEngineeringType"/>
+																				</xs:choice>
+																			</xs:complexType>
+																		</xs:element>
+																	</xs:sequence>
 																</xs:complexType>
 															</xs:element>
 														</xs:sequence>
@@ -109,12 +136,11 @@
 			</xs:annotation>
 		</xs:attribute>
 	</xs:complexType>
-	<xs:simpleType name="WHRTypeType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="none"/>
-			<xs:enumeration value="mechanical only"/>
-			<xs:enumeration value="electrical only"/>
-			<xs:enumeration value="mechanical and electrical"/>
-		</xs:restriction>
-	</xs:simpleType>
+	<xs:complexType name="WHRTypeType">
+		<xs:sequence>
+			<xs:element name="MechanicalOutputICE" type="xs:boolean"/>
+			<xs:element name="MechanicalOutputDrivetrain" type="xs:boolean"/>
+			<xs:element name="ElectricalOutput" type="xs:boolean"/>
+		</xs:sequence>
+	</xs:complexType>
 </xs:schema>