diff --git a/Documentation/VehiclesReleaseComparisonDeclarationMode/Class_9_RigidTruck_AT_Decl_PCC.xml b/Documentation/VehiclesReleaseComparisonDeclarationMode/Class_9_RigidTruck_AT_Decl_PCC.xml
index 3cc8120aff68b347e78ac71f7c1404543a55ff0a..9980b3fc8e0c75edcf3b5bada2e1bbd645db5d89 100644
--- a/Documentation/VehiclesReleaseComparisonDeclarationMode/Class_9_RigidTruck_AT_Decl_PCC.xml
+++ b/Documentation/VehiclesReleaseComparisonDeclarationMode/Class_9_RigidTruck_AT_Decl_PCC.xml
@@ -1,35 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
-  <Vehicle id="VEH-class9_AT_PCC">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
+xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
+xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"  
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
+  <v2.0:Vehicle id="VEH-class9_AT_PCC" xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType">
     <Manufacturer>TUG Generic</Manufacturer>
     <ManufacturerAddress>N.A.</ManufacturerAddress>
     <Model>N.A.</Model>
     <VIN>N.A.</VIN>
     <Date>2019-02-27T09:39:05.3188703Z</Date>
-    <LegislativeClass>N3</LegislativeClass>
-    <VehicleCategory>Rigid Lorry</VehicleCategory>
+    <LegislativeCategory>N3</LegislativeCategory>
+    <ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
     <AxleConfiguration>6x2</AxleConfiguration>
-    <CurbMassChassis>7750</CurbMassChassis>
-    <GrossVehicleMass>26000</GrossVehicleMass>
+    <CorrectedActualMass>7750</CorrectedActualMass>
+    <TechnicalPermissibleMaximumLadenMass>26000</TechnicalPermissibleMaximumLadenMass>
     <IdlingSpeed>600</IdlingSpeed>
     <RetarderType>None</RetarderType>
     <AngledriveType>None</AngledriveType>
-    <PTO>
+    <PTO xsi:type="PTOType">
       <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
       <PTOOtherElements>none</PTOOtherElements>
     </PTO>
 		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
 		<VocationalVehicle>false</VocationalVehicle>
 		<SleeperCab>false</SleeperCab>
-		<ADAS>
+		<ADAS xsi:type="ADAS_Conventional_Type">
 			<EngineStopStart>false</EngineStopStart>
 			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>1,2</PredictiveCruiseControl>
 		</ADAS>
-    <Components>
+    <Components xsi:type="Components_Conventional_LorryType">
       <Engine>
-        <Data id="ENG-Generic220kW7.7lEngine">
+        <Data id="ENG-Generic220kW7.7lEngine" xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Manufacturer>TUG Generic</Manufacturer>
           <Model>Generic 220kW 7.7l Engine</Model>
           <CertificationNumber>ENG-Generic 220kW 7.7l Engine</CertificationNumber>
@@ -221,7 +230,7 @@
             <Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-145.13" />
           </FullLoadAndDragCurve>
         </Data>
-        <Signature>
+        <v2.0:Signature>
           <Reference URI="#ENG-Generic220kW7.7lEngine" xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
               <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -230,10 +239,10 @@
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
             <DigestValue></DigestValue>
           </Reference>
-        </Signature>
+        </v2.0:Signature>
       </Engine>
       <Gearbox>
-        <Data id="GBX-APT-SGenericTqMax1200">
+        <Data id="GBX-APT-SGenericTqMax1200" xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Manufacturer>TUG Generic</Manufacturer>
           <Model>APT-S Generic TqMax1200</Model>
           <CertificationNumber>GBX-APT-S Generic TqMax1200</CertificationNumber>
@@ -241,7 +250,7 @@
           <AppVersion>VectoCore</AppVersion>
           <TransmissionType>APT-S</TransmissionType>
           <MainCertificationMethod>Standard values</MainCertificationMethod>
-          <Gears>
+          <Gears xsi:type="GearsDeclarationType">
             <Gear number="1">
               <Ratio>3.490</Ratio>
               <TorqueLossMap>
@@ -1150,7 +1159,7 @@
             </Gear>
           </Gears>
         </Data>
