diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/ComponentGroupWriters.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/ComponentGroupWriters.cs
index 83688fbcc3146cb7c0712eeee5165678252dd3a3..d2d0ac0c483eaeda79ff69bf322c84b9ca00d8fc 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/ComponentGroupWriters.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/ComponentGroupWriters.cs
@@ -193,13 +193,15 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
 			var voltageLevelsXElement = new XElement(_cif + "VoltageLevels");
 			result.Add(voltageLevelsXElement);
 
-			foreach (var electricMotorVoltageLevel in voltageLevels)
-			{
+			foreach (var electricMotorVoltageLevel in voltageLevels) {
 				var voltageLevel = new XElement(_cif + XMLNames.ElectricMachine_VoltageLevel,
-					voltageLevels.Count > 1 ? new XAttribute("voltage", electricMotorVoltageLevel.VoltageLevel.ToXMLFormat(0)) : null,
+					voltageLevels.Count > 1
+						? new XAttribute("voltage", electricMotorVoltageLevel.VoltageLevel.ToXMLFormat(0))
+						: null,
 					new XElement(_cif + "MaxContinuousPropulsionPower",
 						(electricMotorVoltageLevel.ContinuousTorque * electricMotorVoltageLevel.ContinuousTorqueSpeed)
-						.ToXMLFormat(0)));
+						.ValueAsUnit("kW", 0)));
+
 				voltageLevelsXElement.Add(voltageLevel);
 			}
 
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.9.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.9.xsd
index 6ed442ddd8568e9d2bfa9743123d3ce1b51da9e5..da754e9fc3a1be42a08acf0191aacd4c26ceb226 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.9.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.9.xsd
@@ -856,9 +856,13 @@
 			<xs:group ref="ExemptedCompletedBusVehicleTypeGroup"/>
 		</xs:sequence>
 	</xs:complexType>
-	<xs:simpleType name="RatedPowerType">
-		<xs:restriction base="xs:int"/>
-	</xs:simpleType>
+	<xs:complexType name="RatedPowerType">
+		<xs:simpleContent>
+			<xs:extension base="xs:int">
+				<xs:attribute name="unit" type="out:PowerUnitType" use="required"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
 	<xs:simpleType name="LegislativeCategoryType">
 		<xs:union memberTypes="v2.4:LegislativeCategoryHeavyLorryDeclarationType v2.4:LegislativeCategoryMediumLorryDeclarationType v2.4:LegislativeCategoryPrimaryBusDeclarationType"/>
 	</xs:simpleType>
@@ -1184,6 +1188,7 @@
 							<xs:complexType>
 								<xs:sequence>
 									<xs:element name="MaxContinuousPropulsionPower" type="RatedPowerType"/>
+
 								</xs:sequence>
 								<xs:attribute name="voltage"/>
 							</xs:complexType>