diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.xsd
index 22abd15020cf4d935675ef3b7b2e2c517c6fcc47..54f7fe161bd33a74fc08663c6cf2308ec3cbd92e 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.xsd
@@ -1,7 +1,7 @@
 <?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) -->
 <!--W3C XML Schema generated by XMLSpy vXMLSpy Professional Edition v2016 rel. 2 (x64) (http://www.altova.com)-->
-<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.4" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.4" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.4">
+<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.5" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.5" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.5">
 	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
 	<xs:element name="VectoOutput">
 		<xs:annotation>
@@ -131,7 +131,14 @@
 				</xs:annotation>
 			</xs:element>
 		</xs:sequence>
-		<xs:attribute name="axleNumber" use="required"/>
+		<xs:attribute name="axleNumber" use="required">
+			<xs:simpleType>
+				<xs:restriction base="xs:int">
+					<xs:minInclusive value="1"/>
+					<xs:maxInclusive value="4"/>
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
 	</xs:complexType>
 	<xs:complexType name="AxleWheelsType">
 		<xs:sequence minOccurs="2" maxOccurs="4">
@@ -156,25 +163,53 @@
 		<xs:complexContent>
 			<xs:extension base="ComponentDescriptionType">
 				<xs:sequence>
-					<xs:element name="RatedPower" type="vdecdef:EngineRatedPower">
+					<xs:element name="RatedPower">
 						<xs:annotation>
 							<xs:documentation>P250</xs:documentation>
 						</xs:annotation>
+						<xs:complexType>
+							<xs:simpleContent>
+								<xs:extension base="vdecdef:EngineRatedPower">
+									<xs:attribute name="unit" type="PowerUnitType" use="required"/>
+								</xs:extension>
+							</xs:simpleContent>
+						</xs:complexType>
 					</xs:element>
-					<xs:element name="IdlingSpeed" type="vdecdef:EngineDeclaredSpeedType">
+					<xs:element name="IdlingSpeed">
 						<xs:annotation>
 							<xs:documentation>P063 / P198</xs:documentation>
 						</xs:annotation>
+						<xs:complexType>
+							<xs:simpleContent>
+								<xs:extension base="vdecdef:EngineDeclaredSpeedType">
+									<xs:attribute name="unit" type="AngularVelocityUnitType" use="required"/>
+								</xs:extension>
+							</xs:simpleContent>
+						</xs:complexType>
 					</xs:element>
-					<xs:element name="RatedSpeed" type="vdecdef:EngineDeclaredSpeedType">
+					<xs:element name="RatedSpeed">
 						<xs:annotation>
 							<xs:documentation>P249</xs:documentation>
 						</xs:annotation>
+						<xs:complexType>
+							<xs:simpleContent>
+								<xs:extension base="vdecdef:EngineDeclaredSpeedType">
+									<xs:attribute name="unit" type="AngularVelocityUnitType" use="required"/>
+								</xs:extension>
+							</xs:simpleContent>
+						</xs:complexType>
 					</xs:element>
-					<xs:element name="Displacement" type="vdecdef:EngineDisplacementType">
+					<xs:element name="Displacement">
 						<xs:annotation>
 							<xs:documentation>P061</xs:documentation>
 						</xs:annotation>
+						<xs:complexType>
+							<xs:simpleContent>
+								<xs:extension base="xs:double">
+									<xs:attribute name="unit" type="DisplacementType" use="required"/>
+								</xs:extension>
+							</xs:simpleContent>
+						</xs:complexType>
 					</xs:element>
 					<xs:element name="FuelType" type="vdecdef:FuelTypeType">
 						<xs:annotation>
@@ -369,6 +404,15 @@
 					</xs:simpleContent>
 				</xs:complexType>
 			</xs:element>
+			<xs:element name="AverageDrivingSpeed">
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:double">
+							<xs:attribute name="unit" type="SpeedUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
 			<xs:element name="MinSpeed">
 				<xs:complexType>
 					<xs:simpleContent>
@@ -414,6 +458,39 @@
 				</xs:simpleType>
 			</xs:element>
 			<xs:element name="GearshiftCount" type="xs:int"/>
+			<xs:element name="EngineSpeedDriving">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Min">
+							<xs:complexType>
+								<xs:simpleContent>
+									<xs:extension base="xs:double">
+										<xs:attribute name="unit" type="AngularVelocityUnitType" use="required"/>
+									</xs:extension>
+								</xs:simpleContent>
+							</xs:complexType>
+						</xs:element>
+						<xs:element name="Average">
+							<xs:complexType>
+								<xs:simpleContent>
+									<xs:extension base="xs:double">
+										<xs:attribute name="unit" type="AngularVelocityUnitType" use="required"/>
+									</xs:extension>
+								</xs:simpleContent>
+							</xs:complexType>
+						</xs:element>
+						<xs:element name="Max">
+							<xs:complexType>
+								<xs:simpleContent>
+									<xs:extension base="xs:double">
+										<xs:attribute name="unit" type="AngularVelocityUnitType" use="required"/>
+									</xs:extension>
+								</xs:simpleContent>
+							</xs:complexType>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="VehicleType">
@@ -438,15 +515,29 @@
 					<xs:documentation>P037</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="GrossVehicleMass" type="vdecdef:VehicleGrossVehicleMassType">
+			<xs:element name="GrossVehicleMass">
 				<xs:annotation>
 					<xs:documentation>P041</xs:documentation>
 				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:double">
+							<xs:attribute name="unit" type="MassUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
 			</xs:element>
-			<xs:element name="CurbMassChassis" type="vdecdef:VehicleCurbMassChassisType">
+			<xs:element name="CurbMassChassis">
 				<xs:annotation>
 					<xs:documentation>P038</xs:documentation>
 				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="vdecdef:VehicleCurbMassChassisType">
+							<xs:attribute name="unit" type="MassUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
 			</xs:element>
 			<xs:element name="PTO" type="xs:boolean">
 				<xs:annotation>
@@ -514,6 +605,7 @@
 	<xs:simpleType name="MassUnitType">
 		<xs:restriction base="xs:token">
 			<xs:enumeration value="kg"/>
+			<xs:enumeration value="t"/>
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="MissionTypeType">
@@ -538,4 +630,19 @@
 			<xs:maxInclusive value="16"/>
 		</xs:restriction>
 	</xs:simpleType>
+	<xs:simpleType name="AngularVelocityUnitType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="rpm"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="PowerUnitType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="kW"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="DisplacementType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="ltr"/>
+		</xs:restriction>
+	</xs:simpleType>
 </xs:schema>