-        <Signature>
+        <v2.0:Signature>
           <Reference URI="#GBX-APT-SGenericTqMax1200" xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
               <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -1159,9 +1168,10 @@
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
             <DigestValue></DigestValue>
           </Reference>
-        </Signature>
+        </v2.0:Signature>
+        </Gearbox>
         <TorqueConverter>
-          <Data id="TC-APT-SGenericTqMax1200">
+          <Data id="TC-APT-SGenericTqMax1200" xsi:type="TorqueConverterDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
             <Manufacturer>TUG Generic</Manufacturer>
             <Model>APT-S Generic TqMax1200</Model>
             <CertificationNumber>N/A</CertificationNumber>
@@ -1198,7 +1208,7 @@
               <Entry speedRatio="5.0000" torqueRatio="1.00" inputTorqueRef="-4242.00" />
             </Characteristics>
           </Data>
-          <Signature>
+          <v2.0:Signature>
             <Reference URI="#TC-APT-SGenericTqMax1200" xmlns="http://www.w3.org/2000/09/xmldsig#">
               <Transforms>
                 <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -1207,11 +1217,10 @@
               <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
               <DigestValue></DigestValue>
             </Reference>
-          </Signature>
+          </v2.0:Signature>
         </TorqueConverter>
-      </Gearbox>
       <Axlegear>
-        <Data id="AXLGEAR-6.500">
+        <Data id="AXLGEAR-6.500" xsi:type="AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Manufacturer>TUG Generic</Manufacturer>
           <Model>N.A.</Model>
           <CertificationNumber>AXLGEAR-6.500</CertificationNumber>
@@ -1993,7 +2002,7 @@
             <Entry inputSpeed="3250.00" inputTorque="-7960.98" torqueLoss="268.68" />
           </TorqueLossMap>
         </Data>
-        <Signature>
+        <v2.0:Signature>
           <Reference URI="#AXLGEAR-6.500" xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
               <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -2002,17 +2011,17 @@
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
             <DigestValue></DigestValue>
           </Reference>
-        </Signature>
+        </v2.0:Signature>
       </Axlegear>
       <AxleWheels>
-        <Data>
+        <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Axles>
-            <Axle axleNumber="1">
+            <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
               <AxleType>VehicleNonDriven</AxleType>
               <TwinTyres>false</TwinTyres>
               <Steered>true</Steered>
               <Tyre>
-                <Data id="TYRE-315_70R22.5">
+                <Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
                   <Manufacturer>TUG Generic</Manufacturer>
                   <Model>315/70 R22.5</Model>
                   <CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -2034,12 +2043,12 @@
                 </Signature>
               </Tyre>
             </Axle>
-            <Axle axleNumber="2">
+            <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
               <AxleType>VehicleDriven</AxleType>
               <TwinTyres>true</TwinTyres>
               <Steered>false</Steered>
               <Tyre>
-                <Data id="TYRE-315_70R22.5">
+                <Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
                   <Manufacturer>TUG Generic</Manufacturer>
                   <Model>315/70 R22.5</Model>
                   <CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -2061,12 +2070,12 @@
                 </Signature>
               </Tyre>
             </Axle>
-            <Axle axleNumber="3">
+            <Axle axleNumber="3" xsi:type="AxleDataDeclarationType">
               <AxleType>VehicleNonDriven</AxleType>
               <TwinTyres>false</TwinTyres>
               <Steered>false</Steered>
               <Tyre>
-                <Data id="TYRE-315_70R22.5">
+                <Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
                   <Manufacturer>TUG Generic</Manufacturer>
                   <Model>315/70 R22.5</Model>
                   <CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -2092,12 +2101,12 @@
         </Data>
       </AxleWheels>
       <Auxiliaries>
-        <Data>
+        <Data xsi:type="AUX_Conventional_LorryDataType">
           <Fan>
             <Technology>Belt driven or driven via transm. - Electronically controlled visco clutch</Technology>
           </Fan>
           <SteeringPump>
-            <Technology>Fixed displacement</Technology>
+            <Technology axleNumber="1">Fixed displacement</Technology>
           </SteeringPump>
           <ElectricSystem>
             <Technology>Standard technology</Technology>
