diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd
index bd1cb43f8dd34b6cccc0ce90b8839217cbb55c54..93df0b89c856ce85df32e8bcd7226fc5f3b828d4 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd
@@ -1,5 +1,5 @@
 <?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) -->
+<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) -->
 <?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"/>
@@ -85,49 +85,52 @@
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="AirDragDataDeclarationType">
-		<xs:sequence>
-			<xs:element name="Manufacturer" type="tns:ManufacturerType">
-				<xs:annotation>
-					<xs:documentation>P240</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Model" type="tns:ModelType">
-				<xs:annotation>
-					<xs:documentation>P241</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CertificationNumber" type="tns:CertificationNumberType">
-				<xs:annotation>
-					<xs:documentation>P268</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Date" type="tns:DateTimeWithTimezone">
-				<xs:annotation>
-					<xs:documentation>P243</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AppVersion" type="tns:AppVersionType">
-				<xs:annotation>
-					<xs:documentation>P244</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CdxA_0" type="tns:AirdragCdxAType">
-				<xs:annotation>
-					<xs:documentation>P245 - [m²]</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TransferredCdxA" type="tns:AirdragCdxAType">
-				<xs:annotation>
-					<xs:documentation>P246 - [m²]</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="DeclaredCdxA" type="tns:AirdragCdxAType">
-				<xs:annotation>
-					<xs:documentation>P146 - [m²]  Drag coefficient * Cross Sectional Area (Truck &amp; Trailer)</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="id"/>
+		<xs:complexContent>
+			<xs:extension base="tns:AbstractAirdragDataDeclarationType">
+				<xs:sequence>
+					<xs:element name="Manufacturer" type="tns:ManufacturerType">
+						<xs:annotation>
+							<xs:documentation>P240</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Model" type="tns:ModelType">
+						<xs:annotation>
+							<xs:documentation>P241</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="CertificationNumber" type="tns:CertificationNumberType">
+						<xs:annotation>
+							<xs:documentation>P268</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="Date" type="tns:DateTimeWithTimezone">
+						<xs:annotation>
+							<xs:documentation>P243</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="AppVersion" type="tns:AppVersionType">
+						<xs:annotation>
+							<xs:documentation>P244</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="CdxA_0" type="tns:AirdragCdxAType">
+						<xs:annotation>
+							<xs:documentation>P245 - [m²]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="TransferredCdxA" type="tns:AirdragCdxAType">
+						<xs:annotation>
+							<xs:documentation>P246 - [m²]</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="DeclaredCdxA" type="tns:AirdragCdxAType">
+						<xs:annotation>
+							<xs:documentation>P146 - [m²]  Drag coefficient * Cross Sectional Area (Truck &amp; Trailer)</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
 	</xs:complexType>
 	<xs:complexType name="AngledriveComponentDeclarationType">
 		<xs:sequence>
@@ -2518,7 +2521,7 @@ ToDo: -0.00
 			<xs:enumeration value="8.5 R17.5"/>
 			<xs:enumeration value="8 R17.5"/>
 			<xs:enumeration value="LT265/75 R16"/>
-			<xs:enumeration value="385/55 R19.5"/>	
+			<xs:enumeration value="385/55 R19.5"/>
 			<xs:enumeration value="24 R21"/>
 			<xs:enumeration value="205/70 R15C"/>
 			<xs:enumeration value="215/70 R15C"/>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_1.0.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_1.0.xml
index 35d1d33c0e6040f86ff0965b52da64a8c03f08b1..29ad989fc4b9dbc7620234c4f95eaed4beb3d260 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_1.0.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_1.0.xml
@@ -7,7 +7,7 @@
 	xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
 	xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
 	xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-	xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/DEV/VectoInput.2.0.xsd"
+	xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0 E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Resources\XSD\VectoInput.2.0.xsd"
 	>
 	<Vehicle id="VEH-1234567890" xsi:type="VehicleDeclarationType">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
@@ -3283,7 +3283,7 @@
 				</Data>
 			</Auxiliaries>
 			<AirDrag>
-				<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
+				<v2.0:Data id="CabinX23h" xsi:type="v1.0:AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
 					<Manufacturer>Generic Manufacturer</Manufacturer>
 					<Model>Generic Model</Model>
 					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -3292,7 +3292,7 @@
 					<CdxA_0>6.31</CdxA_0>
 					<TransferredCdxA>6.32</TransferredCdxA>
 					<DeclaredCdxA>6.34</DeclaredCdxA>
-				</Data>
+				</v2.0:Data>
 				<Signature>
 					<di:Reference URI="#CabinX23h">
 						<di:Transforms>