diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd
index 2d606e4ac4bc0ed085287651a1200ef215be8156..5646116aed3dc709a832b42b40704bc594fc0411 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd
@@ -3,6 +3,54 @@
 <?xml-stylesheet type="text/xsl" href="../RenderTable.xslt"?>
 <xs:schema xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 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:di="http://www.w3.org/2000/09/xmldsig#" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
 	<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
+	<xs:complexType name="AbstractAirdragDataDeclarationType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="tns:VectoSimulationComponent"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="AbstractAngledriveDataDeclarationType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="tns:VectoSimulationComponent"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="AbstractAxlegearDataDeclarationType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="tns:VectoSimulationComponent"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="AbstractCombustionEngineDataDeclarationType" abstract="true">
+		<xs:annotation>
+			<xs:documentation>Engine Component</xs:documentation>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="tns:VectoSimulationComponent"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="AbstractRetarderDataDeclarationType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="tns:VectoSimulationComponent"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="AbstractTorqueConverterDataDeclarationType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="tns:VectoSimulationComponent"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="AbstractTransmissionDataDeclarationType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="tns:VectoSimulationComponent"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="AbstractTyreDataDeclarationType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="tns:VectoSimulationComponent"/>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="AbstractVehicleType" abstract="true">
+		<xs:complexContent>
+			<xs:extension base="tns:VectoSimulationComponent"/>
+		</xs:complexContent>
+	</xs:complexType>
 	<xs:complexType name="AirDragComponentDeclarationType">
 		<xs:sequence>
 			<xs:element name="Data" type="tns:AirDragDataDeclarationType"/>
@@ -62,7 +110,7 @@
 	</xs:complexType>
 	<xs:complexType name="AngledriveDataDeclarationType">
 		<xs:complexContent>
-			<xs:extension base="tns:DeclarationPowertrainComponentType">
+			<xs:extension base="tns:AbstractAngledriveDataDeclarationType">
 				<xs:sequence>
 					<xs:element name="Manufacturer" type="tns:ManufacturerType">
 						<xs:annotation>
@@ -239,7 +287,7 @@
 			<xs:documentation>Axlegear Component</xs:documentation>
 		</xs:annotation>
 		<xs:complexContent>
-			<xs:extension base="tns:DeclarationPowertrainComponentType">
+			<xs:extension base="tns:AbstractAxlegearDataDeclarationType">
 				<xs:sequence>
 					<xs:element name="Manufacturer" type="tns:ManufacturerType">
 						<xs:annotation>
@@ -329,28 +377,15 @@
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
-	<xs:complexType name="DeclarationPowertrainComponentType" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="tns:VectoSimulationComponent"/>
-		</xs:complexContent>
-	</xs:complexType>
 	<xs:complexType name="EngineComponentDeclarationType">
 		<xs:sequence>
 			<xs:element name="Data" type="tns:EngineDataDeclarationType"/>
 			<xs:element name="Signature" type="tns:SignatureType"/>
 		</xs:sequence>
 	</xs:complexType>
-	<xs:complexType name="EngineDataBaseType">
-		<xs:annotation>
-			<xs:documentation>Engine Component</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="tns:DeclarationPowertrainComponentType"/>
-		</xs:complexContent>
-	</xs:complexType>
 	<xs:complexType name="EngineDataDeclarationType">
 		<xs:complexContent>
-			<xs:extension base="tns:EngineDataBaseType">
+			<xs:extension base="tns:AbstractCombustionEngineDataDeclarationType">
 				<xs:sequence>
 					<xs:element name="Manufacturer" type="tns:ManufacturerType">
 						<xs:annotation>
@@ -533,7 +568,7 @@
 			<xs:documentation>Gearbox Component</xs:documentation>
 		</xs:annotation>
 		<xs:complexContent>
-			<xs:extension base="tns:DeclarationPowertrainComponentType">
+			<xs:extension base="tns:AbstractTransmissionDataDeclarationType">
 				<xs:sequence>
 					<xs:element name="Manufacturer" type="tns:ManufacturerType">
 						<xs:annotation>
@@ -621,7 +656,7 @@
 			<xs:documentation>Retarder Component</xs:documentation>
 		</xs:annotation>
 		<xs:complexContent>
-			<xs:extension base="tns:DeclarationPowertrainComponentType">
+			<xs:extension base="tns:AbstractRetarderDataDeclarationType">
 				<xs:sequence>
 					<xs:element name="Manufacturer" type="tns:ManufacturerType">
 						<xs:annotation>