@@ -2111,7 +2120,7 @@
         </Data>
       </Auxiliaries>
       <AirDrag>
-        <Data id="Airdrag-N.A.">
+        <Data id="Airdrag-N.A." xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Manufacturer>TUG Generic</Manufacturer>
           <Model>N.A.</Model>
           <CertificationNumber>N.A.</CertificationNumber>
@@ -2121,7 +2130,7 @@
           <TransferredCdxA>5.80</TransferredCdxA>
           <DeclaredCdxA>5.80</DeclaredCdxA>
         </Data>
-        <Signature>
+        <v2.0:Signature>
           <Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
               <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -2130,8 +2139,8 @@
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
             <DigestValue></DigestValue>
           </Reference>
-        </Signature>
+        </v2.0:Signature>
       </AirDrag>
     </Components>
-  </Vehicle>
+  </v2.0:Vehicle>
 </tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_6x2_vehicle-class-9_EURO6_2018_PCC.xml b/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_6x2_vehicle-class-9_EURO6_2018_PCC.xml
index d8b9dfbf14482b8229015c49edc00d4f52294d36..0bfd8adf03b317da4c26670f5113e279992819cf 100644
--- a/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_6x2_vehicle-class-9_EURO6_2018_PCC.xml	
+++ b/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_6x2_vehicle-class-9_EURO6_2018_PCC.xml	
@@ -1,36 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
-  <Vehicle id="VEH-class9_PCC">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
+xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
+xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"  
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
+  <v2.0:Vehicle id="VEH-class9_PCC" xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType">
     <Manufacturer>Generic Vendor</Manufacturer>
     <ManufacturerAddress>N.A.</ManufacturerAddress>
     <Model>N.A.</Model>
     <VIN>N/A</VIN>
     <Date>2017-07-06T15:06:08.5263609Z</Date>
-    <LegislativeClass>N3</LegislativeClass>
-    <VehicleCategory>Rigid Truck</VehicleCategory>
+    <LegislativeCategory>N3</LegislativeCategory>
+    <ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
     <AxleConfiguration>6x2</AxleConfiguration>
-    <CurbMassChassis>9300</CurbMassChassis>
-    <GrossVehicleMass>26000</GrossVehicleMass>
+    <CorrectedActualMass>9300</CorrectedActualMass>
+    <TechnicalPermissibleMaximumLadenMass>26000</TechnicalPermissibleMaximumLadenMass>
     <IdlingSpeed>600</IdlingSpeed>
     <RetarderType>Transmission Output Retarder</RetarderType>
     <RetarderRatio>1.000</RetarderRatio>
     <AngledriveType>None</AngledriveType>
-    <PTO>
+    <PTO xsi:type="PTOType">
       <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
       <PTOOtherElements>none</PTOOtherElements>
     </PTO>
 		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
 		<VocationalVehicle>false</VocationalVehicle>
 		<SleeperCab>false</SleeperCab>
-		<ADAS>
+		<ADAS xsi:type="ADAS_Conventional_Type">
 			<EngineStopStart>false</EngineStopStart>
 			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>1,2</PredictiveCruiseControl>
 		</ADAS>
-    <Components>
+    <Components xsi:type="Components_Conventional_LorryType">
       <Engine>
-        <Data id="ENG-N.A.">
+        <Data id="ENG-N.A." xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Manufacturer>Generic Vendor</Manufacturer>
           <Model>N.A.</Model>
           <CertificationNumber>ENG-N.A.</CertificationNumber>
@@ -169,7 +178,7 @@
             <Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00" />
           </FullLoadAndDragCurve>
         </Data>
-        <Signature>
+        <v2.0:Signature>
           <Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
               <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -178,10 +187,10 @@
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
             <DigestValue></DigestValue>
           </Reference>
-        </Signature>
+        </v2.0:Signature>
       </Engine>
       <Gearbox>
-        <Data id="GBX-N.A.">
+        <Data id="GBX-N.A." xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Manufacturer>Generic Vendor</Manufacturer>
           <Model>N.A.</Model>
           <CertificationNumber>GBX-N.A.</CertificationNumber>
