diff --git a/Generic Vehicles/Declaration Mode/VTP HeavyBus/CompletedBus_33c.MRF.xml b/Generic Vehicles/Declaration Mode/VTP HeavyBus/CompletedBus_33c.MRF.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ae812c1d3b5c95df1fc2c237a23ea9a04d110e4e
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/VTP HeavyBus/CompletedBus_33c.MRF.xml	
@@ -0,0 +1,404 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet href="https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/CSS/VectoReports.css"?>
+<mrf:VectoOutput xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputManufacturer.xsd">
+  <mrf:Data xsi:type="VectoOutputDataType" id="RESULT-c0ed899015394103882d">
+    <Vehicle xsi:type="VehicleCompletedBusType">
+      <PrimaryVehicle>
+        <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+        <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
+        <AxleConfiguration>6x2</AxleConfiguration>
+        <InputDataSignature>
+          <di:Reference URI="#VEH-PrimaryBus_nonSmart">
+            <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>fp9l80Zd9wpp5rSKeF5FzAV8pnJqVv6MrvXHc8+xvBo=</di:DigestValue>
+          </di:Reference>
+        </InputDataSignature>
+        <ManufacturerRecordSignature>
+          <di:Reference URI="#RESULT-35861c040b024dd292c3">
+            <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>empVOnek7xl9YpV19TkVXGBwtIIY7pDlPzaB3S2rod4=</di:DigestValue>
+          </di:Reference>
+        </ManufacturerRecordSignature>
+        <VehicleInformationSignature>
+          <di:Reference URI="#PIF-09595f5338d448de9a82">
+            <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>blfrNJv/mFQZz4enMdhYUeyqQ0+jv+0FHR7AKS/vq1g=</di:DigestValue>
+          </di:Reference>
+        </VehicleInformationSignature>
+      </PrimaryVehicle>
+      <CompletedVehicle>
+        <Model>Sample Bus Model</Model>
+        <Manufacturer>Some Manufacturer</Manufacturer>
+        <ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
+        <VIN>VEH-1234567890</VIN>
+        <VehicleCategory>M3</VehicleCategory>
+        <VehicleGroup>33c</VehicleGroup>
+        <RegisteredClass>II</RegisteredClass>
+        <VehicleCode>CF</VehicleCode>
+        <CurbMassChassis unit="kg">15500</CurbMassChassis>
+        <TechnicalPermissibleMaximumLadenMass unit="t">25.00</TechnicalPermissibleMaximumLadenMass>
+        <VocationalVehicle>false</VocationalVehicle>
+        <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+        <HybridElectricHDV>false</HybridElectricHDV>
+        <DualFuelVehicle>false</DualFuelVehicle>
+        <SleeperCab>false</SleeperCab>
+        <RegisteredPassengers>
+          <LowerDeck>60</LowerDeck>
+          <UpperDeck>40</UpperDeck>
+        </RegisteredPassengers>
+        <LowEntry>false</LowEntry>
+        <HeightIntegratedBody>4.000</HeightIntegratedBody>
+        <VehicleLength>13.890</VehicleLength>
+        <VehicleWidth>2.550</VehicleWidth>
+        <DoorDriveTechnology>pneumatic</DoorDriveTechnology>
+        <Components xsi:type="ComponentsCompletedBusType">
+          <AirDrag>
+            <CertificationMethod>Standard values</CertificationMethod>
+            <CdxA>6.30</CdxA>
+          </AirDrag>
+          <Auxiliaries xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="aux:CompletedVehicleAuxiliaryDataDeclarationType">
+            <aux:ElectricSystem>
+              <aux:AlternatorTechnology>default</aux:AlternatorTechnology>
+              <aux:LEDLights>
+                <aux:Dayrunninglights>true</aux:Dayrunninglights>
+                <aux:Headlights>true</aux:Headlights>
+                <aux:Positionlights>true</aux:Positionlights>
+                <aux:Brakelights>true</aux:Brakelights>
+                <aux:Interiorlights>true</aux:Interiorlights>
+              </aux:LEDLights>
+            </aux:ElectricSystem>
+            <aux:HVAC>
+              <aux:SystemConfiguration>6</aux:SystemConfiguration>
+              <aux:CompressorType>
+                <aux:DriverAC>2-stage</aux:DriverAC>
+                <aux:PassengerAC>none</aux:PassengerAC>
+              </aux:CompressorType>
+              <aux:AuxiliaryHeaterPower>30000</aux:AuxiliaryHeaterPower>
+              <aux:DoubleGlasing>true</aux:DoubleGlasing>
+              <aux:HeatPump>false</aux:HeatPump>
+              <aux:AdjustableAuxiliaryHeater>true</aux:AdjustableAuxiliaryHeater>
+              <aux:SeparateAirDistributionDucts>true</aux:SeparateAirDistributionDucts>
+            </aux:HVAC>
+          </Auxiliaries>
+        </Components>
+        <InputDataSignature>
+          <di:Reference>
+            <di:DigestMethod Algorithm="null" />
+            <di:DigestValue>NOT AVAILABLE</di:DigestValue>
+          </di:Reference>
+        </InputDataSignature>
+      </CompletedVehicle>
+    </Vehicle>
+    <Results>
+      <Status>success</Status>
+      <Result status="success" xsi:type="ResultCompletedVehicleSuccessType">
+        <Mission>Heavy Urban</Mission>
+        <Distance unit="km">30.483</Distance>
+        <SimulationParametersPrimaryVehicle>
+          <TotalVehicleMass unit="kg">19891</TotalVehicleMass>
+          <Payload unit="kg">7891</Payload>
+          <PassengerCount>116.1</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParametersPrimaryVehicle>
+        <SimulationParametersCompletedVehicle>
+          <TotalVehicleMass unit="kg">22300</TotalVehicleMass>
+          <Payload unit="kg">6800</Payload>
+          <PassengerCount>100.0</PassengerCount>
+        </SimulationParametersCompletedVehicle>
+        <VehiclePerformance>
+          <AverageSpeed unit="km/h">11.6</AverageSpeed>
+          <AverageDrivingSpeed unit="km/h">19.8</AverageDrivingSpeed>
+          <MinSpeed unit="km/h">0.0</MinSpeed>
+          <MaxSpeed unit="km/h">62.9</MaxSpeed>
+          <MaxDeceleration unit="m/s²">1.00</MaxDeceleration>
+          <MaxAcceleration unit="m/s²">1.10</MaxAcceleration>
+          <FullLoadDrivingtimePercentage>5.67</FullLoadDrivingtimePercentage>
+          <GearshiftCount>1074</GearshiftCount>
+          <EngineSpeedDriving>
+            <Min unit="rpm">600.0</Min>
+            <Average unit="rpm">896.9</Average>
+            <Max unit="rpm">1826.3</Max>
+          </EngineSpeedDriving>
+          <AverageGearboxEfficiency unit="%">96.02</AverageGearboxEfficiency>
+          <AverageAxlegearEfficiency unit="%">96.62</AverageAxlegearEfficiency>
+        </VehiclePerformance>
+        <FuelConsumptionFactor>1.136</FuelConsumptionFactor>
+        <Fuel type="Diesel CI">
+          <FuelConsumption unit="g/km">697.4</FuelConsumption>
+          <FuelConsumption unit="g/t-km">102.6</FuelConsumption>
+          <FuelConsumption unit="g/p-km">6.97</FuelConsumption>
+          <FuelConsumption unit="MJ/km">29.8</FuelConsumption>
+          <FuelConsumption unit="MJ/t-km">4.38</FuelConsumption>
+          <FuelConsumption unit="MJ/p-km">0.298</FuelConsumption>
+          <FuelConsumption unit="l/100km">83.4</FuelConsumption>
+          <FuelConsumption unit="l/t-km">0.123</FuelConsumption>
+          <FuelConsumption unit="l/p-km">0.00834</FuelConsumption>
+        </Fuel>
+        <CO2 unit="g/km">2182.9</CO2>
+        <CO2 unit="g/t-km">321.0</CO2>
+        <CO2 unit="g/p-km">21.8</CO2>
+      </Result>
+      <Result status="success" xsi:type="ResultCompletedVehicleSuccessType">
+        <Mission>Heavy Urban</Mission>
+        <Distance unit="km">30.483</Distance>
+        <SimulationParametersPrimaryVehicle>
+          <TotalVehicleMass unit="kg">13578</TotalVehicleMass>
+          <Payload unit="kg">1578</Payload>
+          <PassengerCount>23.2</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParametersPrimaryVehicle>
+        <SimulationParametersCompletedVehicle>
+          <TotalVehicleMass unit="kg">17128</TotalVehicleMass>
+          <Payload unit="kg">1628</Payload>
+          <PassengerCount>23.9</PassengerCount>
+        </SimulationParametersCompletedVehicle>
+        <VehiclePerformance>
+          <AverageSpeed unit="km/h">11.6</AverageSpeed>
+          <AverageDrivingSpeed unit="km/h">19.8</AverageDrivingSpeed>
+          <MinSpeed unit="km/h">0.0</MinSpeed>
+          <MaxSpeed unit="km/h">62.9</MaxSpeed>
+          <MaxDeceleration unit="m/s²">1.00</MaxDeceleration>
+          <MaxAcceleration unit="m/s²">1.10</MaxAcceleration>
+          <FullLoadDrivingtimePercentage>3.38</FullLoadDrivingtimePercentage>
+          <GearshiftCount>1099</GearshiftCount>
+          <EngineSpeedDriving>
+            <Min unit="rpm">600.0</Min>
+            <Average unit="rpm">847.4</Average>
+            <Max unit="rpm">1760.9</Max>
+          </EngineSpeedDriving>
+          <AverageGearboxEfficiency unit="%">96.03</AverageGearboxEfficiency>
+          <AverageAxlegearEfficiency unit="%">96.20</AverageAxlegearEfficiency>
+        </VehiclePerformance>
+        <FuelConsumptionFactor>1.072</FuelConsumptionFactor>
+        <Fuel type="Diesel CI">
+          <FuelConsumption unit="g/km">534.2</FuelConsumption>
+          <FuelConsumption unit="g/t-km">328.1</FuelConsumption>
+          <FuelConsumption unit="g/p-km">22.3</FuelConsumption>
+          <FuelConsumption unit="MJ/km">22.8</FuelConsumption>
+          <FuelConsumption unit="MJ/t-km">14.0</FuelConsumption>
+          <FuelConsumption unit="MJ/p-km">0.953</FuelConsumption>
+          <FuelConsumption unit="l/100km">63.9</FuelConsumption>
+          <FuelConsumption unit="l/t-km">0.392</FuelConsumption>
+          <FuelConsumption unit="l/p-km">0.0267</FuelConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1672.1</CO2>
+        <CO2 unit="g/t-km">1026.9</CO2>
+        <CO2 unit="g/p-km">69.8</CO2>
+      </Result>
+      <Result status="success" xsi:type="ResultCompletedVehicleSuccessType">
+        <Mission>Urban</Mission>
+        <Distance unit="km">39.551</Distance>
+        <SimulationParametersPrimaryVehicle>
+          <TotalVehicleMass unit="kg">13578</TotalVehicleMass>
+          <Payload unit="kg">1578</Payload>
+          <PassengerCount>23.2</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParametersPrimaryVehicle>
+        <SimulationParametersCompletedVehicle>
+          <TotalVehicleMass unit="kg">17128</TotalVehicleMass>
+          <Payload unit="kg">1628</Payload>
+          <PassengerCount>23.9</PassengerCount>
+        </SimulationParametersCompletedVehicle>
+        <VehiclePerformance>
+          <AverageSpeed unit="km/h">16.5</AverageSpeed>
+          <AverageDrivingSpeed unit="km/h">24.4</AverageDrivingSpeed>
+          <MinSpeed unit="km/h">0.0</MinSpeed>
+          <MaxSpeed unit="km/h">68.1</MaxSpeed>
+          <MaxDeceleration unit="m/s²">1.00</MaxDeceleration>
+          <MaxAcceleration unit="m/s²">1.10</MaxAcceleration>
+          <FullLoadDrivingtimePercentage>4.01</FullLoadDrivingtimePercentage>
+          <GearshiftCount>1040</GearshiftCount>
+          <EngineSpeedDriving>
+            <Min unit="rpm">600.0</Min>
+            <Average unit="rpm">850.8</Average>
+            <Max unit="rpm">1790.0</Max>
+          </EngineSpeedDriving>
+          <AverageGearboxEfficiency unit="%">96.08</AverageGearboxEfficiency>
+          <AverageAxlegearEfficiency unit="%">95.54</AverageAxlegearEfficiency>
+        </VehiclePerformance>
+        <FuelConsumptionFactor>1.070</FuelConsumptionFactor>
+        <Fuel type="Diesel CI">
+          <FuelConsumption unit="g/km">417.8</FuelConsumption>
+          <FuelConsumption unit="g/t-km">256.6</FuelConsumption>
+          <FuelConsumption unit="g/p-km">17.4</FuelConsumption>
+          <FuelConsumption unit="MJ/km">17.8</FuelConsumption>
+          <FuelConsumption unit="MJ/t-km">11.0</FuelConsumption>
+          <FuelConsumption unit="MJ/p-km">0.745</FuelConsumption>
+          <FuelConsumption unit="l/100km">50.0</FuelConsumption>
+          <FuelConsumption unit="l/t-km">0.307</FuelConsumption>
+          <FuelConsumption unit="l/p-km">0.0209</FuelConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1307.7</CO2>
+        <CO2 unit="g/t-km">803.1</CO2>
+        <CO2 unit="g/p-km">54.6</CO2>
+      </Result>
+      <Result status="success" xsi:type="ResultCompletedVehicleSuccessType">
+        <Mission>Urban</Mission>
+        <Distance unit="km">39.551</Distance>
+        <SimulationParametersPrimaryVehicle>
+          <TotalVehicleMass unit="kg">19891</TotalVehicleMass>
+          <Payload unit="kg">7891</Payload>
+          <PassengerCount>116.1</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParametersPrimaryVehicle>
+        <SimulationParametersCompletedVehicle>
+          <TotalVehicleMass unit="kg">22300</TotalVehicleMass>
+          <Payload unit="kg">6800</Payload>
+          <PassengerCount>100.0</PassengerCount>
+        </SimulationParametersCompletedVehicle>
+        <VehiclePerformance>
+          <AverageSpeed unit="km/h">16.5</AverageSpeed>
+          <AverageDrivingSpeed unit="km/h">24.4</AverageDrivingSpeed>
+          <MinSpeed unit="km/h">0.0</MinSpeed>
+          <MaxSpeed unit="km/h">68.1</MaxSpeed>
+          <MaxDeceleration unit="m/s²">1.00</MaxDeceleration>
+          <MaxAcceleration unit="m/s²">1.10</MaxAcceleration>
+          <FullLoadDrivingtimePercentage>7.34</FullLoadDrivingtimePercentage>
+          <GearshiftCount>1025</GearshiftCount>
+          <EngineSpeedDriving>
+            <Min unit="rpm">600.0</Min>
+            <Average unit="rpm">893.0</Average>
+            <Max unit="rpm">1825.5</Max>
+          </EngineSpeedDriving>
+          <AverageGearboxEfficiency unit="%">96.07</AverageGearboxEfficiency>
+          <AverageAxlegearEfficiency unit="%">96.12</AverageAxlegearEfficiency>
+        </VehiclePerformance>
+        <FuelConsumptionFactor>1.119</FuelConsumptionFactor>
+        <Fuel type="Diesel CI">
+          <FuelConsumption unit="g/km">544.7</FuelConsumption>
+          <FuelConsumption unit="g/t-km">80.1</FuelConsumption>
+          <FuelConsumption unit="g/p-km">5.45</FuelConsumption>
+          <FuelConsumption unit="MJ/km">23.3</FuelConsumption>
+          <FuelConsumption unit="MJ/t-km">3.42</FuelConsumption>
+          <FuelConsumption unit="MJ/p-km">0.233</FuelConsumption>
+          <FuelConsumption unit="l/100km">65.2</FuelConsumption>
+          <FuelConsumption unit="l/t-km">0.0958</FuelConsumption>
+          <FuelConsumption unit="l/p-km">0.00652</FuelConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1704.8</CO2>
+        <CO2 unit="g/t-km">250.7</CO2>
+        <CO2 unit="g/p-km">17.0</CO2>
+      </Result>
+      <Result status="success" xsi:type="ResultCompletedVehicleSuccessType">
+        <Mission>Suburban</Mission>
+        <Distance unit="km">23.503</Distance>
+        <SimulationParametersPrimaryVehicle>
+          <TotalVehicleMass unit="kg">19891</TotalVehicleMass>
+          <Payload unit="kg">7891</Payload>
+          <PassengerCount>116.1</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParametersPrimaryVehicle>
+        <SimulationParametersCompletedVehicle>
+          <TotalVehicleMass unit="kg">22300</TotalVehicleMass>
+          <Payload unit="kg">6800</Payload>
+          <PassengerCount>100.0</PassengerCount>
+        </SimulationParametersCompletedVehicle>
+        <VehiclePerformance>
+          <AverageSpeed unit="km/h">25.5</AverageSpeed>
+          <AverageDrivingSpeed unit="km/h">30.5</AverageDrivingSpeed>
+          <MinSpeed unit="km/h">0.0</MinSpeed>
+          <MaxSpeed unit="km/h">67.0</MaxSpeed>
+          <MaxDeceleration unit="m/s²">1.00</MaxDeceleration>
+          <MaxAcceleration unit="m/s²">1.10</MaxAcceleration>
+          <FullLoadDrivingtimePercentage>15.62</FullLoadDrivingtimePercentage>
+          <GearshiftCount>454</GearshiftCount>
+          <EngineSpeedDriving>
+            <Min unit="rpm">600.0</Min>
+            <Average unit="rpm">884.3</Average>
+            <Max unit="rpm">1778.6</Max>
+          </EngineSpeedDriving>
+          <AverageGearboxEfficiency unit="%">96.21</AverageGearboxEfficiency>
+          <AverageAxlegearEfficiency unit="%">95.64</AverageAxlegearEfficiency>
+        </VehiclePerformance>
+        <FuelConsumptionFactor>1.086</FuelConsumptionFactor>
+        <Fuel type="Diesel CI">
+          <FuelConsumption unit="g/km">459.8</FuelConsumption>
+          <FuelConsumption unit="g/t-km">67.6</FuelConsumption>
+          <FuelConsumption unit="g/p-km">4.60</FuelConsumption>
+          <FuelConsumption unit="MJ/km">19.6</FuelConsumption>
+          <FuelConsumption unit="MJ/t-km">2.89</FuelConsumption>
+          <FuelConsumption unit="MJ/p-km">0.196</FuelConsumption>
+          <FuelConsumption unit="l/100km">55.0</FuelConsumption>
+          <FuelConsumption unit="l/t-km">0.0809</FuelConsumption>
+          <FuelConsumption unit="l/p-km">0.00550</FuelConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1439.3</CO2>
+        <CO2 unit="g/t-km">211.7</CO2>
+        <CO2 unit="g/p-km">14.4</CO2>
+      </Result>
+      <Result status="success" xsi:type="ResultCompletedVehicleSuccessType">
+        <Mission>Suburban</Mission>
+        <Distance unit="km">23.503</Distance>
+        <SimulationParametersPrimaryVehicle>
+          <TotalVehicleMass unit="kg">13578</TotalVehicleMass>
+          <Payload unit="kg">1578</Payload>
+          <PassengerCount>23.2</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParametersPrimaryVehicle>
+        <SimulationParametersCompletedVehicle>
+          <TotalVehicleMass unit="kg">17128</TotalVehicleMass>
+          <Payload unit="kg">1628</Payload>
+          <PassengerCount>23.9</PassengerCount>
+        </SimulationParametersCompletedVehicle>
+        <VehiclePerformance>
+          <AverageSpeed unit="km/h">25.6</AverageSpeed>
+          <AverageDrivingSpeed unit="km/h">30.6</AverageDrivingSpeed>
+          <MinSpeed unit="km/h">0.0</MinSpeed>
+          <MaxSpeed unit="km/h">67.0</MaxSpeed>
+          <MaxDeceleration unit="m/s²">1.00</MaxDeceleration>
+          <MaxAcceleration unit="m/s²">1.10</MaxAcceleration>
+          <FullLoadDrivingtimePercentage>10.34</FullLoadDrivingtimePercentage>
+          <GearshiftCount>440</GearshiftCount>
+          <EngineSpeedDriving>
+            <Min unit="rpm">600.0</Min>
+            <Average unit="rpm">848.7</Average>
+            <Max unit="rpm">1769.2</Max>
+          </EngineSpeedDriving>
+          <AverageGearboxEfficiency unit="%">96.25</AverageGearboxEfficiency>
+          <AverageAxlegearEfficiency unit="%">95.02</AverageAxlegearEfficiency>
+        </VehiclePerformance>
+        <FuelConsumptionFactor>1.063</FuelConsumptionFactor>
+        <Fuel type="Diesel CI">
+          <FuelConsumption unit="g/km">352.9</FuelConsumption>
+          <FuelConsumption unit="g/t-km">216.7</FuelConsumption>
+          <FuelConsumption unit="g/p-km">14.7</FuelConsumption>
+          <FuelConsumption unit="MJ/km">15.1</FuelConsumption>
+          <FuelConsumption unit="MJ/t-km">9.25</FuelConsumption>
+          <FuelConsumption unit="MJ/p-km">0.629</FuelConsumption>
+          <FuelConsumption unit="l/100km">42.2</FuelConsumption>
+          <FuelConsumption unit="l/t-km">0.259</FuelConsumption>
+          <FuelConsumption unit="l/p-km">0.0176</FuelConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1104.5</CO2>
+        <CO2 unit="g/t-km">678.3</CO2>
+        <CO2 unit="g/p-km">46.1</CO2>
+      </Result>
+    </Results>
+    <ApplicationInformation>
+      <SimulationToolVersion>0.6.1.1950-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+      <Date>2020-05-05T09:03:13.1893849Z</Date>
+    </ApplicationInformation>
+  </mrf:Data>
+  <mrf:Signature>
+    <di:Reference URI="#RESULT-c0ed899015394103882d">
+      <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>USH/z15hZ/S2lM1itOACKUURCGhLIEm7c9qQxolr4tk=</di:DigestValue>
+    </di:Reference>
+  </mrf:Signature>
+</mrf:VectoOutput>
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/VTP HeavyBus/VTP simulation.vecto b/Generic Vehicles/Declaration Mode/VTP HeavyBus/VTP simulation.vecto
index ae1395322d5995e2419081a09fc6c1343563dc52..ccf5c278f4ea64c3f2fe60ad24eccfab3f9c0e0c 100644
--- a/Generic Vehicles/Declaration Mode/VTP HeavyBus/VTP simulation.vecto	
+++ b/Generic Vehicles/Declaration Mode/VTP HeavyBus/VTP simulation.vecto	
@@ -8,7 +8,7 @@
   "Body": {
     "SavedInDeclMode": true,
     "DeclarationVehicle": "primary_heavyBus group P33_34_non_Smart.xml",
-    "ManufacturerRecord": "CompletedBus_33c.RSLT_MANUFACTURER.xml",
+    "ManufacturerRecord": "CompletedBus_33c.MRF.xml",
     "Mileage": 30000.0,
     "FanPowerCoefficients": [
       7.32,
diff --git a/Generic Vehicles/Declaration Mode/VTP MediumLorries/VTP ML2r.vecto b/Generic Vehicles/Declaration Mode/VTP MediumLorries/VTP ML2r.vecto
index 5cf9971bf5f182b5a31523195a13624c26e93c9a..87a1c41be5492a3b0edef8afd053214b715b076c 100644
--- a/Generic Vehicles/Declaration Mode/VTP MediumLorries/VTP ML2r.vecto	
+++ b/Generic Vehicles/Declaration Mode/VTP MediumLorries/VTP ML2r.vecto	
@@ -8,7 +8,7 @@
   "Body": {
     "SavedInDeclMode": true,
     "DeclarationVehicle": "vecto_vehicle-medium_lorry_4x2F.xml",
-    "ManufacturerRecord": "vecto_vehicle-medium_lorry_4x2F.RSLT_MANUFACTURER.xml",
+    "ManufacturerRecord": "vecto_vehicle-medium_lorry_4x2F.MRF.xml",
     "Mileage": 15000.0,
     "FanPowerCoefficients": [
       7.32,
diff --git a/Generic Vehicles/Declaration Mode/VTP MediumLorries/vecto_vehicle-medium_lorry_4x2F.MRF.xml b/Generic Vehicles/Declaration Mode/VTP MediumLorries/vecto_vehicle-medium_lorry_4x2F.MRF.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b067c7c79f306245501544c44de3193878c38c86
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/VTP MediumLorries/vecto_vehicle-medium_lorry_4x2F.MRF.xml	
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet href="https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/CSS/VectoReports.css"?>
+<mrf:VectoOutput xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.8" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputManufacturer.xsd">
+  <mrf:Data xsi:type="VectoOutputDataType" id="RESULT-78ebe1cfb7cb44fe8468">
+    <Vehicle xsi:type="VehicleTruckType">
+      <Model>ML2r</Model>
+      <Manufacturer>Generic Vendor</Manufacturer>
+      <ManufacturerAddress>N.A.</ManufacturerAddress>
+      <VIN>standard values</VIN>
+      <LegislativeClass>N2</LegislativeClass>
+      <GrossVehicleMass unit="t">7.0</GrossVehicleMass>
+      <CurbMassChassis unit="kg">2500</CurbMassChassis>
+      <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+      <HybridElectricHDV>false</HybridElectricHDV>
+      <DualFuelVehicle>false</DualFuelVehicle>
+      <AxleConfiguration>4x2F</AxleConfiguration>
+      <VehicleGroup>ML2r</VehicleGroup>
+      <VocationalVehicle>false</VocationalVehicle>
+      <SleeperCab>false</SleeperCab>
+      <PTO>false</PTO>
+      <ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
+        <adas:EngineStopStart>false</adas:EngineStopStart>
+        <adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
+        <adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
+        <adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
+      </ADAS>
+      <Components xsi:type="ComponentsTruckFWDType">
+        <Engine>
+          <Model>130kW engine</Model>
+          <CertificationNumber>ENG-130kW_IVT_3l</CertificationNumber>
+          <DigestValue>
+          </DigestValue>
+          <RatedPower unit="kW">130</RatedPower>
+          <IdlingSpeed unit="rpm">800</IdlingSpeed>
+          <RatedSpeed unit="rpm">3600</RatedSpeed>
+          <Displacement unit="ltr">3.0</Displacement>
+          <WHRType>none</WHRType>
+          <Mode>
+            <FuelType>Diesel CI</FuelType>
+          </Mode>
+        </Engine>
+        <Gearbox>
+          <Model>GB_6-gear_MT</Model>
+          <CertificationMethod>Standard values</CertificationMethod>
+          <DigestValue>
+          </DigestValue>
+          <TransmissionType>SMT</TransmissionType>
+          <GearsCount>6</GearsCount>
+          <AxlegearRatio>4.300</AxlegearRatio>
+          <TransmissionRatioFinalGear>0.791</TransmissionRatioFinalGear>
+        </Gearbox>
+        <Retarder>
+          <RetarderType>None</RetarderType>
+        </Retarder>
+        <AirDrag>
+          <Model>N.A.</Model>
+          <CertificationMethod>Measured</CertificationMethod>
+          <CertificationNumber>generic cabin</CertificationNumber>
+          <DigestValue>
+          </DigestValue>
+          <CdxA>5.80</CdxA>
+        </AirDrag>
+        <AxleWheels>
+          <Axle axleNumber="1">
+            <TyreDimension>215/75 R17.5</TyreDimension>
+            <TyreCertificationNumber>TYRE-215_75R17.5</TyreCertificationNumber>
+            <DigestValue>
+            </DigestValue>
+            <TyreRRCDeclared>0.0074</TyreRRCDeclared>
+            <TwinTyres>false</TwinTyres>
+          </Axle>
+          <Axle axleNumber="2">
+            <TyreDimension>215/75 R17.5</TyreDimension>
+            <TyreCertificationNumber>TYRE-215_75R17.5</TyreCertificationNumber>
+            <DigestValue>
+            </DigestValue>
+            <TyreRRCDeclared>0.0074</TyreRRCDeclared>
+            <TwinTyres>true</TwinTyres>
+          </Axle>
+        </AxleWheels>
+        <Auxiliaries>
+          <FanTechnology>Crankshaft mounted - Bimetallic controlled visco clutch</FanTechnology>
+          <SteeringPumpTechnology>Fixed displacement</SteeringPumpTechnology>
+          <ElectricSystemTechnology>Standard technology - LED headlights, all</ElectricSystemTechnology>
+          <PneumaticSystemTechnology>Vacuum pump</PneumaticSystemTechnology>
+          <HVACTechnology>Default</HVACTechnology>
+        </Auxiliaries>
+      </Components>
+      <InputDataSignature>
+        <di:Reference URI="#VEH-ML2r">
+          <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>frS+JAZhKjsZ02KDVE64cAm+QeYVHO0jeFsQ9oi19Ww=</di:DigestValue>
+        </di:Reference>
+      </InputDataSignature>
+    </Vehicle>
+    <Results>
+      <Status>success</Status>
+      <Result status="success">
+        <Mission>Regional Delivery</Mission>
+        <Distance unit="km">100.000</Distance>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">3524</TotalVehicleMass>
+          <Payload unit="kg">224</Payload>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <VehiclePerformance>
+          <AverageSpeed unit="km/h">60.4</AverageSpeed>
+          <AverageDrivingSpeed unit="km/h">69.1</AverageDrivingSpeed>
+          <MinSpeed unit="km/h">0.0</MinSpeed>
+          <MaxSpeed unit="km/h">85.0</MaxSpeed>
+          <MaxDeceleration unit="m/s²">1.00</MaxDeceleration>
+          <MaxAcceleration unit="m/s²">1.00</MaxAcceleration>
+          <FullLoadDrivingtimePercentage>3.61</FullLoadDrivingtimePercentage>
+          <GearshiftCount>100</GearshiftCount>
+          <EngineSpeedDriving>
+            <Min unit="rpm">800.0</Min>
+            <Average unit="rpm">1925.9</Average>
+            <Max unit="rpm">2895.0</Max>
+          </EngineSpeedDriving>
+          <AverageGearboxEfficiency unit="%">88.39</AverageGearboxEfficiency>
+          <AverageAxlegearEfficiency unit="%">100.00</AverageAxlegearEfficiency>
+        </VehiclePerformance>
+        <Fuel type="Diesel CI">
+          <FuelConsumption unit="g/km">137.3</FuelConsumption>
+          <FuelConsumption unit="g/t-km">613.9</FuelConsumption>
+          <FuelConsumption unit="g/m³-km">6.07</FuelConsumption>
+          <FuelConsumption unit="MJ/km">5.86</FuelConsumption>
+          <FuelConsumption unit="MJ/t-km">26.2</FuelConsumption>
+          <FuelConsumption unit="MJ/m³-km">0.259</FuelConsumption>
+          <FuelConsumption unit="l/100km">16.4</FuelConsumption>
+          <FuelConsumption unit="l/t-km">0.734</FuelConsumption>
+          <FuelConsumption unit="l/m³-km">0.00726</FuelConsumption>
+        </Fuel>
+        <CO2 unit="g/km">429.6</CO2>
+        <CO2 unit="g/t-km">1921.4</CO2>
+        <CO2 unit="g/m³-km">19.0</CO2>
+      </Result>
+      <Result status="success">
+        <Mission>Regional Delivery</Mission>
+        <Distance unit="km">100.000</Distance>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">4429</TotalVehicleMass>
+          <Payload unit="kg">1129</Payload>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <VehiclePerformance>
+          <AverageSpeed unit="km/h">60.4</AverageSpeed>
+          <AverageDrivingSpeed unit="km/h">69.0</AverageDrivingSpeed>
+          <MinSpeed unit="km/h">0.0</MinSpeed>
+          <MaxSpeed unit="km/h">85.0</MaxSpeed>
+          <MaxDeceleration unit="m/s²">1.00</MaxDeceleration>
+          <MaxAcceleration unit="m/s²">1.00</MaxAcceleration>
+          <FullLoadDrivingtimePercentage>7.34</FullLoadDrivingtimePercentage>
+          <GearshiftCount>113</GearshiftCount>
+          <EngineSpeedDriving>
+            <Min unit="rpm">800.0</Min>
+            <Average unit="rpm">1932.6</Average>
+            <Max unit="rpm">3195.8</Max>
+          </EngineSpeedDriving>
+          <AverageGearboxEfficiency unit="%">88.76</AverageGearboxEfficiency>
+          <AverageAxlegearEfficiency unit="%">100.00</AverageAxlegearEfficiency>
+        </VehiclePerformance>
+        <Fuel type="Diesel CI">
+          <FuelConsumption unit="g/km">142.7</FuelConsumption>
+          <FuelConsumption unit="g/t-km">126.4</FuelConsumption>
+          <FuelConsumption unit="g/m³-km">6.31</FuelConsumption>
+          <FuelConsumption unit="MJ/km">6.09</FuelConsumption>
+          <FuelConsumption unit="MJ/t-km">5.40</FuelConsumption>
+          <FuelConsumption unit="MJ/m³-km">0.270</FuelConsumption>
+          <FuelConsumption unit="l/100km">17.1</FuelConsumption>
+          <FuelConsumption unit="l/t-km">0.151</FuelConsumption>
+          <FuelConsumption unit="l/m³-km">0.00755</FuelConsumption>
+        </Fuel>
+        <CO2 unit="g/km">446.5</CO2>
+        <CO2 unit="g/t-km">395.5</CO2>
+        <CO2 unit="g/m³-km">19.8</CO2>
+      </Result>
+      <Result status="success">
+        <Mission>Urban Delivery</Mission>
+        <Distance unit="km">99.999</Distance>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">3524</TotalVehicleMass>
+          <Payload unit="kg">224</Payload>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <VehiclePerformance>
+          <AverageSpeed unit="km/h">25.7</AverageSpeed>
+          <AverageDrivingSpeed unit="km/h">33.8</AverageDrivingSpeed>
+          <MinSpeed unit="km/h">0.0</MinSpeed>
+          <MaxSpeed unit="km/h">85.0</MaxSpeed>
+          <MaxDeceleration unit="m/s²">1.41</MaxDeceleration>
+          <MaxAcceleration unit="m/s²">1.00</MaxAcceleration>
+          <FullLoadDrivingtimePercentage>3.76</FullLoadDrivingtimePercentage>
+          <GearshiftCount>755</GearshiftCount>
+          <EngineSpeedDriving>
+            <Min unit="rpm">800.0</Min>
+            <Average unit="rpm">1691.7</Average>
+            <Max unit="rpm">3679.1</Max>
+          </EngineSpeedDriving>
+          <AverageGearboxEfficiency unit="%">82.02</AverageGearboxEfficiency>
+          <AverageAxlegearEfficiency unit="%">100.00</AverageAxlegearEfficiency>
+        </VehiclePerformance>
+        <Fuel type="Diesel CI">
+          <FuelConsumption unit="g/km">143.0</FuelConsumption>
+          <FuelConsumption unit="g/t-km">639.4</FuelConsumption>
+          <FuelConsumption unit="g/m³-km">6.33</FuelConsumption>
+          <FuelConsumption unit="MJ/km">6.10</FuelConsumption>
+          <FuelConsumption unit="MJ/t-km">27.3</FuelConsumption>
+          <FuelConsumption unit="MJ/m³-km">0.270</FuelConsumption>
+          <FuelConsumption unit="l/100km">17.1</FuelConsumption>
+          <FuelConsumption unit="l/t-km">0.765</FuelConsumption>
+          <FuelConsumption unit="l/m³-km">0.00757</FuelConsumption>
+        </Fuel>
+        <CO2 unit="g/km">447.5</CO2>
+        <CO2 unit="g/t-km">2001.3</CO2>
+        <CO2 unit="g/m³-km">19.8</CO2>
+      </Result>
+      <Result status="success">
+        <Mission>Urban Delivery</Mission>
+        <Distance unit="km">99.999</Distance>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">4429</TotalVehicleMass>
+          <Payload unit="kg">1129</Payload>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <VehiclePerformance>
+          <AverageSpeed unit="km/h">25.7</AverageSpeed>
+          <AverageDrivingSpeed unit="km/h">33.8</AverageDrivingSpeed>
+          <MinSpeed unit="km/h">0.0</MinSpeed>
+          <MaxSpeed unit="km/h">85.0</MaxSpeed>
+          <MaxDeceleration unit="m/s²">1.45</MaxDeceleration>
+          <MaxAcceleration unit="m/s²">1.00</MaxAcceleration>
+          <FullLoadDrivingtimePercentage>5.13</FullLoadDrivingtimePercentage>
+          <GearshiftCount>795</GearshiftCount>
+          <EngineSpeedDriving>
+            <Min unit="rpm">800.0</Min>
+            <Average unit="rpm">1711.0</Average>
+            <Max unit="rpm">3673.1</Max>
+          </EngineSpeedDriving>
+          <AverageGearboxEfficiency unit="%">83.58</AverageGearboxEfficiency>
+          <AverageAxlegearEfficiency unit="%">100.00</AverageAxlegearEfficiency>
+        </VehiclePerformance>
+        <Fuel type="Diesel CI">
+          <FuelConsumption unit="g/km">155.8</FuelConsumption>
+          <FuelConsumption unit="g/t-km">138.0</FuelConsumption>
+          <FuelConsumption unit="g/m³-km">6.89</FuelConsumption>
+          <FuelConsumption unit="MJ/km">6.65</FuelConsumption>
+          <FuelConsumption unit="MJ/t-km">5.89</FuelConsumption>
+          <FuelConsumption unit="MJ/m³-km">0.294</FuelConsumption>
+          <FuelConsumption unit="l/100km">18.6</FuelConsumption>
+          <FuelConsumption unit="l/t-km">0.165</FuelConsumption>
+          <FuelConsumption unit="l/m³-km">0.00824</FuelConsumption>
+        </Fuel>
+        <CO2 unit="g/km">487.5</CO2>
+        <CO2 unit="g/t-km">431.8</CO2>
+        <CO2 unit="g/m³-km">21.6</CO2>
+      </Result>
+    </Results>
+    <ApplicationInformation>
+      <SimulationToolVersion>0.6.0.1881-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+      <Date>2020-02-26T13:13:40.7486978Z</Date>
+    </ApplicationInformation>
+  </mrf:Data>
+  <mrf:Signature>
+    <di:Reference URI="#RESULT-78ebe1cfb7cb44fe8468">
+      <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>gJUIawO0edlwFI4+IUtb1UTzBH7eN0vTLcmDpvFQVKo=</di:DigestValue>
+    </di:Reference>
+  </mrf:Signature>
+</mrf:VectoOutput>
\ No newline at end of file