@@ -709,7 +744,7 @@
 	</xs:complexType>
 	<xs:complexType name="TorqueConverterDeclarationDataType">
 		<xs:complexContent>
-			<xs:extension base="tns:DeclarationPowertrainComponentType">
+			<xs:extension base="tns:AbstractTorqueConverterDataDeclarationType">
 				<xs:sequence>
 					<xs:element name="Manufacturer" type="tns:ManufacturerType">
 						<xs:annotation>
@@ -789,7 +824,7 @@
 	<xs:complexType name="TorqueLossMapType"/>
 	<xs:complexType name="TyreDataDeclarationType">
 		<xs:complexContent>
-			<xs:extension base="tns:DeclarationPowertrainComponentType">
+			<xs:extension base="tns:AbstractTyreDataDeclarationType">
 				<xs:sequence>
 					<xs:element name="Manufacturer" type="tns:ManufacturerType">
 						<xs:annotation>
@@ -869,9 +904,9 @@
 			</xs:simpleType>
 		</xs:attribute>
 	</xs:complexType>
-	<xs:complexType name="VehicleDeclarationType">
+	<xs:complexType name="VehicleBaseType" abstract="true">
 		<xs:complexContent>
-			<xs:extension base="tns:DeclarationPowertrainComponentType">
+			<xs:extension base="tns:AbstractVehicleType">
 				<xs:sequence>
 					<xs:element name="Manufacturer" type="tns:ManufacturerType">
 						<xs:annotation>
@@ -923,6 +958,14 @@
 							<xs:documentation>P041 - [kg]</xs:documentation>
 						</xs:annotation>
 					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="VehicleDeclarationType">
+		<xs:complexContent>
+			<xs:extension base="tns:VehicleBaseType">
+				<xs:sequence>
 					<xs:choice>
 						<xs:sequence>
 							<xs:element name="IdlingSpeed" type="tns:EngineDeclaredSpeedType">
@@ -1611,6 +1654,39 @@ ToDo: -0.00
 			<xs:pattern value="[-]?([1-9][0-9]*|0)\.[0-9]{6}"/>
 		</xs:restriction>
 	</xs:simpleType>
+	<xs:simpleType name="DualFuelType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Vehicle">280</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:boolean"/>
+	</xs:simpleType>
+	<xs:simpleType name="EcoRollWithEngineStopType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Vehicle/ADAS">273</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:boolean"/>
+	</xs:simpleType>
+	<xs:simpleType name="EcoRollWithoutEngineStopType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Vehicle/ADAS">272</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:boolean"/>
+	</xs:simpleType>
 	<xs:simpleType name="EngineCFRegPerType">
 		<xs:annotation>
 			<xs:appinfo>
@@ -1778,6 +1854,17 @@ ToDo: -0.00
 			<xs:minExclusive value="0.00"/>
 		</xs:restriction>
 	</xs:simpleType>
+	<xs:simpleType name="EngineStopStartType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Vehicle/ADAS">271</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:boolean"/>
+	</xs:simpleType>
 	<xs:simpleType name="EngineWHTCType">
 		<xs:annotation>
 			<xs:appinfo>
@@ -1981,6 +2068,17 @@ ToDo: -0.00
 			<xs:enumeration value="APT-P"/>
 		</xs:restriction>
 	</xs:simpleType>
+	<xs:simpleType name="HybridElectricHDVType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Vehicle">279</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:boolean"/>
+	</xs:simpleType>
 	<xs:simpleType name="LegislativeClassDeclarationType">
 		<xs:annotation>
 			<xs:appinfo>
@@ -2052,6 +2150,49 @@ ToDo: -0.00
 			<xs:whiteSpace value="collapse"/>
 		</xs:restriction>
 	</xs:simpleType>
+	<xs:simpleType name="NgTankSystemType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Vehicle">275</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Compressed"/>
+			<xs:enumeration value="Liquefied"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="PowerType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Vehicle">277</vectoParam:parameterId>
+					<vectoParam:parameterId component="Vehicle">278</vectoParam:parameterId>
+					<vectoParam:unit>W</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:int">
+			<xs:minInclusive value="0"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="PredictiveCruiseControlType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Vehicle/ADAS">274</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="none"/>
+			<xs:enumeration value="1,2"/>
+			<xs:enumeration value="1,2,3"/>
+		</xs:restriction>
+	</xs:simpleType>
 	<xs:simpleType name="PTOOtherElementsType">
 		<xs:annotation>
 			<xs:documentation>P248 - enum</xs:documentation>