@@ -189,7 +198,7 @@
           <AppVersion>VectoCore</AppVersion>
           <TransmissionType>AMT</TransmissionType>
           <MainCertificationMethod>Standard values</MainCertificationMethod>
-          <Gears>
+          <Gears xsi:type="GearsDeclarationType">
             <Gear number="1">
               <Ratio>14.930</Ratio>
               <TorqueLossMap>
@@ -372,7 +381,7 @@
             </Gear>
           </Gears>
         </Data>
-        <Signature>
+        <v2.0:Signature>
           <Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
               <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -381,10 +390,10 @@
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
             <DigestValue></DigestValue>
           </Reference>
-        </Signature>
+        </v2.0:Signature>
       </Gearbox>
       <Retarder>
-        <Data id="RET-N.A.">
+        <Data id="RET-N.A." xsi:type="RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Manufacturer>Generic Vendor</Manufacturer>
           <Model>N.A.</Model>
           <CertificationNumber>N/A</CertificationNumber>
@@ -425,7 +434,7 @@
             <Entry retarderSpeed="3000.00" torqueLoss="28.00" />
           </RetarderLossMap>
         </Data>
-        <Signature>
+        <v2.0:Signature>
           <Reference URI="#RET-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
               <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -434,10 +443,10 @@
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
             <DigestValue></DigestValue>
           </Reference>
-        </Signature>
+        </v2.0:Signature>
       </Retarder>
       <Axlegear>
-        <Data id="AXLGEAR-2.640">
+        <Data id="AXLGEAR-2.640" xsi:type="AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Manufacturer>Generic Vendor</Manufacturer>
           <Model>N.A.</Model>
           <CertificationNumber>AXLGEAR-2.640</CertificationNumber>
@@ -459,7 +468,7 @@
             <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
           </TorqueLossMap>
         </Data>
-        <Signature>
+        <v2.0:Signature>
           <Reference URI="#AXLGEAR-2.640" xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
               <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -468,17 +477,17 @@
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
             <DigestValue></DigestValue>
           </Reference>
-        </Signature>
+        </v2.0:Signature>
       </Axlegear>
       <AxleWheels>
-        <Data>
+        <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Axles>
-            <Axle axleNumber="1">
+            <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
               <AxleType>VehicleNonDriven</AxleType>
               <TwinTyres>false</TwinTyres>
               <Steered>true</Steered>
               <Tyre>
-                <Data id="TYRE-315_70R22.5">
+                <Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
                   <Manufacturer>Generic Vendor</Manufacturer>
                   <Model>315/70 R22.5</Model>
                   <CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -500,12 +509,12 @@
                 </Signature>
               </Tyre>
             </Axle>
-            <Axle axleNumber="2">
+            <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
               <AxleType>VehicleDriven</AxleType>
               <TwinTyres>true</TwinTyres>
               <Steered>false</Steered>
               <Tyre>
-                <Data id="TYRE-315_70R22.5">
+                <Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
                   <Manufacturer>Generic Vendor</Manufacturer>
                   <Model>315/70 R22.5</Model>
                   <CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -527,12 +536,12 @@
                 </Signature>
               </Tyre>
             </Axle>
-            <Axle axleNumber="3">
+            <Axle axleNumber="3" xsi:type="AxleDataDeclarationType">
               <AxleType>VehicleNonDriven</AxleType>
               <TwinTyres>false</TwinTyres>
               <Steered>false</Steered>
               <Tyre>
-                <Data id="TYRE-315_70R22.5">
+                <Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
                   <Manufacturer>Generic Vendor</Manufacturer>
                   <Model>315/70 R22.5</Model>
                   <CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -558,12 +567,12 @@
         </Data>
       </AxleWheels>
       <Auxiliaries>
-        <Data>
+        <Data xsi:type="AUX_Conventional_LorryDataType">
           <Fan>
             <Technology>Crankshaft mounted - Electronically controlled visco clutch</Technology>
           </Fan>
           <SteeringPump>
-            <Technology>Fixed displacement</Technology>
+            <Technology axleNumber="1">Fixed displacement</Technology>
           </SteeringPump>
           <ElectricSystem>
             <Technology>Standard technology</Technology>
