diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 39a/CompletedBus_39a.vecto b/Generic Vehicles/Declaration Mode/CompletedBus 39a/CompletedBus_39a.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..15aa214b0055d2b517ecb46394bc5810ac988fd5
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 39a/CompletedBus_39a.vecto	
@@ -0,0 +1,12 @@
+{
+	"Header": {
+	"CreatedBy": "Markus Quaritsch, IVT, Graz University of Technology",
+	"Date": "2020-02-07T15:06:30.9725917Z",
+	"AppVersion": "2.2",
+	"FileVersion": 7
+	},
+	"Body": {
+		"CompletedVehicle": "vecto_vehicle-completed_heavyBus_39a.xml",
+		"PrimaryVehicleResults":  "primary_heavyBus group P39_40_nonSmart_ESS_PIF.xml"
+	}
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 39a/primary_heavyBus group P39_40_nonSmart_ESS_PIF.xml b/Generic Vehicles/Declaration Mode/CompletedBus 39a/primary_heavyBus group P39_40_nonSmart_ESS_PIF.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ee0f566dfddcdde351ec5c2023c53de3b7a428a7
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 39a/primary_heavyBus group P39_40_nonSmart_ESS_PIF.xml	
@@ -0,0 +1,575 @@
+<?xml version="1.0" encoding="utf-8"?>
+<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
+  <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-10652bf49ae0499f8689">
+    <Vehicle xsi:type="VehiclePIFType">
+      <ManufacturerPrimaryVehicle>Generic Bus Manufacturer</ManufacturerPrimaryVehicle>
+      <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+      <Model>Generic Model</Model>
+      <VIN>VEH-1234567890_nonSmart-ESS</VIN>
+      <Date>2017-02-15T11:00:00Z</Date>
+      <VehicleCategory>Bus</VehicleCategory>
+      <AxleConfiguration>8x2</AxleConfiguration>
+      <Articulated>true</Articulated>
+      <TechnicalPermissibleMaximumLadenMass>40000</TechnicalPermissibleMaximumLadenMass>
+      <IdlingSpeed>600</IdlingSpeed>
+      <RetarderType>Transmission Output Retarder</RetarderType>
+      <RetarderRatio>1.000</RetarderRatio>
+      <AngledriveType>None</AngledriveType>
+      <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+      <ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
+        <adas:EngineStopStart>true</adas:EngineStopStart>
+        <adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
+        <adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
+        <adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
+      </ADAS>
+      <TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
+        <tcl:Entry gear="6" maxTorque="1800" />
+        <tcl:Entry gear="1" maxTorque="2500" />
+        <tcl:Entry gear="12" maxTorque="1900" />
+      </TorqueLimits>
+      <Components xsi:type="VehicleComponentsPIFType">
+        <Engine>
+          <Data xsi:type="EngineDataPIFType">
+            <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+            <Model>8x2 articulated bus Engine</Model>
+            <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+            <Date>2017-02-15T11:00:00Z</Date>
+            <AppVersion>VectoEngine x.y</AppVersion>
+            <Displacement>12730</Displacement>
+            <RatedSpeed>2200</RatedSpeed>
+            <RatedPower>260</RatedPower>
+            <MaxEngineTorque>2400</MaxEngineTorque>
+            <WHRType>
+              <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
+              <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
+              <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+            </WHRType>
+            <Mode>
+              <IdlingSpeed>600</IdlingSpeed>
+              <FullLoadAndDragCurve>
+                <Entry engineSpeed="600.00" maxTorque="710.00" dragTorque="-52.00" />
+                <Entry engineSpeed="800.00" maxTorque="989.00" dragTorque="-63.00" />
+                <Entry engineSpeed="1000.00" maxTorque="1265.00" dragTorque="-73.00" />
+                <Entry engineSpeed="1200.00" maxTorque="1420.00" dragTorque="-87.00" />
+                <Entry engineSpeed="1400.00" maxTorque="1420.00" dragTorque="-101.00" />
+                <Entry engineSpeed="1600.00" maxTorque="1420.00" dragTorque="-114.00" />
+                <Entry engineSpeed="1800.00" maxTorque="1329.00" dragTorque="-122.00" />
+                <Entry engineSpeed="2000.00" maxTorque="1227.00" dragTorque="-131.00" />
+                <Entry engineSpeed="2200.00" maxTorque="1129.00" dragTorque="-147.00" />
+                <Entry engineSpeed="2400.00" maxTorque="965.00" dragTorque="-159.00" />
+                <Entry engineSpeed="2500.00" maxTorque="841.00" dragTorque="-165.00" />
+                <Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-172.00" />
+              </FullLoadAndDragCurve>
+              <Fuels>
+                <FuelType>Diesel CI</FuelType>
+              </Fuels>
+            </Mode>
+          </Data>
+        </Engine>
+        <Transmission>
+          <Data xsi:type="TransmissionDataPIFType">
+            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+            <Model>8x2 Bus</Model>
+            <MainCertificationMethod>Standard values</MainCertificationMethod>
+            <Date>2017-01-11T11:00:00Z</Date>
+            <AppVersion>3.0.1</AppVersion>
+            <TransmissionType>APT-P</TransmissionType>
+            <Gears xsi:type="TransmissionGearsPIFType">
+              <Gear number="1">
+                <Ratio>1.361</Ratio>
+                <MaxTorque>1900</MaxTorque>
+              </Gear>
+              <Gear number="2">
+                <Ratio>1.000</Ratio>
+                <MaxTorque>1900</MaxTorque>
+              </Gear>
+              <Gear number="3">
+                <Ratio>0.735</Ratio>
+              </Gear>
+            </Gears>
+          </Data>
+        </Transmission>
+        <Axlegear>
+          <Data xsi:type="AxlegearDataPIFType">
+            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+            <Model>8x2 articulated bus</Model>
+            <CertificationMethod>Standard values</CertificationMethod>
+            <Date>2017-01-11T11:00:00Z</Date>
+            <AppVersion>3.0.1</AppVersion>
+            <LineType>Single portal axle</LineType>
+            <Ratio>5.810</Ratio>
+          </Data>
+        </Axlegear>
+        <pbus:AxleWheels xmlns:pbus="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
+          <Data xsi:type="AxleWheelsDataDeclarationType">
+            <Axles>
+              <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+                <AxleType>VehicleNonDriven</AxleType>
+                <TwinTyres>false</TwinTyres>
+                <Steered>true</Steered>
+                <Tyre>
+                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+                    <Model>Generic Wheel</Model>
+                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+                    <Date>2017-01-11T14:00:00Z</Date>
+                    <AppVersion>Tyre Generation App 1.0</AppVersion>
+                    <Dimension>315/70 R22.5</Dimension>
+                    <RRCDeclared>0.0055</RRCDeclared>
+                    <FzISO>31300</FzISO>
+                  </Data>
+                  <Signature>
+                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+                      <di:Transforms>
+                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                        <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                      </di:Transforms>
+                      <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                      <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+                    </di:Reference>
+                  </Signature>
+                </Tyre>
+              </Axle>
+              <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+                <AxleType>VehicleNonDriven</AxleType>
+                <TwinTyres>true</TwinTyres>
+                <Steered>false</Steered>
+                <Tyre>
+                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+                    <Model>Generic Wheel</Model>
+                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+                    <Date>2017-01-11T14:00:00Z</Date>
+                    <AppVersion>Tyre Generation App 1.0</AppVersion>
+                    <Dimension>315/70 R22.5</Dimension>
+                    <RRCDeclared>0.0063</RRCDeclared>
+                    <FzISO>31300</FzISO>
+                  </Data>
+                  <Signature>
+                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+                      <di:Transforms>
+                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                        <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                      </di:Transforms>
+                      <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                      <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+                    </di:Reference>
+                  </Signature>
+                </Tyre>
+              </Axle>
+              <Axle axleNumber="3" xsi:type="AxleDataDeclarationType">
+                <AxleType>VehicleDriven</AxleType>
+                <TwinTyres>true</TwinTyres>
+                <Steered>false</Steered>
+                <Tyre>
+                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+                    <Model>Generic Wheel</Model>
+                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+                    <Date>2017-01-11T14:00:00Z</Date>
+                    <AppVersion>Tyre Generation App 1.0</AppVersion>
+                    <Dimension>315/70 R22.5</Dimension>
+                    <RRCDeclared>0.0063</RRCDeclared>
+                    <FzISO>31300</FzISO>
+                  </Data>
+                  <Signature>
+                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+                      <di:Transforms>
+                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                        <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                      </di:Transforms>
+                      <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                      <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+                    </di:Reference>
+                  </Signature>
+                </Tyre>
+              </Axle>
+              <Axle axleNumber="4" xsi:type="AxleDataDeclarationType">
+                <AxleType>VehicleNonDriven</AxleType>
+                <TwinTyres>false</TwinTyres>
+                <Steered>false</Steered>
+                <Tyre>
+                  <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+                    <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+                    <Model>Generic Wheel</Model>
+                    <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+                    <Date>2017-01-11T14:00:00Z</Date>
+                    <AppVersion>Tyre Generation App 1.0</AppVersion>
+                    <Dimension>315/70 R22.5</Dimension>
+                    <RRCDeclared>0.0055</RRCDeclared>
+                    <FzISO>31300</FzISO>
+                  </Data>
+                  <Signature>
+                    <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+                      <di:Transforms>
+                        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+                        <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+                      </di:Transforms>
+                      <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+                      <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+                    </di:Reference>
+                  </Signature>
+                </Tyre>
+              </Axle>
+            </Axles>
+          </Data>
+        </pbus:AxleWheels>
+        <Auxiliaries>
+          <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="aux:PrimaryVehicleAuxiliaryDataDeclarationType">
+            <aux:Fan>
+              <aux:Technology>Hydraulic driven - Constant displacement pump</aux:Technology>
+            </aux:Fan>
+            <aux:SteeringPump>
+              <aux:Technology axleNumber="1">Variable displacement elec. controlled</aux:Technology>
+            </aux:SteeringPump>
+            <aux:ElectricSystem>
+              <aux:AlternatorTechnology>default</aux:AlternatorTechnology>
+              <aux:SmartElectrics>false</aux:SmartElectrics>
+            </aux:ElectricSystem>
+            <aux:PneumaticSystem>
+              <aux:SizeOfAirSupply>Large Supply 2-stage</aux:SizeOfAirSupply>
+              <aux:Clutch>none</aux:Clutch>
+              <aux:CompressorRatio>1.000</aux:CompressorRatio>
+              <aux:SmartCompressionSystem>false</aux:SmartCompressionSystem>
+              <aux:SmartRegenerationSystem>false</aux:SmartRegenerationSystem>
+              <aux:AirsuspensionControl>electronically</aux:AirsuspensionControl>
+              <aux:AdBlueDosing>true</aux:AdBlueDosing>
+            </aux:PneumaticSystem>
+            <aux:HVAC>
+              <aux:AdjustableCoolantThermostat>true</aux:AdjustableCoolantThermostat>
+              <aux:EngineWasteGasHeatExchanger>true</aux:EngineWasteGasHeatExchanger>
+            </aux:HVAC>
+          </Data>
+        </Auxiliaries>
+      </Components>
+    </Vehicle>
+    <InputDataSignature>
+      <di:Reference URI="#VEH-PrimaryBus_nonSmart-ESS">
+        <di:Transforms>
+          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+        </di:Transforms>
+        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+        <di:DigestValue>jvHzwuW7gaqCxNBELjVg0ZwSEWPR+pSn2iUsocSa2/4=</di:DigestValue>
+      </di:Reference>
+    </InputDataSignature>
+    <ManufacturerRecordSignature>
+      <di:Reference URI="#RESULT-65d622ab1d834d94ac65">
+        <di:Transforms>
+          <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+          <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+        </di:Transforms>
+        <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+        <di:DigestValue>k2hbOlnDmFKemd1pQt7YrzNLf5RAKIdH7wMobex4+hw=</di:DigestValue>
+      </di:Reference>
+    </ManufacturerRecordSignature>
+    <Results>
+      <Status>error</Status>
+      <Result status="success">
+        <VehicleGroup>P39SD</VehicleGroup>
+        <Mission>Heavy Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">21659.99</TotalVehicleMass>
+          <Payload unit="kg">2059.99</Payload>
+          <PassengerCount>30.29</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">31.43467</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">2304.23</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P39SD</VehicleGroup>
+        <Mission>Heavy Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">29899.96</TotalVehicleMass>
+          <Payload unit="kg">10299.96</Payload>
+          <PassengerCount>151.47</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">40.44322</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">2964.57</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P39SD</VehicleGroup>
+        <Mission>Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">21659.99</TotalVehicleMass>
+          <Payload unit="kg">2059.99</Payload>
+          <PassengerCount>30.29</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">25.29407</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1854.11</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P39SD</VehicleGroup>
+        <Mission>Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">29899.96</TotalVehicleMass>
+          <Payload unit="kg">10299.96</Payload>
+          <PassengerCount>151.47</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">32.82324</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">2406.01</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P39SD</VehicleGroup>
+        <Mission>Suburban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">21659.99</TotalVehicleMass>
+          <Payload unit="kg">2059.99</Payload>
+          <PassengerCount>30.29</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">21.42260</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1570.32</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P39SD</VehicleGroup>
+        <Mission>Suburban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">29899.96</TotalVehicleMass>
+          <Payload unit="kg">10299.96</Payload>
+          <PassengerCount>151.47</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">26.89680</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1971.59</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P39DD</VehicleGroup>
+        <Mission>Heavy Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">27340.66</TotalVehicleMass>
+          <Payload unit="kg">2540.66</Payload>
+          <PassengerCount>37.36</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">38.59941</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">2829.42</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P39DD</VehicleGroup>
+        <Mission>Heavy Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">37503.28</TotalVehicleMass>
+          <Payload unit="kg">12703.28</Payload>
+          <PassengerCount>186.81</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">50.04116</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">3668.12</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P39DD</VehicleGroup>
+        <Mission>Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">27340.66</TotalVehicleMass>
+          <Payload unit="kg">2540.66</Payload>
+          <PassengerCount>37.36</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">31.08581</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">2278.66</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P39DD</VehicleGroup>
+        <Mission>Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">37503.28</TotalVehicleMass>
+          <Payload unit="kg">12703.28</Payload>
+          <PassengerCount>186.81</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">41.40670</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">3035.20</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P39DD</VehicleGroup>
+        <Mission>Suburban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">27340.66</TotalVehicleMass>
+          <Payload unit="kg">2540.66</Payload>
+          <PassengerCount>37.36</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">25.67399</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1881.96</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P39DD</VehicleGroup>
+        <Mission>Suburban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">37503.28</TotalVehicleMass>
+          <Payload unit="kg">12703.28</Payload>
+          <PassengerCount>186.81</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">32.19445</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">2359.92</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P40SD</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">22563.16</TotalVehicleMass>
+          <Payload unit="kg">1613.16</Payload>
+          <PassengerCount>22.72</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">18.51694</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1357.33</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P40SD</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">27402.62</TotalVehicleMass>
+          <Payload unit="kg">6452.62</Payload>
+          <PassengerCount>90.88</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">38.15886</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">2797.12</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P40SD</VehicleGroup>
+        <Mission>Coach</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">22957.48</TotalVehicleMass>
+          <Payload unit="kg">2007.48</Payload>
+          <PassengerCount>28.27</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">13.84130</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1014.60</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P40SD</VehicleGroup>
+        <Mission>Coach</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">25968.71</TotalVehicleMass>
+          <Payload unit="kg">5018.71</Payload>
+          <PassengerCount>70.69</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">15.06873</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1104.57</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P40DD</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">26840.49</TotalVehicleMass>
+          <Payload unit="kg">2240.49</Payload>
+          <PassengerCount>31.56</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">22.11304</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1620.93</CO2>
+      </Result>
+      <Result status="error">
+        <VehicleGroup>P40DD</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">33561.98</TotalVehicleMass>
+          <Payload unit="kg">8961.98</Payload>
+          <PassengerCount>126.23</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Error>98 (Interurban _P40DD_ReferenceLoad) - absTime: 6784.9522 [s], distance: 53835.3412 [m], dt: 0.6791 [s], v: 0.0259 [m/s], Gear: 1 | DrivingActionAccelerate: Failed to find operating point</Error>
+        <ErrorDetails>   bei TUGraz.VectoCore.Models.SimulationComponent.Impl.Driver.DrivingActionAccelerate(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient, IResponse previousResponse)
+   bei TUGraz.VectoCore.Models.SimulationComponent.Impl.DriverModeDrive.FirstAccelerateOrCoast(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient, Boolean prohibitOverspeed, MeterPerSecond velocityWithOverspeed, DebugData debug)
+   bei TUGraz.VectoCore.Models.SimulationComponent.Impl.DriverModeDrive.HandleRequestEngaged(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient, Boolean prohibitOverspeed, MeterPerSecond velocityWithOverspeed, DebugData debug)
+   bei TUGraz.VectoCore.Models.SimulationComponent.Impl.DriverModeDrive.DoHandleRequest(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient, Boolean prohibitOverspeed)
+   bei TUGraz.VectoCore.Models.SimulationComponent.Impl.AbstractDriverMode.Request(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient)
+   bei TUGraz.VectoCore.Models.SimulationComponent.Impl.DefaultDriverStrategy.DoHandleRequest(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient)
+   bei TUGraz.VectoCore.Models.SimulationComponent.Impl.DefaultDriverStrategy.Request(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient)
+   bei TUGraz.VectoCore.Models.SimulationComponent.Impl.Driver.Request(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient)
+   bei TUGraz.VectoCore.Models.SimulationComponent.Impl.DistanceBasedDrivingCycle.DriveDistance(Second absTime, Meter ds)
+   bei TUGraz.VectoCore.Models.SimulationComponent.Impl.DistanceBasedDrivingCycle.Request(Second absTime, Meter ds)
+   bei TUGraz.VectoCore.Models.Simulation.Impl.DistanceRun.DoSimulationStep()
+   bei TUGraz.VectoCore.Models.Simulation.Impl.VectoRun.Run()</ErrorDetails>
+      </Result>
+      <Result status="error">
+        <VehicleGroup>P40DD</VehicleGroup>
+        <Mission>Coach</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">27467.83</TotalVehicleMass>
+          <Payload unit="kg">2867.83</Payload>
+          <PassengerCount>40.39</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Error>99 (Coach _P40DD_LowLoading) - absTime: 7924.2025 [s], distance: 131329.1916 [m], dt: 0.6490 [s], v: 0.0076 [m/s], Gear: 1 | DistanceRun got an unexpected response: ResponseOverload{Delta: 228.7985 [W], Source: TUGraz.VectoCore.Models.SimulationComponent.Impl.TorqueConverter, AbsTime: , SimulationInterval: 0.0036 [s], SimulationDistance: 0.0000 [m], Acceleration: -0.0306 [m/s^2], OperatingPoint: a: -0.0306 [m/s^2], dt: 0.0036 [s], ds: 0.0000 [m], EngineSpeed: , EnginePowerRequest: , DynamicFullLoadPower: , DragPower: , EngineTorqueDemand: , EngineTorqueDemandTotal: , EngineStationaryFullLoadTorque: , EngineDynamicFullLoadTorque: , VehicleSpeed: 0.0075 [m/s], AngledrivePowerRequest: , ClutchPowerRequest: , GearboxPowerRequest: 292.2862 [W], AxlegearPowerRequest: 283.3102 [W], WheelsPowerRequest: 283.3102 [W], BrakePower: 0.0000 [W], AuxiliariesPowerDemand: , CardanTorque: 3252.6557 [Nm], GearboxInputSpeed: 0.0889 [1/s], TorqueConverterOperatingPoint: n_out: 0.0902 [1/s], n_in: 63.4602 [1/s], tq_out: 726.9261 [Nm], tq_in 297.1152 [Nm], nu: 0.00142183442517666, my: 2.44661391211967, TorqueConverterTorqueDemand: }</Error>
+        <ErrorDetails>   bei TUGraz.VectoCore.Models.Simulation.Impl.DistanceRun.&lt;&gt;c.&lt;DoSimulationStep&gt;b__1_3(IResponse r)
+   bei TUGraz.VectoCore.Utils.Switch`1.Default(Action`1 action)
+   bei TUGraz.VectoCore.Models.Simulation.Impl.DistanceRun.DoSimulationStep()
+   bei TUGraz.VectoCore.Models.Simulation.Impl.VectoRun.Run()</ErrorDetails>
+      </Result>
+      <Result status="error">
+        <VehicleGroup>P40DD</VehicleGroup>
+        <Mission>Coach</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">31769.58</TotalVehicleMass>
+          <Payload unit="kg">7169.58</Payload>
+          <PassengerCount>100.98</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Error>100 (Coach _P40DD_ReferenceLoad) - absTime: 7524.6514 [s], distance: 130336.7109 [m], dt: 0.7342 [s], v: 0.0092 [m/s], Gear: 1 | DistanceRun got an unexpected response: ResponseOverload{Delta: 270.7480 [W], Source: TUGraz.VectoCore.Models.SimulationComponent.Impl.TorqueConverter, AbsTime: , SimulationInterval: 0.0049 [s], SimulationDistance: 0.0000 [m], Acceleration: -0.0467 [m/s^2], OperatingPoint: a: -0.0467 [m/s^2], dt: 0.0049 [s], ds: 0.0000 [m], EngineSpeed: , EnginePowerRequest: , DynamicFullLoadPower: , DragPower: , EngineTorqueDemand: , EngineTorqueDemandTotal: , EngineStationaryFullLoadTorque: , EngineDynamicFullLoadTorque: , VehicleSpeed: 0.0090 [m/s], AngledrivePowerRequest: , ClutchPowerRequest: , GearboxPowerRequest: 345.1743 [W], AxlegearPowerRequest: 334.5284 [W], WheelsPowerRequest: 334.5284 [W], BrakePower: 0.0000 [W], AuxiliariesPowerDemand: , CardanTorque: 3212.7746 [Nm], GearboxInputSpeed: 0.1057 [1/s], TorqueConverterOperatingPoint: n_out: 0.1085 [1/s], n_in: 63.4602 [1/s], tq_out: 726.6280 [Nm], tq_in 297.0764 [Nm], nu: 0.00170920399100873, my: 2.44592954368211, TorqueConverterTorqueDemand: }</Error>
+        <ErrorDetails>   bei TUGraz.VectoCore.Models.Simulation.Impl.DistanceRun.&lt;&gt;c.&lt;DoSimulationStep&gt;b__1_3(IResponse r)
+   bei TUGraz.VectoCore.Utils.Switch`1.Default(Action`1 action)
+   bei TUGraz.VectoCore.Models.Simulation.Impl.DistanceRun.DoSimulationStep()
+   bei TUGraz.VectoCore.Models.Simulation.Impl.VectoRun.Run()</ErrorDetails>
+      </Result>
+    </Results>
+    <ApplicationInformation>
+      <SimulationToolVersion>0.6.1.1974-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+      <Date>2020-05-28T14:48:47.62548Z</Date>
+    </ApplicationInformation>
+  </pif:Data>
+  <pif:Signature>
+    <di:Reference URI="#PIF-10652bf49ae0499f8689">
+      <di:Transforms>
+        <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+        <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+      </di:Transforms>
+      <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+      <di:DigestValue>kNMmLf/SQo7//Wr3wmU1/x7c3q7VbmBEILJi39cdrz4=</di:DigestValue>
+    </di:Reference>
+  </pif:Signature>
+</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml b/Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a616f10f32be31a39960290950788f60d35399bc
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml	
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" 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:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
+	<v2.0:Vehicle id="VEH-1234567890" xsi:type="CompletedVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+		<Manufacturer>Some Manufacturer</Manufacturer>
+		<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
+		<Model>Sample Bus Model</Model>
+		<VIN>VEH-1234567890</VIN>
+		<Date>2020-01-09T11:00:00Z</Date>
+		<LegislativeClass>M3</LegislativeClass>
+		<RegisteredClass>II</RegisteredClass>
+		<VehicleCode>CG</VehicleCode>
+		<CurbMassChassis>19000</CurbMassChassis>
+		<TechnicalPermissibleMaximumLadenMass>37000</TechnicalPermissibleMaximumLadenMass>
+		<RegisteredPassengers>
+			<LowerDeck>181</LowerDeck>
+			<UpperDeck>0</UpperDeck>
+		</RegisteredPassengers>
+		<LowEntry>false</LowEntry>
+		<HeightIntegratedBody>3.000</HeightIntegratedBody>
+		<VehicleLength>19.700</VehicleLength>
+		<VehicleWidth>2.550</VehicleWidth>
+		<EntranceHeight>0.320</EntranceHeight>
+		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
+		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
+			<v2.6:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+				<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
+					<Manufacturer>Generic Manufacturer</Manufacturer>
+					<Model>Generic Model</Model>
+					<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+					<Date>2017-03-24T15:00:00Z</Date>
+					<AppVersion>Vecto AirDrag x.y</AppVersion>
+					<CdxA_0>5.20</CdxA_0>
+					<TransferredCdxA>5.20</TransferredCdxA>
+					<DeclaredCdxA>5.20</DeclaredCdxA>
+				</Data>
+				<Signature>
+					<di:Reference URI="#CabinX23h">
+						<di:Transforms>
+							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+						</di:Transforms>
+						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
+					</di:Reference>
+				</Signature>
+			</v2.6:AirDrag>
+			<Auxiliaries>
+				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
+					<ElectricSystem>
+						<AlternatorTechnology>default</AlternatorTechnology>
+						<LEDLights>
+							<Dayrunninglights>true</Dayrunninglights>
+							<Headlights>true</Headlights>
+							<Positionlights>true</Positionlights>
+							<Brakelights>true</Brakelights>
+							<Interiorlights>true</Interiorlights>
+						</LEDLights>
+					</ElectricSystem>
+					<HVAC>
+						<SystemConfiguration>7</SystemConfiguration>
+						<CompressorType>
+							<DriverAC>2-stage</DriverAC>
+							<PassengerAC>3-stage</PassengerAC>
+						</CompressorType>
+						<AuxiliaryHeaterPower>15000</AuxiliaryHeaterPower>
+						<DoubleGlasing>true</DoubleGlasing>
+						<HeatPump>false</HeatPump>
+						<AdjustableAuxiliaryHeater>false</AdjustableAuxiliaryHeater>
+						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
+					</HVAC>
+				</Data>
+			</Auxiliaries>
+		</Components>
+	</v2.0:Vehicle>
+</tns:VectoInputDeclaration>