@@ -2201,6 +2342,17 @@ ToDo: -0.00
 			<xs:enumeration value="Transmission Output Retarder"/>
 		</xs:restriction>
 	</xs:simpleType>
+	<xs:simpleType name="SleeperCabType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Vehicle">276</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:boolean"/>
+	</xs:simpleType>
 	<xs:simpleType name="SteeredAxlesType">
 		<xs:annotation>
 			<xs:appinfo>
@@ -2528,65 +2680,33 @@ ToDo: -0.00
 			<xs:minLength value="1"/>
 		</xs:restriction>
 	</xs:simpleType>
-	<xs:simpleType name="WheelsRimType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Tyre" status="deprecated">117</vectoParam:parameterId>
-					<vectoParam:comment>driven axle rims</vectoParam:comment>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-			<xs:documentation>P117 - enum  (driven axle rims)</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="5° DC Rims"/>
-			<xs:enumeration value="15° DC Rims"/>
-			<xs:enumeration value="Multipurpose - Radial"/>
-			<xs:enumeration value="Multipurpose - Diagonal"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="NgTankSystemType">
+	<xs:simpleType name="VocationalVehicleType">
 		<xs:annotation>
 			<xs:appinfo>
 				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle">275</vectoParam:parameterId>
+					<vectoParam:parameterId component="Vehicle">270</vectoParam:parameterId>
 					<vectoParam:unit>-</vectoParam:unit>
 				</vectoParam:description>
 			</xs:appinfo>
 		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Compressed"/>
-			<xs:enumeration value="Liquefied"/>
-		</xs:restriction>
+		<xs:restriction base="xs:boolean"/>
 	</xs:simpleType>
-	<xs:simpleType name="PredictiveCruiseControlType">
+	<xs:simpleType name="WheelsRimType">
 		<xs:annotation>
 			<xs:appinfo>
 				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle/ADAS">274</vectoParam:parameterId>
+					<vectoParam:parameterId component="Tyre" status="deprecated">117</vectoParam:parameterId>
+					<vectoParam:comment>driven axle rims</vectoParam:comment>
 					<vectoParam:unit>-</vectoParam:unit>
 				</vectoParam:description>
 			</xs:appinfo>
+			<xs:documentation>P117 - enum  (driven axle rims)</xs:documentation>
 		</xs:annotation>
 		<xs:restriction base="xs:string">
-			<xs:enumeration value="none"/>
-			<xs:enumeration value="1,2"/>
-			<xs:enumeration value="1,2,3"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="PowerType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle">277</vectoParam:parameterId>
-					<vectoParam:parameterId component="Vehicle">278</vectoParam:parameterId>
-					<vectoParam:unit>W</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:int">
-			<xs:minInclusive value="0"/>
+			<xs:enumeration value="5° DC Rims"/>
+			<xs:enumeration value="15° DC Rims"/>
+			<xs:enumeration value="Multipurpose - Radial"/>
+			<xs:enumeration value="Multipurpose - Diagonal"/>
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="ZeroEmissionVehicleType">
@@ -2600,81 +2720,4 @@ ToDo: -0.00
 		</xs:annotation>
 		<xs:restriction base="xs:boolean"/>
 	</xs:simpleType>
-	<xs:simpleType name="VocationalVehicleType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle">270</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:boolean"/>
-	</xs:simpleType>
-	<xs:simpleType name="SleeperCabType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle">276</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:boolean"/>
-	</xs:simpleType>
-	<xs:simpleType name="EngineStopStartType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle/ADAS">271</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:boolean"/>
-	</xs:simpleType>
-	<xs:simpleType name="EcoRollWithoutEngineStopType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle/ADAS">272</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:boolean"/>
-	</xs:simpleType>
-	<xs:simpleType name="EcoRollWithEngineStopType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle/ADAS">273</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:boolean"/>
-	</xs:simpleType>
-	<xs:simpleType name="HybridElectricHDVType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle">279</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:boolean"/>
-	</xs:simpleType>
-	<xs:simpleType name="DualFuelType">
-		<xs:annotation>
-			<xs:appinfo>
-				<vectoParam:description>
-					<vectoParam:parameterId component="Vehicle">280</vectoParam:parameterId>
-					<vectoParam:unit>-</vectoParam:unit>
-				</vectoParam:description>
-			</xs:appinfo>
-		</xs:annotation>
-		<xs:restriction base="xs:boolean"/>
-	</xs:simpleType>
 </xs:schema>