@@ -577,7 +586,7 @@
         </Data>
       </Auxiliaries>
       <AirDrag>
-        <Data id="Airdrag-N.A.">
+        <Data id="Airdrag-N.A." xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Manufacturer>Generic Vendor</Manufacturer>
           <Model>N.A.</Model>
           <CertificationNumber>N.A.</CertificationNumber>
@@ -587,7 +596,7 @@
           <TransferredCdxA>6.05</TransferredCdxA>
           <DeclaredCdxA>6.05</DeclaredCdxA>
         </Data>
-        <Signature>
+        <v2.0:Signature>
           <Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
               <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -596,8 +605,8 @@
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
             <DigestValue></DigestValue>
           </Reference>
-        </Signature>
+        </v2.0:Signature>
       </AirDrag>
     </Components>
-  </Vehicle>
+  </v2.0:Vehicle>
 </tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_4x2_vehicle-class-5_EURO6_2018_EcoRoll.xml b/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_4x2_vehicle-class-5_EURO6_2018_EcoRoll.xml
index aa7d51cb71af2244fb8fe857a0d14e070a24e311..5b0a76fdb738059772ddb610787da9921b38a1a6 100644
--- a/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_4x2_vehicle-class-5_EURO6_2018_EcoRoll.xml
+++ b/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_4x2_vehicle-class-5_EURO6_2018_EcoRoll.xml
@@ -1,37 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 
-xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
-  <Vehicle id="VEH-Class5_EcoRoll">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
+xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
+xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"  
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
+  <v2.0:Vehicle id="VEH-Class5_EcoRoll" xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType">
     <Manufacturer>Generic Vendor</Manufacturer>
     <ManufacturerAddress>N.A.</ManufacturerAddress>
     <Model>N.A.</Model>
     <VIN>N/A</VIN>
     <Date>2017-07-06T15:06:08.3093609Z</Date>
-    <LegislativeClass>N3</LegislativeClass>
-    <VehicleCategory>Tractor</VehicleCategory>
+    <LegislativeCategory>N3</LegislativeCategory>
+    <ChassisConfiguration>Tractor</ChassisConfiguration>
     <AxleConfiguration>4x2</AxleConfiguration>
-    <CurbMassChassis>8229</CurbMassChassis>
-    <GrossVehicleMass>18000</GrossVehicleMass>
+    <CorrectedActualMass>8229</CorrectedActualMass>
+    <TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
     <IdlingSpeed>600</IdlingSpeed>
     <RetarderType>Transmission Output Retarder</RetarderType>
     <RetarderRatio>1.000</RetarderRatio>
     <AngledriveType>None</AngledriveType>
-    <PTO>
+    <PTO xsi:type="PTOType">
       <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
       <PTOOtherElements>none</PTOOtherElements>
     </PTO>
 		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
 		<VocationalVehicle>false</VocationalVehicle>
 		<SleeperCab>false</SleeperCab>
-		<ADAS>
+		<ADAS xsi:type="ADAS_Conventional_Type">
 			<EngineStopStart>false</EngineStopStart>
 			<EcoRollWithoutEngineStop>true</EcoRollWithoutEngineStop>
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>none</PredictiveCruiseControl>
 		</ADAS>
-    <Components>
+    <Components xsi:type="Components_Conventional_LorryType">
       <Engine>
-        <Data id="ENG-N.A.">
+        <Data id="ENG-N.A." xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Manufacturer>Generic Vendor</Manufacturer>
           <Model>N.A.</Model>
           <CertificationNumber>ENG-N.A.</CertificationNumber>
@@ -170,7 +178,7 @@ xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="ur
             <Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00" />
           </FullLoadAndDragCurve>
         </Data>
-        <Signature>
+        <v2.0:Signature>
           <Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
               <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -179,10 +187,10 @@ xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="ur
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
             <DigestValue></DigestValue>
           </Reference>
-        </Signature>
+        </v2.0:Signature>
       </Engine>
       <Gearbox>
-        <Data id="GBX-N.A.">
+        <Data id="GBX-N.A." xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Manufacturer>Generic Vendor</Manufacturer>
           <Model>N.A.</Model>
           <CertificationNumber>GBX-N.A.</CertificationNumber>
@@ -190,7 +198,7 @@ xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="ur
           <AppVersion>VectoCore</AppVersion>
           <TransmissionType>AMT</TransmissionType>
           <MainCertificationMethod>Standard values</MainCertificationMethod>
-          <Gears>
+          <Gears xsi:type="GearsDeclarationType">
             <Gear number="1">
               <Ratio>14.930</Ratio>
               <TorqueLossMap>
@@ -373,7 +381,7 @@ xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="ur
             </Gear>
           </Gears>
         </Data>
-        <Signature>
+        <v2.0:Signature>
           <Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
               <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -382,10 +390,10 @@ xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="ur
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
             <DigestValue></DigestValue>
           </Reference>
-        </Signature>
+        </v2.0:Signature>
       </Gearbox>
       <Retarder>
-        <Data id="RET-N.A.">
+        <Data id="RET-N.A." xsi:type="RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Manufacturer>Generic Vendor</Manufacturer>
           <Model>N.A.</Model>
           <CertificationNumber>N/A</CertificationNumber>
@@ -426,7 +434,7 @@ xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="ur
             <Entry retarderSpeed="3000.00" torqueLoss="28.00" />
           </RetarderLossMap>
         </Data>
-        <Signature>
+        <v2.0:Signature>
           <Reference URI="#RET-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
               <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -435,10 +443,10 @@ xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="ur
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
             <DigestValue></DigestValue>
           </Reference>
-        </Signature>
+        </v2.0:Signature>
       </Retarder>
       <Axlegear>
-        <Data id="AXLGEAR-2.640">
+        <Data id="AXLGEAR-2.640" xsi:type="AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Manufacturer>Generic Vendor</Manufacturer>
           <Model>N.A.</Model>
           <CertificationNumber>AXLGEAR-2.640</CertificationNumber>
@@ -460,7 +468,7 @@ xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="ur
             <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
           </TorqueLossMap>
         </Data>
-        <Signature>
+        <v2.0:Signature>
           <Reference URI="#AXLGEAR-2.640" xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
               <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -469,17 +477,17 @@ xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="ur
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
             <DigestValue></DigestValue>
           </Reference>
-        </Signature>
+        </v2.0:Signature>
       </Axlegear>
       <AxleWheels>
-        <Data>
+        <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Axles>
-            <Axle axleNumber="1">
+            <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
               <AxleType>VehicleNonDriven</AxleType>
               <TwinTyres>false</TwinTyres>
               <Steered>true</Steered>
               <Tyre>
-                <Data id="TYRE-315_70R22.5">
+                <Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
                   <Manufacturer>Generic Vendor</Manufacturer>
                   <Model>315/70 R22.5</Model>
                   <CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -501,12 +509,12 @@ xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="ur
                 </Signature>
               </Tyre>
             </Axle>
-            <Axle axleNumber="2">
+            <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
               <AxleType>VehicleDriven</AxleType>
               <TwinTyres>true</TwinTyres>
               <Steered>false</Steered>
               <Tyre>
-                <Data id="TYRE-315_70R22.5">
+                <Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
                   <Manufacturer>Generic Vendor</Manufacturer>
                   <Model>315/70 R22.5</Model>
                   <CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -532,12 +540,12 @@ xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="ur
         </Data>
       </AxleWheels>
       <Auxiliaries>
-        <Data>
+        <Data xsi:type="AUX_Conventional_LorryDataType">
           <Fan>
             <Technology>Crankshaft mounted - Electronically controlled visco clutch</Technology>
           </Fan>
           <SteeringPump>
-            <Technology>Fixed displacement</Technology>
+            <Technology axleNumber="1">Fixed displacement</Technology>
           </SteeringPump>
           <ElectricSystem>
             <Technology>Standard technology</Technology>
@@ -551,7 +559,7 @@ xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="ur
         </Data>
       </Auxiliaries>
       <AirDrag>
-        <Data id="Airdrag-N.A.">
+        <Data id="Airdrag-N.A." xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Manufacturer>Generic Vendor</Manufacturer>
           <Model>N.A.</Model>
           <CertificationNumber>N.A.</CertificationNumber>
@@ -561,7 +569,7 @@ xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="ur
           <TransferredCdxA>5.45</TransferredCdxA>
           <DeclaredCdxA>5.45</DeclaredCdxA>
         </Data>
-        <Signature>
+        <v2.0:Signature>
           <Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
               <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -570,8 +578,8 @@ xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="ur
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
             <DigestValue></DigestValue>
           </Reference>
-        </Signature>
+        </v2.0:Signature>
       </AirDrag>
     </Components>
-  </Vehicle>
+  </v2.0:Vehicle>
 </tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_4x2_vehicle-class-5_EURO6_2018_PCC.xml b/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_4x2_vehicle-class-5_EURO6_2018_PCC.xml
index ae3a09ea31e3410d9266415e68ec904328fb187b..91c4e72a9d4ea9eeee0d5db6e37126c12b6540e5 100644
--- a/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_4x2_vehicle-class-5_EURO6_2018_PCC.xml
+++ b/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_4x2_vehicle-class-5_EURO6_2018_PCC.xml
@@ -1,36 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
-  <Vehicle id="VEH-Class5_PCC">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
+xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 
+xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" 
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" 
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"  
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
+  <v2.0:Vehicle id="VEH-Class5_PCC" xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType">
     <Manufacturer>Generic Vendor</Manufacturer>
     <ManufacturerAddress>N.A.</ManufacturerAddress>
     <Model>N.A.</Model>
     <VIN>N/A</VIN>
     <Date>2017-07-06T15:06:08.3093609Z</Date>
-    <LegislativeClass>N3</LegislativeClass>
-    <VehicleCategory>Tractor</VehicleCategory>
+    <LegislativeCategory>N3</LegislativeCategory>
+    <ChassisConfiguration>Tractor</ChassisConfiguration>
     <AxleConfiguration>4x2</AxleConfiguration>
-    <CurbMassChassis>8229</CurbMassChassis>
-    <GrossVehicleMass>18000</GrossVehicleMass>
+    <CorrectedActualMass>8229</CorrectedActualMass>
+    <TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
     <IdlingSpeed>600</IdlingSpeed>
     <RetarderType>Transmission Output Retarder</RetarderType>
     <RetarderRatio>1.000</RetarderRatio>
     <AngledriveType>None</AngledriveType>
-    <PTO>
+    <PTO xsi:type="PTOType">
       <PTOShaftsGearWheels>none</PTOShaftsGearWheels>
       <PTOOtherElements>none</PTOOtherElements>
     </PTO>
 		<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
 		<VocationalVehicle>false</VocationalVehicle>
 		<SleeperCab>false</SleeperCab>
-		<ADAS>
+		<ADAS xsi:type="ADAS_Conventional_Type">
 			<EngineStopStart>false</EngineStopStart>
 			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>1,2</PredictiveCruiseControl>
 		</ADAS>
-    <Components>
+    <Components xsi:type="Components_Conventional_LorryType">
       <Engine>
-        <Data id="ENG-N.A.">
+        <Data id="ENG-N.A." xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Manufacturer>Generic Vendor</Manufacturer>
           <Model>N.A.</Model>
           <CertificationNumber>ENG-N.A.</CertificationNumber>
@@ -169,7 +178,7 @@
             <Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00" />
           </FullLoadAndDragCurve>
         </Data>
-        <Signature>
+        <v2.0:Signature>
           <Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
               <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -178,10 +187,10 @@
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
             <DigestValue></DigestValue>
           </Reference>
-        </Signature>
+        </v2.0:Signature>
       </Engine>
       <Gearbox>
-        <Data id="GBX-N.A.">
+        <Data id="GBX-N.A." xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Manufacturer>Generic Vendor</Manufacturer>
           <Model>N.A.</Model>
           <CertificationNumber>GBX-N.A.</CertificationNumber>
@@ -189,7 +198,7 @@
           <AppVersion>VectoCore</AppVersion>
           <TransmissionType>AMT</TransmissionType>
           <MainCertificationMethod>Standard values</MainCertificationMethod>
-          <Gears>
+          <Gears xsi:type="GearsDeclarationType">
             <Gear number="1">
               <Ratio>14.930</Ratio>
               <TorqueLossMap>
@@ -372,7 +381,7 @@
             </Gear>
           </Gears>
         </Data>
-        <Signature>
+        <v2.0:Signature>
           <Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
               <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -381,10 +390,10 @@
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
             <DigestValue></DigestValue>
           </Reference>
-        </Signature>
+        </v2.0:Signature>
       </Gearbox>
       <Retarder>
-        <Data id="RET-N.A.">
+        <Data id="RET-N.A." xsi:type="RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Manufacturer>Generic Vendor</Manufacturer>
           <Model>N.A.</Model>
           <CertificationNumber>N/A</CertificationNumber>
@@ -425,7 +434,7 @@
             <Entry retarderSpeed="3000.00" torqueLoss="28.00" />
           </RetarderLossMap>
         </Data>
-        <Signature>
+        <v2.0:Signature>
           <Reference URI="#RET-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
               <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -434,10 +443,10 @@
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
             <DigestValue></DigestValue>
           </Reference>
-        </Signature>
+        </v2.0:Signature>
       </Retarder>
       <Axlegear>
-        <Data id="AXLGEAR-2.640">
+        <Data id="AXLGEAR-2.640" xsi:type="AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Manufacturer>Generic Vendor</Manufacturer>
           <Model>N.A.</Model>
           <CertificationNumber>AXLGEAR-2.640</CertificationNumber>
@@ -459,7 +468,7 @@
             <Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
           </TorqueLossMap>
         </Data>
-        <Signature>
+        <v2.0:Signature>
           <Reference URI="#AXLGEAR-2.640" xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
               <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -468,17 +477,17 @@
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
             <DigestValue></DigestValue>
           </Reference>
-        </Signature>
+        </v2.0:Signature>
       </Axlegear>
       <AxleWheels>
-        <Data>
+        <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Axles>
-            <Axle axleNumber="1">
+            <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
               <AxleType>VehicleNonDriven</AxleType>
               <TwinTyres>false</TwinTyres>
               <Steered>true</Steered>
               <Tyre>
-                <Data id="TYRE-315_70R22.5">
+                <Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
                   <Manufacturer>Generic Vendor</Manufacturer>
                   <Model>315/70 R22.5</Model>
                   <CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -500,12 +509,12 @@
                 </Signature>
               </Tyre>
             </Axle>
-            <Axle axleNumber="2">
+            <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
               <AxleType>VehicleDriven</AxleType>
               <TwinTyres>true</TwinTyres>
               <Steered>false</Steered>
               <Tyre>
-                <Data id="TYRE-315_70R22.5">
+                <Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
                   <Manufacturer>Generic Vendor</Manufacturer>
                   <Model>315/70 R22.5</Model>
                   <CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -531,12 +540,12 @@
         </Data>
       </AxleWheels>
       <Auxiliaries>
-        <Data>
+        <Data xsi:type="AUX_Conventional_LorryDataType">
           <Fan>
             <Technology>Crankshaft mounted - Electronically controlled visco clutch</Technology>
           </Fan>
           <SteeringPump>
-            <Technology>Fixed displacement</Technology>
+            <Technology axleNumber="1">Fixed displacement</Technology>
           </SteeringPump>
           <ElectricSystem>
             <Technology>Standard technology</Technology>
@@ -550,7 +559,7 @@
         </Data>
       </Auxiliaries>
       <AirDrag>
-        <Data id="Airdrag-N.A.">
+        <Data id="Airdrag-N.A." xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
           <Manufacturer>Generic Vendor</Manufacturer>
           <Model>N.A.</Model>
           <CertificationNumber>N.A.</CertificationNumber>
@@ -560,7 +569,7 @@
           <TransferredCdxA>5.45</TransferredCdxA>
           <DeclaredCdxA>5.45</DeclaredCdxA>
         </Data>
-        <Signature>
+        <v2.0:Signature>
           <Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
             <Transforms>
               <Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -569,8 +578,8 @@
             <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
             <DigestValue></DigestValue>
           </Reference>
-        </Signature>
+        </v2.0:Signature>
       </AirDrag>
     </Components>
-  </Vehicle>
+  </v2.0:Vehicle>
 </tns:VectoInputDeclaration>
\ No newline at end of file