diff --git a/VectoCommon/VectoCommon/BusAuxiliaries/IPneumaticUserInputsConfig.cs b/VectoCommon/VectoCommon/BusAuxiliaries/IPneumaticUserInputsConfig.cs
index f28993a2e05b39c00351509c2d6f4f6090778563..64cfc89dbeae1793e69383ffda23e90654b54d3f 100644
--- a/VectoCommon/VectoCommon/BusAuxiliaries/IPneumaticUserInputsConfig.cs
+++ b/VectoCommon/VectoCommon/BusAuxiliaries/IPneumaticUserInputsConfig.cs
@@ -63,6 +63,8 @@ namespace TUGraz.VectoCommon.BusAuxiliaries
 					return "Mechanic";
 				case ConsumerTechnology.Pneumatically:
 					return "Pneumatic";
+				case ConsumerTechnology.Mixed:
+					return "Mixed";
 				default:
 					return ConsumerTechnology.Unknown.ToString();
 			}
diff --git a/VectoCommon/VectoCommon/BusAuxiliaries/ISSMInputs.cs b/VectoCommon/VectoCommon/BusAuxiliaries/ISSMInputs.cs
index 2ed4c5d86bc0931eb676acb2c5881266a34fce05..7a3555a72eb86277beb424181957767ba2a6b6c2 100644
--- a/VectoCommon/VectoCommon/BusAuxiliaries/ISSMInputs.cs
+++ b/VectoCommon/VectoCommon/BusAuxiliaries/ISSMInputs.cs
@@ -229,7 +229,11 @@ namespace TUGraz.VectoCommon.BusAuxiliaries
 				case NON_R_744_3_STAGE: return HeatPumpType.non_R_744_3_stage;
 				case NON_R_744_4_STAGE: return HeatPumpType.non_R_744_4_stage;
 				case NON_R_744_CONTINUOUS: return HeatPumpType.non_R_744_continuous;
-				default: throw new InvalidEnumArgumentException("HeatPumpType");
+                // to support old input parametersd
+				case "2-stage": return HeatPumpType.non_R_744_2_stage;
+                case "3-stage": return HeatPumpType.non_R_744_3_stage;
+                case "4-stage": return HeatPumpType.non_R_744_4_stage;
+                default: throw new InvalidEnumArgumentException("HeatPumpType");
 			}
 		}
 
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index d7ca43a1f9b9c5b6776a47c630edd913dcc80562..1209eddc66c201df2fa1057665aec64cf1e9b189 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -1157,23 +1157,25 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 	}
 
 
-	public class JSONInputDataComptededBusFactorMethodV7 : JSONFile, IDeclarationInputDataProvider, IDeclarationJobInputData
+	public class JSONInputDataCompletedBusFactorMethodV7 : JSONFile, IDeclarationInputDataProvider, IDeclarationJobInputData
 	{
 		private readonly IXMLInputDataReader _xmlInputReader;
+		protected internal string PrimaryInputDataFile;
+		protected internal string CompletedInputDataFile;
 
-		public JSONInputDataComptededBusFactorMethodV7(JObject data, string filename, bool tolerateMissing = false) : base(
+		public JSONInputDataCompletedBusFactorMethodV7(JObject data, string filename, bool tolerateMissing = false) : base(
 			data, filename, tolerateMissing)
 		{
 			var kernel = new StandardKernel(new VectoNinjectModule());
 			_xmlInputReader = kernel.Get<IXMLInputDataReader>();
 
-			var primaryInputData = Path.Combine(BasePath, Body.GetEx<string>("PrimaryVehicleResults"));
-			var completedInputData = Path.Combine(BasePath, Body.GetEx<string>("CompletedVehicle"));
+			PrimaryInputDataFile = Path.Combine(BasePath, Body.GetEx<string>("PrimaryVehicleResults"));
+			CompletedInputDataFile = Path.Combine(BasePath, Body.GetEx<string>("CompletedVehicle"));
 
 			//PrimaryVehicle = CreateReader(primaryInputData);
 
-			Vehicle = _xmlInputReader.CreateDeclaration(completedInputData).JobInputData.Vehicle;
-			PrimaryVehicleData = (_xmlInputReader.Create(primaryInputData) as IPrimaryVehicleInformationInputDataProvider);
+			Vehicle = _xmlInputReader.CreateDeclaration(CompletedInputDataFile).JobInputData.Vehicle;
+			PrimaryVehicleData = (_xmlInputReader.Create(PrimaryInputDataFile) as IPrimaryVehicleInformationInputDataProvider);
 			JobName = Vehicle.VIN;
 		}
 
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
index c1620f1812ad79743c1b7ff7c85ee73b4bf8805c..2c1c7bf2aaebe1538591ae9a3f85e55b45881cc8 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
@@ -96,7 +96,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 				case 6:
 					return new JSONInputDataSingleBusV6(json, filename, tolerateMissing);
 				case 7:
-					return new JSONInputDataComptededBusFactorMethodV7(json, filename, tolerateMissing);
+					return new JSONInputDataCompletedBusFactorMethodV7(json, filename, tolerateMissing);
                 case 8:
 					return new JSONInputDataV8_Hybrid(json, filename, tolerateMissing);
                 case 9:
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
index 4df6b512fe71799139b40236f426da938b975c85..ffcb82c7496d14fe033ea7980c48f49598679d15 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
@@ -968,7 +968,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 
 		public VehicleCategory VehicleCategory
 		{
-			get { return VehicleCategoryHelper.Parse(GetString(XMLNames.Vehicle_VehicleCategory)); }
+			get { return VehicleCategoryHelper.Parse(GetString("ChassisConfiguration")); }
 		}
 
 		public AxleConfiguration AxleConfiguration
diff --git a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
index faeaecdfbb48b7d793cc622c01ecd13b792c8c47..bc2849a805f2ba85467a50d28ce408d9a6b98e96 100644
--- a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices.WindowsRuntime;
+using System.Xml;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Ninject;
@@ -17,6 +18,7 @@ using TUGraz.VectoCommon.Utils;
 using TUGraz.VectoCore.Configuration;
 using TUGraz.VectoCore.InputData.FileIO.JSON;
 using TUGraz.VectoCore.InputData.FileIO.XML;
+using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider;
 using TUGraz.VectoCore.Models.Declaration;
 using TUGraz.VectoCore.Models.Simulation.Data;
 using TUGraz.VectoCore.Models.Simulation.Impl;
@@ -27,7 +29,10 @@ using TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC;
 using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
 using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
 using TUGraz.VectoCore.OutputData;
+using TUGraz.VectoCore.Tests.Models.Simulation;
+using TUGraz.VectoCore.Tests.Utils;
 using TUGraz.VectoCore.Utils;
+using Formatting = Newtonsoft.Json.Formatting;
 
 namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
 {
@@ -98,7 +103,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
 		public void TestCompletedBus()
 		{
 			var writer = new FileOutputWriter(Path.Combine(Path.GetDirectoryName(JobFile_Group41), Path.GetFileName(JobFile_Group41)));
-			var inputData = JSONInputDataFactory.ReadJsonJob(JobFile_Group41);
+			var inputData = CompletedVIF.CreateCompletedVif(JSONInputDataFactory.ReadJsonJob(JobFile_Group41) as JSONInputDataCompletedBusFactorMethodV7, xmlInputReader); // JSONInputDataFactory.ReadJsonJob(JobFile_Group41);
 
 			var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, writer)
 			{
@@ -1010,9 +1015,26 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
 		private List<VectoRunData> GetVectoRunData(string jobFile)
 		{
 			var writer = new FileOutputWriter(Path.Combine(Path.GetDirectoryName(JobFile_Group41), Path.GetFileName(JobFile_Group41)));
-			var inputData = Path.GetExtension(jobFile).Equals(".xml")
-				? xmlInputReader.CreateDeclaration(jobFile)
-				: JSONInputDataFactory.ReadJsonJob(jobFile);
+			IInputDataProvider inputData = null;
+			if (Path.GetExtension(jobFile).Equals(".xml")) {
+				// a complete VIF 
+				inputData = xmlInputReader.CreateDeclaration(jobFile);
+			} else {
+				// Primary VIF and completed XML separate
+				var tmp = JSONInputDataFactory.ReadJsonJob(jobFile);
+
+				switch (tmp) {
+					case JSONInputDataSingleBusV6 _:
+					case JSONVTPInputDataV4 _:
+						inputData = tmp;
+						break;
+					case JSONInputDataCompletedBusFactorMethodV7 completedJson: {
+						var completedVif = CompletedVIF.CreateCompletedVif(completedJson, xmlInputReader);
+						inputData = new XMLDeclarationVIFInputData(completedVif as IMultistageBusInputDataProvider, null);
+						break;
+					}
+				}
+			}
 
 			var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, writer) {
 				WriteModalResults = true,
@@ -1025,6 +1047,8 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
 			return runs;
 		}
 
+		
+
 		[TestCase(JobFile_Group41, TestName = "RunCompletedBusSimulation Group41/32b"),
 		TestCase(JobFile_Group42, TestName = "RunCompletedBusSimulation Group42/33b"),
 		TestCase(JobFilePrimary41, TestName = "RunPrimaryBusSimulation Group41"),
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll.xml b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll.xml
index 20eabcd9ce43e83aa8ff4ceb016a3e2e5ec13f86..a160bece1a5a8097eec6e744a96d409e64f7c233 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS/Group9_AT_EcoRoll.xml
@@ -35,7 +35,7 @@
 			<EcoRollWithoutEngineStop>true</EcoRollWithoutEngineStop>
 			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
 			<PredictiveCruiseControl>none</PredictiveCruiseControl>
-			<ATEcoRollReleaseLockupClutch>false</ATEcoRollReleaseLockupClutch>
+			<APTEcoRollReleaseLockupClutch>false</APTEcoRollReleaseLockupClutch>
 		</v2.1:ADAS>
     <Components xsi:type="v2.0:VehicleComponentsType">
       <Engine xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="EngineComponentDeclarationType">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b.vecto
index 66c56d0d15deb710dd418223b709f3cd8ccc2162..cbcb20b77e871d7ee9719574922a9842de0200d8 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b.vecto
@@ -7,6 +7,6 @@
 	},
 	"Body": {
 		"CompletedVehicle": "vecto_vehicle-completed_heavyBus_41.xml",
-		"PrimaryVehicleResults":  "primary_heavyBus group41.RSLT_PIF.xml"
+		"PrimaryVehicleResults":  "primary_heavyBus group41.RSLT_VIF.xml"
 	}
 }
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_AT-P.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_AT-P.vecto
index d33c02cefcc9a9b2f943908703246f2179b74b4c..ef9fb71e6f09ed6e3519bb086836b06256c77da2 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_AT-P.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_AT-P.vecto
@@ -7,6 +7,6 @@
 	},
 	"Body": {
 		"CompletedVehicle": "vecto_vehicle-completed_heavyBus_41.xml",
-		"PrimaryVehicleResults":  "primary_heavyBus group41_AT-P.RSLT_PIF.xml"
+		"PrimaryVehicleResults":  "primary_heavyBus group41_AT-P.RSLT_VIF.xml"
 	}
 }
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_ES-AUX.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_ES-AUX.vecto
index c991a72d8e2808e761f349d3665622eb3dd9e2db..481cc289a49135414334eb77eb34dd80db2712eb 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_ES-AUX.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_ES-AUX.vecto
@@ -7,6 +7,6 @@
 	},
 	"Body": {
 		"CompletedVehicle": "vecto_vehicle-completed_heavyBus_41.xml",
-		"PrimaryVehicleResults":  "vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_PIF.xml"
+		"PrimaryVehicleResults":  "vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml"
 	}
 }
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_ES-AUX_mixed.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_ES-AUX_mixed.vecto
index 811a6e550cebc3ac5cb853c02a31f26f969d4056..644fabc36c86156d12deee7ab51669bdccf0d0c8 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_ES-AUX_mixed.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_ES-AUX_mixed.vecto
@@ -7,6 +7,6 @@
 	},
 	"Body": {
 		"CompletedVehicle": "vecto_vehicle-completed_heavyBus_41_mixed.xml",
-		"PrimaryVehicleResults":  "vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_PIF.xml"
+		"PrimaryVehicleResults":  "vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml"
 	}
 }
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_42-33b.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_42-33b.vecto
index e04e75e5741df1d95298b5170629ae94dcbacbcf..c9a897687648d7b2d104d176e2bc5638172321ca 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_42-33b.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_42-33b.vecto
@@ -7,6 +7,6 @@
 	},
 	"Body": {
 		"CompletedVehicle": "vecto_vehicle-completed_heavyBus_42.xml",
-		"PrimaryVehicleResults":  "primary_heavyBus group42_SmartPS.RSLT_PIF.xml"
+		"PrimaryVehicleResults":  "primary_heavyBus group42_SmartPS.RSLT_VIF.xml"
 	}
 }
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d6fde08463d7b325301a5ee2029f8df5c740d39c
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
@@ -0,0 +1,671 @@
+<?xml version="1.0" encoding="utf-8"?>
+<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" 
+xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+  <PrimaryVehicle>
+  <Data xsi:type="PrimaryVehicleDataType" id="PIF-584956b9e3ab43acaf97">
+    <Vehicle xsi:type="VehiclePIFType">
+      <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
+      <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+      <Model>Generic Model Primary</Model>
+      <VIN>VEH-1234567890_SmartPS</VIN>
+      <Date>2017-02-15T11:00:00Z</Date>
+      <LegislativeCategory>M3</LegislativeCategory>
+      <ChassisConfiguration>Bus</ChassisConfiguration>
+      <AxleConfiguration>6x2</AxleConfiguration>
+      <Articulated>false</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>false</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 Primary</Manufacturer>
+            <Model>Bus 6x2 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>1800</RatedSpeed>
+            <RatedPower>325032</RatedPower>
+            <MaxEngineTorque>2134</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="1188.00" dragTorque="-138.00" />
+                <Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00" />
+                <Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00" />
+                <Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00" />
+                <Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00" />
+                <Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00" />
+                <Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00" />
+                <Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00" />
+                <Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00" />
+                <Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00" />
+              </FullLoadAndDragCurve>
+              <Fuels>
+                <FuelType>Diesel CI</FuelType>
+              </Fuels>
+            </Mode>
+          </Data>
+        </Engine>
+        <Transmission>
+          <Data xsi:type="TransmissionDataPIFType">
+            <Manufacturer>Generic Gearbox Manufacturer Primary</Manufacturer>
+            <Model>Generic 40t Long Haul Truck Gearbox Primary</Model>
+            <MainCertificationMethod>Standard values</MainCertificationMethod>
+            <Date>2017-01-11T11:00:00Z</Date>
+            <AppVersion>3.0.1</AppVersion>
+            <TransmissionType>AMT</TransmissionType>
+            <Gears xsi:type="TransmissionGearsPIFType">
+              <Gear number="1">
+                <Ratio>14.930</Ratio>
+                <MaxTorque>1900</MaxTorque>
+                <MaxSpeed>2000</MaxSpeed>
+              </Gear>
+              <Gear number="2">
+                <Ratio>11.640</Ratio>
+                <MaxTorque>1900</MaxTorque>
+                <MaxSpeed>2000</MaxSpeed>
+              </Gear>
+              <Gear number="3">
+                <Ratio>9.020</Ratio>
+                <MaxSpeed>2000</MaxSpeed>
+              </Gear>
+              <Gear number="4">
+                <Ratio>7.040</Ratio>
+                <MaxSpeed>2000</MaxSpeed>
+              </Gear>
+              <Gear number="5">
+                <Ratio>5.640</Ratio>
+                <MaxSpeed>2000</MaxSpeed>
+              </Gear>
+              <Gear number="6">
+                <Ratio>4.400</Ratio>
+                <MaxSpeed>2000</MaxSpeed>
+              </Gear>
+              <Gear number="7">
+                <Ratio>3.390</Ratio>
+                <MaxSpeed>2000</MaxSpeed>
+              </Gear>
+              <Gear number="8">
+                <Ratio>2.650</Ratio>
+                <MaxSpeed>2000</MaxSpeed>
+              </Gear>
+              <Gear number="9">
+                <Ratio>2.050</Ratio>
+                <MaxSpeed>2000</MaxSpeed>
+              </Gear>
+              <Gear number="10">
+                <Ratio>1.600</Ratio>
+                <MaxSpeed>2000</MaxSpeed>
+              </Gear>
+              <Gear number="11">
+                <Ratio>1.280</Ratio>
+                <MaxSpeed>2000</MaxSpeed>
+              </Gear>
+              <Gear number="12">
+                <Ratio>1.000</Ratio>
+              </Gear>
+            </Gears>
+          </Data>
+        </Transmission>
+        <Axlegear>
+          <Data xsi:type="AxlegearDataPIFType">
+            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+            <Model>Generic 40t Long Haul Truck AxleGear Primary</Model>
+            <CertificationMethod>Standard values</CertificationMethod>
+            <Date>2017-01-11T11:00:00Z</Date>
+            <AppVersion>3.0.1</AppVersion>
+            <LineType>Single portal axle</LineType>
+            <Ratio>2.590</Ratio>
+          </Data>
+        </Axlegear>
+        <AxleWheels>
+            <Data xsi:type="AxleWheelsDataPIFType">
+<!--        <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>
+              <vif0.1:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+                <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>
+              </vif0.1:Axle>
+              <vif0.1:Axle axleNumber="2" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+                <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>
+              </vif0.1:Axle>
+              <vif0.1:Axle axleNumber="3" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+                <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>
+              </vif0.1:Axle>
+            </Axles>
+          </Data>
+        </AxleWheels>
+        <Auxiliaries>
+          <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="AuxiliaryDataPIFType">
+            <Fan>
+              <Technology>Hydraulic driven - Constant displacement pump</Technology>
+            </Fan>
+            <SteeringPump>
+              <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+            </SteeringPump>
+            <ElectricSystem>
+              <AlternatorTechnology>conventional</AlternatorTechnology>
+              <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
+            </ElectricSystem>
+            <PneumaticSystem>
+              <SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+              <CompressorDrive>mechanically</CompressorDrive>
+              <Clutch>none</Clutch>
+              <CompressorRatio>1.000</CompressorRatio>
+              <SmartCompressionSystem>true</SmartCompressionSystem>
+              <SmartRegenerationSystem>false</SmartRegenerationSystem>
+              <AirsuspensionControl>electronically</AirsuspensionControl>
+              <SCRReagentDosing>true</SCRReagentDosing>
+            </PneumaticSystem>
+            <HVAC>
+              <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+              <EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
+            </HVAC>
+          </Data>
+        </Auxiliaries>
+      </Components>
+    </Vehicle>
+    <InputDataSignature>
+      <di:Reference URI="#VEH-PrimaryBus_SmartPS">
+        <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>KyEUoR+pb/fnqRuLFC53Ft+RhDf+ABAdd1xxsMwH7io=</di:DigestValue>
+      </di:Reference>
+    </InputDataSignature>
+    <ManufacturerRecordSignature>
+      <di:Reference URI="#RESULT-77ea5cb9575a4fe3b401">
+        <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>jIFYjdZEqVpxFinMBSoXvJg8Wl3OjE09xRAnjEgnhhY=</di:DigestValue>
+      </di:Reference>
+    </ManufacturerRecordSignature>
+    <Results>
+      <Status>success</Status>
+      <Result status="success">
+        <VehicleGroup>P33SD</VehicleGroup>
+        <Mission>Heavy Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
+          <Payload unit="kg">1352.52</Payload>
+          <PassengerCount>19.89</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">21.22359</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1555.73</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P33SD</VehicleGroup>
+        <Mission>Heavy Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
+          <Payload unit="kg">6762.60</Payload>
+          <PassengerCount>99.45</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">25.40945</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1862.57</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P33SD</VehicleGroup>
+        <Mission>Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
+          <Payload unit="kg">1352.52</Payload>
+          <PassengerCount>19.89</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">16.74101</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1227.15</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P33SD</VehicleGroup>
+        <Mission>Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
+          <Payload unit="kg">6762.60</Payload>
+          <PassengerCount>99.45</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">20.24221</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1483.80</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P33SD</VehicleGroup>
+        <Mission>Suburban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
+          <Payload unit="kg">1352.52</Payload>
+          <PassengerCount>19.89</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">14.34578</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1051.58</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P33SD</VehicleGroup>
+        <Mission>Suburban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
+          <Payload unit="kg">6762.60</Payload>
+          <PassengerCount>99.45</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">17.60016</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1290.13</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P33DD</VehicleGroup>
+        <Mission>Heavy Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
+          <Payload unit="kg">1578.29</Payload>
+          <PassengerCount>23.21</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">22.72091</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1665.49</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P33DD</VehicleGroup>
+        <Mission>Heavy Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
+          <Payload unit="kg">7891.43</Payload>
+          <PassengerCount>116.05</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">27.95930</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">2049.48</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P33DD</VehicleGroup>
+        <Mission>Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
+          <Payload unit="kg">1578.29</Payload>
+          <PassengerCount>23.21</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">17.90756</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1312.66</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P33DD</VehicleGroup>
+        <Mission>Urban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
+          <Payload unit="kg">7891.43</Payload>
+          <PassengerCount>116.05</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">22.23796</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1630.09</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P33DD</VehicleGroup>
+        <Mission>Suburban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
+          <Payload unit="kg">1578.29</Payload>
+          <PassengerCount>23.21</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">15.28035</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1120.08</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P33DD</VehicleGroup>
+        <Mission>Suburban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
+          <Payload unit="kg">7891.43</Payload>
+          <PassengerCount>116.05</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">19.26201</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1411.95</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P34SD</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">16239.55</TotalVehicleMass>
+          <Payload unit="kg">1026.55</Payload>
+          <PassengerCount>14.46</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">11.82464</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">866.77</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P34SD</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
+          <Payload unit="kg">4106.21</Payload>
+          <PassengerCount>57.83</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">13.32341</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">976.63</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P34SD</VehicleGroup>
+        <Mission>Coach</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">16490.49</TotalVehicleMass>
+          <Payload unit="kg">1277.49</Payload>
+          <PassengerCount>17.99</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">8.71847</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">639.08</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P34SD</VehicleGroup>
+        <Mission>Coach</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">18406.72</TotalVehicleMass>
+          <Payload unit="kg">3193.72</Payload>
+          <PassengerCount>44.98</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">9.20255</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">674.57</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P34DD</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">19298.40</TotalVehicleMass>
+          <Payload unit="kg">1448.40</Payload>
+          <PassengerCount>20.40</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">13.44807</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">985.77</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P34DD</VehicleGroup>
+        <Mission>Interurban</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
+          <Payload unit="kg">5793.60</Payload>
+          <PassengerCount>81.60</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">15.56740</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">1141.12</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P34DD</VehicleGroup>
+        <Mission>Coach</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">19703.95</TotalVehicleMass>
+          <Payload unit="kg">1853.95</Payload>
+          <PassengerCount>26.11</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">9.82937</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">720.51</CO2>
+      </Result>
+      <Result status="success">
+        <VehicleGroup>P34DD</VehicleGroup>
+        <Mission>Coach</Mission>
+        <SimulationParameters>
+          <TotalVehicleMass unit="kg">22484.88</TotalVehicleMass>
+          <Payload unit="kg">4634.88</Payload>
+          <PassengerCount>65.28</PassengerCount>
+          <FuelMode>single fuel mode</FuelMode>
+        </SimulationParameters>
+        <Fuel type="Diesel CI">
+          <EnergyConsumption unit="MJ/km">10.56728</EnergyConsumption>
+        </Fuel>
+        <CO2 unit="g/km">774.60</CO2>
+      </Result>
+    </Results>
+    <ApplicationInformation>
+      <SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+      <Date>2020-05-27T08:16:48.0278823Z</Date>
+    </ApplicationInformation>
+  </Data>
+    <Signature>
+    <di:Reference URI="#PIF-584956b9e3ab43acaf97">
+      <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>GPW3cyV+VQrDzyGeryMrakfOlD+YUWtdaHz/C2lhxJQ=</di:DigestValue>
+    </di:Reference>
+  </Signature>
+  </PrimaryVehicle>
+	<ManufacturingStage stageCount="2">
+		<Data xsi:type="vif0.1:BusManufacturingStageDataType" id="asdf">
+			<HashPreviousStage>
+				<di:Reference>
+					<di:DigestMethod Algorithm=""></di:DigestMethod>
+					<di:DigestValue></di:DigestValue>
+				</di:Reference>
+			</HashPreviousStage>
+			<vif0.1:Vehicle xsi:type="v2.8:InterimStageInputType" id="MST-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8">
+				<Manufacturer>Some Manufacturer</Manufacturer>
+		<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
+		<VIN>VEH-1234567890</VIN>
+		<Date>2020-01-09T11:00:00Z</Date>
+		<Model>Sample Bus Model</Model>
+		<LegislativeCategory>M3</LegislativeCategory>
+		<CorrectedActualMass>8300</CorrectedActualMass>
+		<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
+		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<ClassBus>I+II</ClassBus>
+		<NumberPassengersLowerDeck>30</NumberPassengersLowerDeck>
+		<NumberPassengersUpperDeck>0</NumberPassengersUpperDeck>
+		<BodyworkCode>CE</BodyworkCode>
+		<LowEntry>true</LowEntry>
+		<HeightIntegratedBody>3000</HeightIntegratedBody>
+		<VehicleLength>11830</VehicleLength>
+		<VehicleWidth>2550</VehicleWidth>
+		<EntranceHeight>120</EntranceHeight>
+		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
+		<VehicleDeclarationType>final</VehicleDeclarationType>
+		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
+			<v2.8: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>6.31</CdxA_0>
+					<TransferredCdxA>6.32</TransferredCdxA>
+					<DeclaredCdxA>6.34</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.8:AirDrag>
+			<Auxiliaries>
+				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
+					<ElectricSystem>
+						<LEDLights>
+							<Interiorlights>false</Interiorlights>
+							<Dayrunninglights>false</Dayrunninglights>
+							<Positionlights>false</Positionlights>
+							<Brakelights>false</Brakelights>
+							<Headlights>false</Headlights>
+						</LEDLights>
+					</ElectricSystem>
+					<HVAC>
+						<SystemConfiguration>7</SystemConfiguration>
+						<HeatPumpTypeDriverCompartment>non R-744 2-stage</HeatPumpTypeDriverCompartment>
+						<HeatPumpModeDriverCompartment>cooling</HeatPumpModeDriverCompartment>
+						<HeatPumpTypePassengerCompartment>non R-744 4-stage</HeatPumpTypePassengerCompartment>
+						<HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
+						<AuxiliaryHeaterPower>0</AuxiliaryHeaterPower>
+						<DoubleGlazing>true</DoubleGlazing>
+						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+						<SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
+					</HVAC>
+				</Data>
+			</Auxiliaries>
+		</Components>
+	</vif0.1:Vehicle>
+			<ApplicationInformation>
+				<SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+      <Date>2020-05-27T08:16:48.0278823Z</Date>
+			</ApplicationInformation>
+		</Data>
+		<Signature>
+			<di:Reference>
+				<di:DigestMethod Algorithm=""></di:DigestMethod>
+				<di:DigestValue></di:DigestValue>
+			</di:Reference>
+		</Signature>
+	</ManufacturingStage>
+</VectoOutputMultistage>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
new file mode 100644
index 0000000000000000000000000000000000000000..60d0e40d0ab928e8769e869b37c9e78a91ba13bd
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml	
@@ -0,0 +1,556 @@
+<?xml version="1.0" encoding="utf-8"?>
+<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+	<PrimaryVehicle>
+		<Data xsi:type="PrimaryVehicleDataType" id="PIF-4121ae4751874cefa376">
+			<Vehicle xsi:type="VehiclePIFType">
+				<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
+				<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+				<Model>Generic Model</Model>
+				<VIN>VEH-1234567890_nonSmart</VIN>
+				<Date>2017-02-15T11:00:00Z</Date>
+				<LegislativeCategory>M3</LegislativeCategory>
+				<ChassisConfiguration>Bus</ChassisConfiguration>
+				<AxleConfiguration>4x2</AxleConfiguration>
+				<Articulated>false</Articulated>
+				<TechnicalPermissibleMaximumLadenMass>28000</TechnicalPermissibleMaximumLadenMass>
+				<IdlingSpeed>700</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>false</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"/>
+				</TorqueLimits>
+				<Components xsi:type="VehicleComponentsPIFType">
+					<Engine>
+						<Data xsi:type="EngineDataPIFType">
+							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
+							<Model>Generic primary bus 41 Engine</Model>
+							<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+							<Date>2017-02-15T11:00:00Z</Date>
+							<AppVersion>VectoEngine x.y</AppVersion>
+							<Displacement>7700</Displacement>
+							<RatedSpeed>2200</RatedSpeed>
+							<RatedPower>220000</RatedPower>
+							<MaxEngineTorque>1100</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>700</IdlingSpeed>
+								<FullLoadAndDragCurve>
+									<Entry engineSpeed="600.00" maxTorque="546.02" dragTorque="-39.66"/>
+									<Entry engineSpeed="800.00" maxTorque="760.78" dragTorque="-48.83"/>
+									<Entry engineSpeed="1000.00" maxTorque="973.29" dragTorque="-56.44"/>
+									<Entry engineSpeed="1200.00" maxTorque="1092.03" dragTorque="-67.29"/>
+									<Entry engineSpeed="1400.00" maxTorque="1092.03" dragTorque="-77.58"/>
+									<Entry engineSpeed="1600.00" maxTorque="1092.03" dragTorque="-87.88"/>
+									<Entry engineSpeed="1800.00" maxTorque="1022.52" dragTorque="-94.11"/>
+									<Entry engineSpeed="2000.00" maxTorque="944.17" dragTorque="-100.76"/>
+									<Entry engineSpeed="2200.00" maxTorque="868.12" dragTorque="-113.36"/>
+									<Entry engineSpeed="2400.00" maxTorque="741.99" dragTorque="-122.60"/>
+									<Entry engineSpeed="2500.00" maxTorque="647.29" dragTorque="-126.66"/>
+									<Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-132.07"/>
+								</FullLoadAndDragCurve>
+								<Fuels>
+									<FuelType>Diesel CI</FuelType>
+								</Fuels>
+							</Mode>
+						</Data>
+					</Engine>
+					<Transmission>
+						<Data xsi:type="TransmissionDataPIFType">
+							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+							<Model>AT 6 Gear</Model>
+							<MainCertificationMethod>Standard values</MainCertificationMethod>
+							<Date>2017-01-11T11:00:00Z</Date>
+							<AppVersion>3.0.1</AppVersion>
+							<TransmissionType>APT-S</TransmissionType>
+							<Gears xsi:type="TransmissionGearsPIFType">
+								<Gear number="1">
+									<Ratio>3.364</Ratio>
+									<MaxTorque>1900</MaxTorque>
+									<MaxSpeed>2500</MaxSpeed>
+								</Gear>
+								<Gear number="2">
+									<Ratio>1.909</Ratio>
+									<MaxTorque>1900</MaxTorque>
+									<MaxSpeed>2500</MaxSpeed>
+								</Gear>
+								<Gear number="3">
+									<Ratio>1.421</Ratio>
+									<MaxSpeed>2500</MaxSpeed>
+								</Gear>
+								<Gear number="4">
+									<Ratio>1.000</Ratio>
+									<MaxSpeed>2500</MaxSpeed>
+								</Gear>
+								<Gear number="5">
+									<Ratio>0.720</Ratio>
+									<MaxSpeed>2500</MaxSpeed>
+								</Gear>
+								<Gear number="6">
+									<Ratio>0.615</Ratio>
+									<MaxSpeed>2500</MaxSpeed>
+								</Gear>
+							</Gears>
+						</Data>
+					</Transmission>
+					<Axlegear>
+						<Data xsi:type="AxlegearDataPIFType">
+							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+							<Model>Generic primary bus 41 AxleGear</Model>
+							<CertificationMethod>Standard values</CertificationMethod>
+							<Date>2017-01-11T11:00:00Z</Date>
+							<AppVersion>3.0.1</AppVersion>
+							<LineType>Single portal axle</LineType>
+							<Ratio>6.500</Ratio>
+						</Data>
+					</Axlegear>
+					<AxleWheels>
+						<Data xsi:type="AxleWheelsDataPIFType">
+							<Axles>
+								<vif0.1:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+									<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>
+								</vif0.1:Axle>
+								<vif0.1:Axle axleNumber="2" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+									<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>
+								</vif0.1:Axle>
+							</Axles>
+						</Data>
+					</AxleWheels>
+					<Auxiliaries>
+						<Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="AuxiliaryDataPIFType">
+							<Fan>
+								<Technology>Hydraulic driven - Constant displacement pump</Technology>
+							</Fan>
+							<SteeringPump>
+								<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+							</SteeringPump>
+							<ElectricSystem>
+								<AlternatorTechnology>conventional</AlternatorTechnology>
+								<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
+							</ElectricSystem>
+							<PneumaticSystem>
+								<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+								<CompressorDrive>mechanically</CompressorDrive>
+								<Clutch>none</Clutch>
+								<CompressorRatio>1.000</CompressorRatio>
+								<SmartCompressionSystem>true</SmartCompressionSystem>
+								<SmartRegenerationSystem>false</SmartRegenerationSystem>
+								<AirsuspensionControl>electronically</AirsuspensionControl>
+								<SCRReagentDosing>true</SCRReagentDosing>
+							</PneumaticSystem>
+							<HVAC>
+								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+								<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
+							</HVAC>
+						</Data>
+					</Auxiliaries>
+				</Components>
+			</Vehicle>
+			<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>gi7smqIT9b/iNr6yBm49IkS5ylirBLyHvjZQqlNpzUA=</di:DigestValue>
+				</di:Reference>
+			</InputDataSignature>
+			<ManufacturerRecordSignature>
+				<di:Reference URI="#RESULT-d5c4bf1b86394fd7b822">
+					<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>/z2B3MvXZr1k8vYmINK/6DLaXPreBcwwmHhHsfDvJRo=</di:DigestValue>
+				</di:Reference>
+			</ManufacturerRecordSignature>
+			<Results>
+				<Status>success</Status>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
+						<Payload unit="kg">1123.63</Payload>
+						<PassengerCount>16.52</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">20.73851</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1520.18</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
+						<Payload unit="kg">5618.16</Payload>
+						<PassengerCount>82.62</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">24.94611</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1828.60</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
+						<Payload unit="kg">1123.63</Payload>
+						<PassengerCount>16.52</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">16.93598</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1241.44</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
+						<Payload unit="kg">5618.16</Payload>
+						<PassengerCount>82.62</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">20.36950</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1493.13</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
+						<Payload unit="kg">1123.63</Payload>
+						<PassengerCount>16.52</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">15.03487</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1102.09</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
+						<Payload unit="kg">5618.16</Payload>
+						<PassengerCount>82.62</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">18.14589</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1330.13</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">12854.90</TotalVehicleMass>
+						<Payload unit="kg">879.90</Payload>
+						<PassengerCount>12.39</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">12.90679</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">946.09</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">15494.61</TotalVehicleMass>
+						<Payload unit="kg">3519.61</Payload>
+						<PassengerCount>49.57</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">14.34621</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1051.61</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
+						<Payload unit="kg">1193.34</Payload>
+						<PassengerCount>17.55</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">21.81903</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1599.38</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
+						<Payload unit="kg">5966.69</Payload>
+						<PassengerCount>87.75</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">26.59833</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1949.71</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
+						<Payload unit="kg">1193.34</Payload>
+						<PassengerCount>17.55</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">17.82311</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1306.47</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
+						<Payload unit="kg">5966.69</Payload>
+						<PassengerCount>87.75</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">21.69768</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1590.49</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
+						<Payload unit="kg">1193.34</Payload>
+						<PassengerCount>17.55</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">15.74932</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1154.46</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
+						<Payload unit="kg">5966.69</Payload>
+						<PassengerCount>87.75</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">19.17775</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1405.77</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
+						<Payload unit="kg">1075.44</Payload>
+						<PassengerCount>15.15</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">13.19757</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">967.41</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16669.61</TotalVehicleMass>
+						<Payload unit="kg">3519.61</Payload>
+						<PassengerCount>49.57</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">14.54412</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1066.11</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32SD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">14244.99</TotalVehicleMass>
+						<Payload unit="kg">1094.99</Payload>
+						<PassengerCount>15.42</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">11.13867</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">816.49</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32SD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">15887.48</TotalVehicleMass>
+						<Payload unit="kg">2737.48</Payload>
+						<PassengerCount>38.56</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">11.58643</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">849.31</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32DD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
+						<Payload unit="kg">1262.82</Payload>
+						<PassengerCount>17.79</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">13.62230</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">998.54</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32DD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">17609.41</TotalVehicleMass>
+						<Payload unit="kg">4209.41</Payload>
+						<PassengerCount>59.29</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">15.22020</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1115.67</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32DD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">14747.01</TotalVehicleMass>
+						<Payload unit="kg">1347.01</Payload>
+						<PassengerCount>18.97</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">11.61807</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">851.63</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32DD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16767.53</TotalVehicleMass>
+						<Payload unit="kg">3367.53</Payload>
+						<PassengerCount>47.43</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">12.15012</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">890.63</CO2>
+				</Result>
+			</Results>
+			<ApplicationInformation>
+				<SimulationToolVersion>0.6.1.1975-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+				<Date>2020-08-06T06:54:52.9756421Z</Date>
+			</ApplicationInformation>
+		</Data>
+		<Signature>
+			<di:Reference URI="#PIF-4121ae4751874cefa376">
+				<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>YnCPep7uMh3ghMrx6ZsEMLanOijFCZpku+ZDNd6rkLw=</di:DigestValue>
+			</di:Reference>
+		</Signature>
+	</PrimaryVehicle>
+</VectoOutputMultistage>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d6cb93e6a683c0ff7641e3fd886d33d9b3ec1954
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml	
@@ -0,0 +1,543 @@
+<?xml version="1.0" encoding="utf-8"?>
+<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+	<PrimaryVehicle>
+		<Data xsi:type="PrimaryVehicleDataType" id="PIF-04fd187f166a4d89aa84">
+			<Vehicle xsi:type="VehiclePIFType">
+				<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
+				<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+				<Model>Generic Model</Model>
+				<VIN>VEH-1234567890_nonSmart</VIN>
+				<Date>2017-02-15T11:00:00Z</Date>
+				<LegislativeCategory>M3</LegislativeCategory>
+				<ChassisConfiguration>Bus</ChassisConfiguration>
+				<AxleConfiguration>4x2</AxleConfiguration>
+				<Articulated>false</Articulated>
+				<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
+				<IdlingSpeed>700</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>false</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"/>
+				</TorqueLimits>
+				<Components xsi:type="VehicleComponentsPIFType">
+					<Engine>
+						<Data xsi:type="EngineDataPIFType">
+							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
+							<Model>Generic primary bus 41 Engine</Model>
+							<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+							<Date>2017-02-15T11:00:00Z</Date>
+							<AppVersion>VectoEngine x.y</AppVersion>
+							<Displacement>7700</Displacement>
+							<RatedSpeed>2200</RatedSpeed>
+							<RatedPower>220000</RatedPower>
+							<MaxEngineTorque>1100</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>700</IdlingSpeed>
+								<FullLoadAndDragCurve>
+									<Entry engineSpeed="600.00" maxTorque="546.02" dragTorque="-39.66"/>
+									<Entry engineSpeed="800.00" maxTorque="760.78" dragTorque="-48.83"/>
+									<Entry engineSpeed="1000.00" maxTorque="973.29" dragTorque="-56.44"/>
+									<Entry engineSpeed="1200.00" maxTorque="1092.03" dragTorque="-67.29"/>
+									<Entry engineSpeed="1400.00" maxTorque="1092.03" dragTorque="-77.58"/>
+									<Entry engineSpeed="1600.00" maxTorque="1092.03" dragTorque="-87.88"/>
+									<Entry engineSpeed="1800.00" maxTorque="1022.52" dragTorque="-94.11"/>
+									<Entry engineSpeed="2000.00" maxTorque="944.17" dragTorque="-100.76"/>
+									<Entry engineSpeed="2200.00" maxTorque="868.12" dragTorque="-113.36"/>
+									<Entry engineSpeed="2400.00" maxTorque="741.99" dragTorque="-122.60"/>
+									<Entry engineSpeed="2500.00" maxTorque="647.29" dragTorque="-126.66"/>
+									<Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-132.07"/>
+								</FullLoadAndDragCurve>
+								<Fuels>
+									<FuelType>Diesel CI</FuelType>
+								</Fuels>
+							</Mode>
+						</Data>
+					</Engine>
+					<Transmission>
+						<Data xsi:type="TransmissionDataPIFType">
+							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+							<Model>AT 6 Gear</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.350</Ratio>
+									<MaxTorque>1900</MaxTorque>
+									<MaxSpeed>2500</MaxSpeed>
+								</Gear>
+								<Gear number="2">
+									<Ratio>1.000</Ratio>
+									<MaxSpeed>2500</MaxSpeed>
+								</Gear>
+								<Gear number="3">
+									<Ratio>0.730</Ratio>
+									<MaxSpeed>2500</MaxSpeed>
+								</Gear>
+							</Gears>
+						</Data>
+					</Transmission>
+					<Axlegear>
+						<Data xsi:type="AxlegearDataPIFType">
+							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+							<Model>Generic primary bus 41 AxleGear</Model>
+							<CertificationMethod>Standard values</CertificationMethod>
+							<Date>2017-01-11T11:00:00Z</Date>
+							<AppVersion>3.0.1</AppVersion>
+							<LineType>Single portal axle</LineType>
+							<Ratio>5.800</Ratio>
+						</Data>
+					</Axlegear>
+					<AxleWheels>
+						<Data xsi:type="AxleWheelsDataPIFType">
+							<Axles>
+								<vif0.1:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+									<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>
+								</vif0.1:Axle>
+								<vif0.1:Axle axleNumber="2" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+									<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>
+								</vif0.1:Axle>
+							</Axles>
+						</Data>
+					</AxleWheels>
+					<Auxiliaries>
+						<Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="AuxiliaryDataPIFType">
+							<Fan>
+								<Technology>Hydraulic driven - Constant displacement pump</Technology>
+							</Fan>
+							<SteeringPump>
+								<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+							</SteeringPump>
+							<ElectricSystem>
+								<AlternatorTechnology>conventional</AlternatorTechnology>
+								<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
+							</ElectricSystem>
+							<PneumaticSystem>
+								<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+								<CompressorDrive>mechanically</CompressorDrive>
+								<Clutch>none</Clutch>
+								<CompressorRatio>1.000</CompressorRatio>
+								<SmartCompressionSystem>false</SmartCompressionSystem>
+								<SmartRegenerationSystem>false</SmartRegenerationSystem>
+								<AirsuspensionControl>electronically</AirsuspensionControl>
+								<SCRReagentDosing>true</SCRReagentDosing>
+							</PneumaticSystem>
+							<HVAC>
+								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+								<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
+							</HVAC>
+						</Data>
+					</Auxiliaries>
+				</Components>
+			</Vehicle>
+			<InputDataSignature>
+				<di:Reference URI="#VEH-PrimaryBus_nonSmart_ATP">
+					<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>kHJvKjlgsdqfXPm+aJHs0fEPPIvyfee8L/qYnXiXGIk=</di:DigestValue>
+				</di:Reference>
+			</InputDataSignature>
+			<ManufacturerRecordSignature>
+				<di:Reference URI="#RESULT-26e06589d2d34d69b6e8">
+					<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>rnrmrt3ib/vuMfdKNkVBq+ozl8ry6fjKxPPixWyNm8E=</di:DigestValue>
+				</di:Reference>
+			</ManufacturerRecordSignature>
+			<Results>
+				<Status>success</Status>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
+						<Payload unit="kg">1123.63</Payload>
+						<PassengerCount>16.52</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">22.31983</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1636.09</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
+						<Payload unit="kg">5618.16</Payload>
+						<PassengerCount>82.62</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">26.95463</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1975.83</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
+						<Payload unit="kg">1123.63</Payload>
+						<PassengerCount>16.52</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">17.92708</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1314.09</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
+						<Payload unit="kg">5618.16</Payload>
+						<PassengerCount>82.62</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">21.70502</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1591.02</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
+						<Payload unit="kg">1123.63</Payload>
+						<PassengerCount>16.52</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">15.43924</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1131.73</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
+						<Payload unit="kg">5618.16</Payload>
+						<PassengerCount>82.62</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">18.60503</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1363.79</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">12854.90</TotalVehicleMass>
+						<Payload unit="kg">879.90</Payload>
+						<PassengerCount>12.39</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">13.13927</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">963.14</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">15494.61</TotalVehicleMass>
+						<Payload unit="kg">3519.61</Payload>
+						<PassengerCount>49.57</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">14.79162</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1084.26</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
+						<Payload unit="kg">1193.34</Payload>
+						<PassengerCount>17.55</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">23.49056</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1721.91</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
+						<Payload unit="kg">5966.69</Payload>
+						<PassengerCount>87.75</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">28.74258</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">2106.89</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
+						<Payload unit="kg">1193.34</Payload>
+						<PassengerCount>17.55</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">18.83855</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1380.91</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
+						<Payload unit="kg">5966.69</Payload>
+						<PassengerCount>87.75</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">23.12983</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1695.47</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
+						<Payload unit="kg">1193.34</Payload>
+						<PassengerCount>17.55</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">16.15304</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1184.05</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
+						<Payload unit="kg">5966.69</Payload>
+						<PassengerCount>87.75</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">19.66023</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1441.14</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
+						<Payload unit="kg">1075.44</Payload>
+						<PassengerCount>15.15</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">13.51319</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">990.55</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16669.61</TotalVehicleMass>
+						<Payload unit="kg">3519.61</Payload>
+						<PassengerCount>49.57</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">15.04580</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1102.89</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32SD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">14244.99</TotalVehicleMass>
+						<Payload unit="kg">1094.99</Payload>
+						<PassengerCount>15.42</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">11.27604</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">826.56</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32SD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">15887.48</TotalVehicleMass>
+						<Payload unit="kg">2737.48</Payload>
+						<PassengerCount>38.56</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">11.75632</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">861.76</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32DD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
+						<Payload unit="kg">1262.82</Payload>
+						<PassengerCount>17.79</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">14.03138</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1028.53</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32DD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">17609.41</TotalVehicleMass>
+						<Payload unit="kg">4209.41</Payload>
+						<PassengerCount>59.29</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">15.76592</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1155.67</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32DD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">14747.01</TotalVehicleMass>
+						<Payload unit="kg">1347.01</Payload>
+						<PassengerCount>18.97</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">11.77104</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">862.84</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32DD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16767.53</TotalVehicleMass>
+						<Payload unit="kg">3367.53</Payload>
+						<PassengerCount>47.43</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">12.34058</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">904.59</CO2>
+				</Result>
+			</Results>
+			<ApplicationInformation>
+				<SimulationToolVersion>0.6.1.1975-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+				<Date>2020-08-06T07:05:05.6205328Z</Date>
+			</ApplicationInformation>
+		</Data>
+		<Signature>
+			<di:Reference URI="#PIF-04fd187f166a4d89aa84">
+				<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>y9M45uKl0ouxPZO+eYYCoXEWY2s6S/JlM+Kz8MFVJeg=</di:DigestValue>
+			</di:Reference>
+		</Signature>
+	</PrimaryVehicle>
+</VectoOutputMultistage>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml
index 4926386f464f356ea4a1c953e95ac209e19d91c3..36c7ce235908e93c097de92dc5e11da6daca668e 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml	
@@ -1,12 +1,12 @@
 <?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://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
+<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 V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
 		<Model>Generic Model</Model>
 		<VIN>VEH-1234567890_nonSmart</VIN>
 		<Date>2017-02-15T11:00:00Z</Date>
-		<VehicleCategory>Bus</VehicleCategory>
+		<ChassisConfiguration>Bus</ChassisConfiguration>
 		<AxleConfiguration>4x2</AxleConfiguration>
 		<Articulated>false</Articulated>
 		<TechnicalPermissibleMaximumLadenMass>28000</TechnicalPermissibleMaximumLadenMass>
@@ -2189,11 +2189,12 @@
 						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
 					</SteeringPump>
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
-						<SmartElectrics>false</SmartElectrics>
+						<AlternatorTechnology>conventional</AlternatorTechnology>
+						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
 					</ElectricSystem>
 					<PneumaticSystem>
 						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+						<CompressorDrive>mechanically</CompressorDrive>
 						<Clutch>none</Clutch>
 						<CompressorRatio>1.000</CompressorRatio>
 						<SmartCompressionSystem>false</SmartCompressionSystem>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml
index 5cfbd144c1a239d768a639c907e2984e88bbd27f..b8c85321b6908600643e72b1b7792f1499493cb7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml	
@@ -1,12 +1,12 @@
 <?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://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
+<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 V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart_ATP" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
 		<Model>Generic Model</Model>
 		<VIN>VEH-1234567890_nonSmart</VIN>
 		<Date>2017-02-15T11:00:00Z</Date>
-		<VehicleCategory>Bus</VehicleCategory>
+		<ChassisConfiguration>Bus</ChassisConfiguration>
 		<AxleConfiguration>4x2</AxleConfiguration>
 		<Articulated>false</Articulated>
 		<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
@@ -1702,11 +1702,12 @@
 						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
 					</SteeringPump>
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
-						<SmartElectrics>false</SmartElectrics>
+						<AlternatorTechnology>conventional</AlternatorTechnology>
+						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
 					</ElectricSystem>
 					<PneumaticSystem>
 						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+						<CompressorDrive>mechanically</CompressorDrive>
 						<Clutch>none</Clutch>
 						<CompressorRatio>1.000</CompressorRatio>
 						<SmartCompressionSystem>false</SmartCompressionSystem>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e576b9c606316cfbe8d53a9e1fdf3fdc19b81621
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml	
@@ -0,0 +1,577 @@
+<?xml version="1.0" encoding="utf-8"?>
+<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+	<PrimaryVehicle>
+		<Data xsi:type="PrimaryVehicleDataType" id="PIF-584956b9e3ab43acaf97">
+			<Vehicle xsi:type="VehiclePIFType">
+				<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
+				<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+				<Model>Generic Model Primary</Model>
+				<VIN>VEH-1234567890_SmartPS</VIN>
+				<Date>2017-02-15T11:00:00Z</Date>
+				<LegislativeCategory>M3</LegislativeCategory>
+				<ChassisConfiguration>Bus</ChassisConfiguration>
+				<AxleConfiguration>6x2</AxleConfiguration>
+				<Articulated>false</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>false</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 Primary</Manufacturer>
+							<Model>Bus 6x2 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>1800</RatedSpeed>
+							<RatedPower>325032</RatedPower>
+							<MaxEngineTorque>2134</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="1188.00" dragTorque="-138.00"/>
+									<Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00"/>
+									<Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00"/>
+									<Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00"/>
+									<Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00"/>
+									<Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00"/>
+									<Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00"/>
+									<Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00"/>
+									<Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00"/>
+									<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00"/>
+								</FullLoadAndDragCurve>
+								<Fuels>
+									<FuelType>Diesel CI</FuelType>
+								</Fuels>
+							</Mode>
+						</Data>
+					</Engine>
+					<Transmission>
+						<Data xsi:type="TransmissionDataPIFType">
+							<Manufacturer>Generic Gearbox Manufacturer Primary</Manufacturer>
+							<Model>Generic 40t Long Haul Truck Gearbox Primary</Model>
+							<MainCertificationMethod>Standard values</MainCertificationMethod>
+							<Date>2017-01-11T11:00:00Z</Date>
+							<AppVersion>3.0.1</AppVersion>
+							<TransmissionType>AMT</TransmissionType>
+							<Gears xsi:type="TransmissionGearsPIFType">
+								<Gear number="1">
+									<Ratio>14.930</Ratio>
+									<MaxTorque>1900</MaxTorque>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="2">
+									<Ratio>11.640</Ratio>
+									<MaxTorque>1900</MaxTorque>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="3">
+									<Ratio>9.020</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="4">
+									<Ratio>7.040</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="5">
+									<Ratio>5.640</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="6">
+									<Ratio>4.400</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="7">
+									<Ratio>3.390</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="8">
+									<Ratio>2.650</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="9">
+									<Ratio>2.050</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="10">
+									<Ratio>1.600</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="11">
+									<Ratio>1.280</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="12">
+									<Ratio>1.000</Ratio>
+								</Gear>
+							</Gears>
+						</Data>
+					</Transmission>
+					<Axlegear>
+						<Data xsi:type="AxlegearDataPIFType">
+							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+							<Model>Generic 40t Long Haul Truck AxleGear Primary</Model>
+							<CertificationMethod>Standard values</CertificationMethod>
+							<Date>2017-01-11T11:00:00Z</Date>
+							<AppVersion>3.0.1</AppVersion>
+							<LineType>Single portal axle</LineType>
+							<Ratio>2.590</Ratio>
+						</Data>
+					</Axlegear>
+					<AxleWheels>
+						<Data xsi:type="AxleWheelsDataPIFType">
+							<Axles>
+								<vif0.1:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+									<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>
+								</vif0.1:Axle>
+								<vif0.1:Axle axleNumber="2" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+									<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>
+								</vif0.1:Axle>
+								<vif0.1:Axle axleNumber="3" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+									<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>
+								</vif0.1:Axle>
+							</Axles>
+						</Data>
+					</AxleWheels>
+					<Auxiliaries>
+						<Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="AuxiliaryDataPIFType">
+							<Fan>
+								<Technology>Hydraulic driven - Constant displacement pump</Technology>
+							</Fan>
+							<SteeringPump>
+								<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+							</SteeringPump>
+							<ElectricSystem>
+								<AlternatorTechnology>conventional</AlternatorTechnology>
+								<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
+							</ElectricSystem>
+							<PneumaticSystem>
+								<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+								<CompressorDrive>mechanically</CompressorDrive>
+								<Clutch>none</Clutch>
+								<CompressorRatio>1.000</CompressorRatio>
+								<SmartCompressionSystem>true</SmartCompressionSystem>
+								<SmartRegenerationSystem>false</SmartRegenerationSystem>
+								<AirsuspensionControl>electronically</AirsuspensionControl>
+								<SCRReagentDosing>true</SCRReagentDosing>
+							</PneumaticSystem>
+							<HVAC>
+								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+								<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
+							</HVAC>
+						</Data>
+					</Auxiliaries>
+				</Components>
+			</Vehicle>
+			<InputDataSignature>
+				<di:Reference URI="#VEH-PrimaryBus_SmartPS">
+					<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>KyEUoR+pb/fnqRuLFC53Ft+RhDf+ABAdd1xxsMwH7io=</di:DigestValue>
+				</di:Reference>
+			</InputDataSignature>
+			<ManufacturerRecordSignature>
+				<di:Reference URI="#RESULT-77ea5cb9575a4fe3b401">
+					<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>jIFYjdZEqVpxFinMBSoXvJg8Wl3OjE09xRAnjEgnhhY=</di:DigestValue>
+				</di:Reference>
+			</ManufacturerRecordSignature>
+			<Results>
+				<Status>success</Status>
+				<Result status="success">
+					<VehicleGroup>P33SD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
+						<Payload unit="kg">1352.52</Payload>
+						<PassengerCount>19.89</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">21.22359</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1555.73</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33SD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
+						<Payload unit="kg">6762.60</Payload>
+						<PassengerCount>99.45</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">25.40945</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1862.57</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33SD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
+						<Payload unit="kg">1352.52</Payload>
+						<PassengerCount>19.89</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">16.74101</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1227.15</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33SD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
+						<Payload unit="kg">6762.60</Payload>
+						<PassengerCount>99.45</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">20.24221</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1483.80</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33SD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
+						<Payload unit="kg">1352.52</Payload>
+						<PassengerCount>19.89</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">14.34578</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1051.58</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33SD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
+						<Payload unit="kg">6762.60</Payload>
+						<PassengerCount>99.45</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">17.60016</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1290.13</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33DD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
+						<Payload unit="kg">1578.29</Payload>
+						<PassengerCount>23.21</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">22.72091</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1665.49</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33DD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
+						<Payload unit="kg">7891.43</Payload>
+						<PassengerCount>116.05</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">27.95930</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">2049.48</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33DD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
+						<Payload unit="kg">1578.29</Payload>
+						<PassengerCount>23.21</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">17.90756</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1312.66</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33DD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
+						<Payload unit="kg">7891.43</Payload>
+						<PassengerCount>116.05</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">22.23796</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1630.09</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33DD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
+						<Payload unit="kg">1578.29</Payload>
+						<PassengerCount>23.21</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">15.28035</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1120.08</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33DD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
+						<Payload unit="kg">7891.43</Payload>
+						<PassengerCount>116.05</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">19.26201</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1411.95</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16239.55</TotalVehicleMass>
+						<Payload unit="kg">1254.68</Payload>
+						<PassengerCount>14.46</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">11.82464</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">866.77</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
+						<Payload unit="kg">4106.21</Payload>
+						<PassengerCount>57.83</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">13.32341</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">976.63</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34SD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16490.49</TotalVehicleMass>
+						<Payload unit="kg">1277.49</Payload>
+						<PassengerCount>17.99</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">8.71847</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">639.08</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34SD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">18406.72</TotalVehicleMass>
+						<Payload unit="kg">3193.72</Payload>
+						<PassengerCount>44.98</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">9.20255</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">674.57</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34DD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">19298.40</TotalVehicleMass>
+						<Payload unit="kg">1448.40</Payload>
+						<PassengerCount>20.40</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">13.44807</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">985.77</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34DD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
+						<Payload unit="kg">5793.60</Payload>
+						<PassengerCount>81.60</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">15.56740</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1141.12</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34DD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">19703.95</TotalVehicleMass>
+						<Payload unit="kg">1853.95</Payload>
+						<PassengerCount>26.11</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">9.82937</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">720.51</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34DD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">22484.88</TotalVehicleMass>
+						<Payload unit="kg">4634.88</Payload>
+						<PassengerCount>65.28</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">10.56728</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">774.60</CO2>
+				</Result>
+			</Results>
+			<ApplicationInformation>
+				<SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+				<Date>2020-05-27T08:16:48.0278823Z</Date>
+			</ApplicationInformation>
+		</Data>
+		<Signature>
+			<di:Reference URI="#PIF-584956b9e3ab43acaf97">
+				<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>GPW3cyV+VQrDzyGeryMrakfOlD+YUWtdaHz/C2lhxJQ=</di:DigestValue>
+			</di:Reference>
+		</Signature>
+	</PrimaryVehicle>
+</VectoOutputMultistage>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.xml
index 78890696628598ea8967c20ab63906412ff2318c..79831ea6a1847b85c71d1b0c34d930a886703722 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.xml	
@@ -1,12 +1,12 @@
 <?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://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
+<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 V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_SmartPS" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
 		<Model>Generic Model Primary</Model>
 		<VIN>VEH-1234567890_SmartPS</VIN>
 		<Date>2017-02-15T11:00:00Z</Date>
-		<VehicleCategory>Bus</VehicleCategory>
+		<ChassisConfiguration>Bus</ChassisConfiguration>
 		<AxleConfiguration>6x2</AxleConfiguration>
 		<Articulated>false</Articulated>
 		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
@@ -3338,13 +3338,12 @@
 						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
 					</SteeringPump>
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
-						<SmartElectrics>false</SmartElectrics>
-						<MaxAlternatorPower>15000</MaxAlternatorPower>
-						<ElectricStorageCapacity>50</ElectricStorageCapacity>
+						<AlternatorTechnology>conventional</AlternatorTechnology>
+						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
 					</ElectricSystem>
 					<PneumaticSystem>
 						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+						<CompressorDrive>mechanically</CompressorDrive>
 						<Clutch>none</Clutch>
 						<CompressorRatio>1.000</CompressorRatio>
 						<SmartCompressionSystem>true</SmartCompressionSystem>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml
index 8c091737ec932513d11573fd7555e8f192b078db..0bb245c753dda1a5165ba1933eb61587241f352a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml
@@ -1,29 +1,35 @@
 <?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://citnet.tech.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
-	<v2.0:Vehicle id="VEH-1234567890_mixed" xsi:type="CompletedVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
+xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+	<v2.0:Vehicle id="VEH-1234567890_mixed" xsi:type="InterimStageInputType" >
 		<Manufacturer>Some Manufacturer</Manufacturer>
 		<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
-		<Model>Sample Bus Model</Model>
 		<VIN>VEH-1234567890_m</VIN>
 		<Date>2020-01-09T11:00:00Z</Date>
-		<LegislativeClass>M3</LegislativeClass>
-		<ClassBus>II+III</ClassBus>
-		<VehicleCode>CA</VehicleCode>
-		<CurbMassChassis>8300</CurbMassChassis>
+		<Model>Sample Bus Model</Model>
+		<LegislativeCategory>M3</LegislativeCategory>
+		<CorrectedActualMass>8300</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
-    <NgTankSystem>Compressed</NgTankSystem>
-		<RegisteredPassengers>
-			<LowerDeck>30</LowerDeck>
-			<UpperDeck>0</UpperDeck>
-		</RegisteredPassengers>
+		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<ClassBus>II+III</ClassBus>
+			<NumberPassengersLowerDeck>30</NumberPassengersLowerDeck>
+			<NumberPassengersUpperDeck>0</NumberPassengersUpperDeck>
+		<BodyworkCode>CA</BodyworkCode>
 		<LowEntry>true</LowEntry>
-		<HeightIntegratedBody>3.000</HeightIntegratedBody>
-		<VehicleLength>11.830</VehicleLength>
-		<VehicleWidth>2.550</VehicleWidth>
-		<EntranceHeight>0.120</EntranceHeight>
+		<HeightIntegratedBody>3000</HeightIntegratedBody>
+		<VehicleLength>11830</VehicleLength>
+		<VehicleWidth>2550</VehicleWidth>
+		<EntranceHeight>120</EntranceHeight>
 		<DoorDriveTechnology>mixed</DoorDriveTechnology>
+		<VehicleDeclarationType>final</VehicleDeclarationType>
 		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
-			<v2.6:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+			<v2.8:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 				<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
 					<Manufacturer>Generic Manufacturer</Manufacturer>
 					<Model>Generic Model</Model>
@@ -44,28 +50,26 @@
 						<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
 					</di:Reference>
 				</Signature>
-			</v2.6:AirDrag>
+			</v2.8:AirDrag>
 			<Auxiliaries>
 				<Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
 						<LEDLights>
+							<Interiorlights>false</Interiorlights>
 							<Dayrunninglights>false</Dayrunninglights>
-							<Headlights>false</Headlights>
 							<Positionlights>false</Positionlights>
 							<Brakelights>false</Brakelights>
-							<Interiorlights>false</Interiorlights>
+							<Headlights>false</Headlights>
 						</LEDLights>
 					</ElectricSystem>
 					<HVAC>
 						<SystemConfiguration>7</SystemConfiguration>
-						<CompressorType>
-							<DriverAC>2-stage</DriverAC>
-							<PassengerAC>4-stage</PassengerAC>
-						</CompressorType>
+						<HeatPumpTypeDriverCompartment>non R-744 2-stage</HeatPumpTypeDriverCompartment>
+						<HeatPumpModeDriverCompartment>cooling</HeatPumpModeDriverCompartment>
+						<HeatPumpTypePassengerCompartment>non R-744 2-stage</HeatPumpTypePassengerCompartment>
+						<HeatPumpModePassengerCompartment>cooling</HeatPumpModePassengerCompartment>
 						<AuxiliaryHeaterPower>0</AuxiliaryHeaterPower>
 						<DoubleGlazing>true</DoubleGlazing>
-						<HeatPump>false</HeatPump>
 						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
 						<SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
 					</HVAC>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
new file mode 100644
index 0000000000000000000000000000000000000000..78dfcf158de1b6ab76838d6072eeb7cf07a67d94
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
@@ -0,0 +1,550 @@
+<?xml version="1.0" encoding="utf-8"?>
+<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+	<PrimaryVehicle>
+		<Data xsi:type="PrimaryVehicleDataType" id="PIF-65de7efe65ee4b4cac4c">
+			<Vehicle xsi:type="VehiclePIFType">
+				<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
+				<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+				<Model>Generic Model</Model>
+				<VIN>VEH-1234567890_nonSmart</VIN>
+				<Date>2017-02-15T11:00:00Z</Date>
+				<LegislativeCategory>M3</LegislativeCategory>
+				<ChassisConfiguration>Bus</ChassisConfiguration>
+				<AxleConfiguration>4x2</AxleConfiguration>
+				<Articulated>false</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>true</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>Generic 40t Long Haul Truck 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>380000</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>560</IdlingSpeed>
+								<FullLoadAndDragCurve>
+									<Entry engineSpeed="560.00" maxTorque="1180.00" dragTorque="-149.00"/>
+									<Entry engineSpeed="600.00" maxTorque="1282.00" dragTorque="-148.00"/>
+									<Entry engineSpeed="800.00" maxTorque="1791.00" dragTorque="-149.00"/>
+									<Entry engineSpeed="1000.00" maxTorque="2300.00" dragTorque="-160.00"/>
+									<Entry engineSpeed="1200.00" maxTorque="2300.00" dragTorque="-179.00"/>
+									<Entry engineSpeed="1400.00" maxTorque="2300.00" dragTorque="-203.00"/>
+									<Entry engineSpeed="1600.00" maxTorque="2079.00" dragTorque="-235.00"/>
+									<Entry engineSpeed="1800.00" maxTorque="1857.00" dragTorque="-264.00"/>
+									<Entry engineSpeed="2000.00" maxTorque="1352.00" dragTorque="-301.00"/>
+									<Entry engineSpeed="2100.00" maxTorque="1100.00" dragTorque="-320.00"/>
+								</FullLoadAndDragCurve>
+								<Fuels>
+									<FuelType>NG CI</FuelType>
+								</Fuels>
+							</Mode>
+						</Data>
+					</Engine>
+					<Transmission>
+						<Data xsi:type="TransmissionDataPIFType">
+							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+							<Model>Generic 40t Long Haul Truck Gearbox</Model>
+							<MainCertificationMethod>Standard values</MainCertificationMethod>
+							<Date>2017-01-11T11:00:00Z</Date>
+							<AppVersion>3.0.1</AppVersion>
+							<TransmissionType>AMT</TransmissionType>
+							<Gears xsi:type="TransmissionGearsPIFType">
+								<Gear number="1">
+									<Ratio>14.930</Ratio>
+									<MaxTorque>1900</MaxTorque>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="2">
+									<Ratio>11.640</Ratio>
+									<MaxTorque>1900</MaxTorque>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="3">
+									<Ratio>9.020</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="4">
+									<Ratio>7.040</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="5">
+									<Ratio>5.640</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="6">
+									<Ratio>4.400</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="7">
+									<Ratio>3.390</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="8">
+									<Ratio>2.650</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="9">
+									<Ratio>2.050</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="10">
+									<Ratio>1.600</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="11">
+									<Ratio>1.280</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="12">
+									<Ratio>1.000</Ratio>
+								</Gear>
+							</Gears>
+						</Data>
+					</Transmission>
+					<Axlegear>
+						<Data xsi:type="AxlegearDataPIFType">
+							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+							<Model>Generic 40t Long Haul Truck AxleGear</Model>
+							<CertificationMethod>Standard values</CertificationMethod>
+							<Date>2017-01-11T11:00:00Z</Date>
+							<AppVersion>3.0.1</AppVersion>
+							<LineType>Single portal axle</LineType>
+							<Ratio>2.590</Ratio>
+						</Data>
+					</Axlegear>
+					<AxleWheels>
+						<Data xsi:type="AxleWheelsDataPIFType">
+							<Axles>
+								<vif0.1:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+									<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>
+								</vif0.1:Axle>
+								<vif0.1:Axle axleNumber="2" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+									<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>
+								</vif0.1:Axle>
+							</Axles>
+						</Data>
+					</AxleWheels>
+					<Auxiliaries>
+						<Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="AuxiliaryDataPIFType">
+							<Fan>
+								<Technology>Electrically driven - Electronically controlled</Technology>
+							</Fan>
+							<SteeringPump>
+								<Technology axleNumber="1">Full electric steering gear</Technology>
+							</SteeringPump>
+							<ElectricSystem>
+								<AlternatorTechnology>conventional</AlternatorTechnology>
+								<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
+							</ElectricSystem>
+							<PneumaticSystem>
+								<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+								<CompressorDrive>mechanically</CompressorDrive>
+								<Clutch>none</Clutch>
+								<CompressorRatio>1.000</CompressorRatio>
+								<SmartCompressionSystem>false</SmartCompressionSystem>
+								<SmartRegenerationSystem>false</SmartRegenerationSystem>
+								<AirsuspensionControl>electronically</AirsuspensionControl>
+								<SCRReagentDosing>true</SCRReagentDosing>
+							</PneumaticSystem>
+							<HVAC>
+								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+								<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
+							</HVAC>
+						</Data>
+					</Auxiliaries>
+				</Components>
+			</Vehicle>
+			<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>4C7sfmETI+wy6CMQq+MZK1MO8SRxRiZu+3rQ3GUfko4=</di:DigestValue>
+				</di:Reference>
+			</InputDataSignature>
+			<ManufacturerRecordSignature>
+				<di:Reference URI="#RESULT-bc20a2dbfee54190ae90">
+					<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>+0Hg3i3G7tHlYHM2JxapJje6Ca3nE5EXZVTNdgkeyMo=</di:DigestValue>
+				</di:Reference>
+			</ManufacturerRecordSignature>
+			<Results>
+				<Status>success</Status>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
+						<Payload unit="kg">1123.63</Payload>
+						<PassengerCount>16.52</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="NG CI">
+						<EnergyConsumption unit="MJ/km">17.81185</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">998.21</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
+						<Payload unit="kg">5618.16</Payload>
+						<PassengerCount>82.62</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="NG CI">
+						<EnergyConsumption unit="MJ/km">21.37501</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1197.89</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
+						<Payload unit="kg">1123.63</Payload>
+						<PassengerCount>16.52</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="NG CI">
+						<EnergyConsumption unit="MJ/km">14.37972</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">805.86</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
+						<Payload unit="kg">5618.16</Payload>
+						<PassengerCount>82.62</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="NG CI">
+						<EnergyConsumption unit="MJ/km">17.36588</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">973.21</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
+						<Payload unit="kg">1123.63</Payload>
+						<PassengerCount>16.52</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="NG CI">
+						<EnergyConsumption unit="MJ/km">12.72559</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">713.16</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31SD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
+						<Payload unit="kg">5618.16</Payload>
+						<PassengerCount>82.62</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="NG CI">
+						<EnergyConsumption unit="MJ/km">15.58182</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">873.23</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
+						<Payload unit="kg">1193.34</Payload>
+						<PassengerCount>17.55</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="NG CI">
+						<EnergyConsumption unit="MJ/km">18.89946</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1059.16</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
+						<Payload unit="kg">5966.69</Payload>
+						<PassengerCount>87.75</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="NG CI">
+						<EnergyConsumption unit="MJ/km">22.89746</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1283.21</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
+						<Payload unit="kg">1193.34</Payload>
+						<PassengerCount>17.55</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="NG CI">
+						<EnergyConsumption unit="MJ/km">15.23384</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">853.73</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
+						<Payload unit="kg">5966.69</Payload>
+						<PassengerCount>87.75</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="NG CI">
+						<EnergyConsumption unit="MJ/km">18.56793</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1040.58</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
+						<Payload unit="kg">1193.34</Payload>
+						<PassengerCount>17.55</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="NG CI">
+						<EnergyConsumption unit="MJ/km">13.41841</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">751.99</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P31DD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
+						<Payload unit="kg">5966.69</Payload>
+						<PassengerCount>87.75</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="NG CI">
+						<EnergyConsumption unit="MJ/km">16.61045</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">930.88</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">14029.90</TotalVehicleMass>
+						<Payload unit="kg">879.90</Payload>
+						<PassengerCount>12.39</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="NG CI">
+						<EnergyConsumption unit="MJ/km">10.88604</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">610.07</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16669.61</TotalVehicleMass>
+						<Payload unit="kg">3519.61</Payload>
+						<PassengerCount>49.57</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="NG CI">
+						<EnergyConsumption unit="MJ/km">12.24260</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">686.10</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32SD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">14244.99</TotalVehicleMass>
+						<Payload unit="kg">1094.99</Payload>
+						<PassengerCount>15.42</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="NG CI">
+						<EnergyConsumption unit="MJ/km">8.63290</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">483.80</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32SD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">15887.48</TotalVehicleMass>
+						<Payload unit="kg">2737.48</Payload>
+						<PassengerCount>38.56</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="NG CI">
+						<EnergyConsumption unit="MJ/km">9.09409</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">509.65</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32DD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">14452.35</TotalVehicleMass>
+						<Payload unit="kg">1052.35</Payload>
+						<PassengerCount>14.82</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="NG CI">
+						<EnergyConsumption unit="MJ/km">11.25244</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">630.61</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32DD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">17609.41</TotalVehicleMass>
+						<Payload unit="kg">4209.41</Payload>
+						<PassengerCount>59.29</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="NG CI">
+						<EnergyConsumption unit="MJ/km">12.91147</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">723.58</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32DD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">14747.01</TotalVehicleMass>
+						<Payload unit="kg">1347.01</Payload>
+						<PassengerCount>18.97</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="NG CI">
+						<EnergyConsumption unit="MJ/km">9.09497</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">509.70</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P32DD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16767.53</TotalVehicleMass>
+						<Payload unit="kg">3367.53</Payload>
+						<PassengerCount>47.43</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="NG CI">
+						<EnergyConsumption unit="MJ/km">9.65550</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">541.11</CO2>
+				</Result>
+			</Results>
+			<ApplicationInformation>
+				<SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+				<Date>2020-05-27T08:24:31.2197913Z</Date>
+			</ApplicationInformation>
+		</Data>
+		<Signature>
+			<di:Reference URI="#PIF-65de7efe65ee4b4cac4c">
+				<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>MgGDNMXm8x2CI30U7X27ZFWn9cqjTnylZGA0nHA6xtM=</di:DigestValue>
+			</di:Reference>
+		</Signature>
+	</PrimaryVehicle>
+</VectoOutputMultistage>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml
index f663ecd741dd7f0e49a33ed3a01d2e1d8eff7067..bc8e0f7b7829f20d04d4818ea34c683f3e8fea93 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml
@@ -6,7 +6,7 @@
 		<Model>Generic Model</Model>
 		<VIN>VEH-1234567890_nonSmart</VIN>
 		<Date>2017-02-15T11:00:00Z</Date>
-		<VehicleCategory>Bus</VehicleCategory>
+		<ChassisConfiguration>Bus</ChassisConfiguration>
 		<AxleConfiguration>4x2</AxleConfiguration>
     <Articulated>false</Articulated>
 		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
@@ -3265,11 +3265,12 @@
 						<Technology axleNumber="1">Full electric steering gear</Technology>
 					</SteeringPump>
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
-						<SmartElectrics>false</SmartElectrics>
+						<AlternatorTechnology>conventional</AlternatorTechnology>
+						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
 					</ElectricSystem>
 					<PneumaticSystem>
 						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+						<CompressorDrive>mechanically</CompressorDrive>
 						<Clutch>none</Clutch>
 						<CompressorRatio>1.000</CompressorRatio>
 						<SmartCompressionSystem>false</SmartCompressionSystem>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus.xml
index 605186f44d6a47ace440e83b21b8a77e11ea9fdb..5a1f996f15299333832d9624b894f7c14ec86c01 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus.xml
@@ -1,12 +1,12 @@
 <?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 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<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 V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
 		<Model>Generic Model</Model>
 		<VIN>VEH-1234567890_nonSmart</VIN>
 		<Date>2017-02-15T11:00:00Z</Date>
-		<VehicleCategory>Bus</VehicleCategory>
+		<ChassisConfiguration>Bus</ChassisConfiguration>
 		<AxleConfiguration>4x2</AxleConfiguration>
     <Articulated>false</Articulated>
 		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
@@ -3265,11 +3265,12 @@
 						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
 					</SteeringPump>
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
-						<SmartElectrics>false</SmartElectrics>
+						<AlternatorTechnology>conventional</AlternatorTechnology>
+						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
 					</ElectricSystem>
 					<PneumaticSystem>
 						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+						<CompressorDrive>mechanically</CompressorDrive>
 						<Clutch>none</Clutch>
 						<CompressorRatio>1.000</CompressorRatio>
 						<SmartCompressionSystem>false</SmartCompressionSystem>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml
index 4d3b9df2bb769945c332ff6d29686a87306b1b20..4ccf5d410765c92bc3541dc9d2a6204a4af8abf3 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES.xml
@@ -6,9 +6,9 @@
 		<Model>Generic Model</Model>
 		<VIN>VEH-1234567890_SmartES</VIN>
 		<Date>2017-02-15T11:00:00Z</Date>
-		<VehicleCategory>Bus</VehicleCategory>
+		<ChassisConfiguration>Bus</ChassisConfiguration>
 		<AxleConfiguration>4x2</AxleConfiguration>
-    <Articulated>false</Articulated>
+		<Articulated>false</Articulated>
 		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
 		<IdlingSpeed>600</IdlingSpeed>
 		<RetarderType>Transmission Output Retarder</RetarderType>
@@ -3265,13 +3265,21 @@
 						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
 					</SteeringPump>
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
-						<SmartElectrics>true</SmartElectrics>
-						<MaxAlternatorPower>35000</MaxAlternatorPower>
-						<ElectricStorageCapacity>50</ElectricStorageCapacity>
+						<AlternatorTechnology>smart</AlternatorTechnology>
+						<SmartAlternator>
+							<RatedCurrent>730</RatedCurrent>
+							<RatedVoltage>48</RatedVoltage>
+						</SmartAlternator>
+						<Battery>
+							<BatteryTechnology>li-ion battery - high power</BatteryTechnology>
+							<RatedCapacity>50</RatedCapacity>
+							<NominalVoltage>48</NominalVoltage>
+						</Battery>
+						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
 					</ElectricSystem>
 					<PneumaticSystem>
 						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+						<CompressorDrive>mechanically</CompressorDrive>
 						<Clutch>none</Clutch>
 						<CompressorRatio>1.000</CompressorRatio>
 						<SmartCompressionSystem>false</SmartCompressionSystem>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml
index 7800c9f70e3daf6051140151d5c3fe1c817b99ac..788861f365b4b43930008b6f0331c149018f9196 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartES_PS.xml
@@ -1,12 +1,12 @@
 <?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 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<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 v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_SmartES-PS" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
 		<Model>Generic Model</Model>
 		<VIN>VEH-1234567890_SmartES-PS</VIN>
 		<Date>2017-02-15T11:00:00Z</Date>
-		<VehicleCategory>Bus</VehicleCategory>
+		<ChassisConfiguration>Bus</ChassisConfiguration>
 		<AxleConfiguration>4x2</AxleConfiguration>
     <Articulated>false</Articulated>
 		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
@@ -3265,13 +3265,21 @@
 						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
 					</SteeringPump>
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
-						<SmartElectrics>true</SmartElectrics>
-						<MaxAlternatorPower>15000</MaxAlternatorPower>
-						<ElectricStorageCapacity>50</ElectricStorageCapacity>
+						<AlternatorTechnology>smart</AlternatorTechnology>
+						<SmartAlternator>
+							<RatedCurrent>730</RatedCurrent>
+							<RatedVoltage>48</RatedVoltage>
+						</SmartAlternator>
+						<Battery>
+							<BatteryTechnology>li-ion battery - high power</BatteryTechnology>
+							<RatedCapacity>50</RatedCapacity>
+							<NominalVoltage>48</NominalVoltage>
+						</Battery>
+						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
 					</ElectricSystem>
 					<PneumaticSystem>
 						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+						<CompressorDrive>mechanically</CompressorDrive>
 						<Clutch>none</Clutch>
 						<CompressorRatio>1.000</CompressorRatio>
 						<SmartCompressionSystem>true</SmartCompressionSystem>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml
index d8a7313b8c0947b32ac2c56c6409105a3204b26d..49e7eb95766fe98f469b49fdbbcc48e879e8188d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_SmartPS.xml
@@ -1,14 +1,14 @@
 <?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 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<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 v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_SmartPS" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
 		<Model>Generic Model</Model>
 		<VIN>VEH-1234567890_SmartPS</VIN>
 		<Date>2017-02-15T11:00:00Z</Date>
-		<VehicleCategory>Bus</VehicleCategory>
+		<ChassisConfiguration>Bus</ChassisConfiguration>
 		<AxleConfiguration>4x2</AxleConfiguration>
-    <Articulated>false</Articulated>
+		<Articulated>false</Articulated>
 		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
 		<IdlingSpeed>600</IdlingSpeed>
 		<RetarderType>Transmission Output Retarder</RetarderType>
@@ -3265,13 +3265,12 @@
 						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
 					</SteeringPump>
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
-						<SmartElectrics>false</SmartElectrics>
-						<MaxAlternatorPower>15000</MaxAlternatorPower>
-						<ElectricStorageCapacity>50</ElectricStorageCapacity>
+						<AlternatorTechnology>conventional</AlternatorTechnology>
+						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
 					</ElectricSystem>
 					<PneumaticSystem>
 						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+						<CompressorDrive>mechanically</CompressorDrive>
 						<Clutch>none</Clutch>
 						<CompressorRatio>1.000</CompressorRatio>
 						<SmartCompressionSystem>true</SmartCompressionSystem>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml
index 605186f44d6a47ace440e83b21b8a77e11ea9fdb..b5fdeffd7f4d1234b158dc0ce16da710013c4e89 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart.xml
@@ -1,12 +1,12 @@
 <?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 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<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 v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
 		<Model>Generic Model</Model>
 		<VIN>VEH-1234567890_nonSmart</VIN>
 		<Date>2017-02-15T11:00:00Z</Date>
-		<VehicleCategory>Bus</VehicleCategory>
+		<ChassisConfiguration>Bus</ChassisConfiguration>
 		<AxleConfiguration>4x2</AxleConfiguration>
     <Articulated>false</Articulated>
 		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
@@ -3265,11 +3265,12 @@
 						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
 					</SteeringPump>
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
-						<SmartElectrics>false</SmartElectrics>
+						<AlternatorTechnology>conventional</AlternatorTechnology>
+						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
 					</ElectricSystem>
 					<PneumaticSystem>
 						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+						<CompressorDrive>mechanically</CompressorDrive>
 						<Clutch>none</Clutch>
 						<CompressorRatio>1.000</CompressorRatio>
 						<SmartCompressionSystem>false</SmartCompressionSystem>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml
index 944965bb87f2e4b3a65e708e3f87c70adb3735de..13ad55d5c3162909d37bf819e5eba202ac2fdc74 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-primary_heavyBus_nonSmart_ESS.xml
@@ -1,12 +1,12 @@
 <?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 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+<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 v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart-ESS" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
 		<Model>Generic Model</Model>
 		<VIN>VEH-1234567890_nonSmart-ESS</VIN>
 		<Date>2017-02-15T11:00:00Z</Date>
-		<VehicleCategory>Bus</VehicleCategory>
+		<ChassisConfiguration>Bus</ChassisConfiguration>
 		<AxleConfiguration>4x2</AxleConfiguration>
     <Articulated>false</Articulated>
 		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
@@ -3265,11 +3265,12 @@
 						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
 					</SteeringPump>
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
-						<SmartElectrics>false</SmartElectrics>
+						<AlternatorTechnology>conventional</AlternatorTechnology>
+						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
 					</ElectricSystem>
 					<PneumaticSystem>
 						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+						<CompressorDrive>mechanically</CompressorDrive>
 						<Clutch>none</Clutch>
 						<CompressorRatio>1.000</CompressorRatio>
 						<SmartCompressionSystem>false</SmartCompressionSystem>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.xml
index 6191bcc6d53b1535284af13da74dab9b3b1fb3f6..117df858b87edc1ba5fe0f0e2b72b478d3ae8d84 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/primary_heavyBus group 42_non_Smart.xml	
@@ -1,12 +1,12 @@
 <?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">
+<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 v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
 	<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
 		<Manufacturer>Generic Truck Manufacturer</Manufacturer>
 		<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
 		<Model>Generic Model</Model>
 		<VIN>VEH-1234567890_SmartPS</VIN>
 		<Date>2017-02-15T11:00:00Z</Date>
-		<VehicleCategory>Bus</VehicleCategory>
+		<ChassisConfiguration>Bus</ChassisConfiguration>
 		<AxleConfiguration>6x2</AxleConfiguration>
 		<Articulated>false</Articulated>
 		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
@@ -3338,13 +3338,12 @@
 						<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
 					</SteeringPump>
 					<ElectricSystem>
-						<AlternatorTechnology>default</AlternatorTechnology>
-						<SmartElectrics>false</SmartElectrics>
-						<MaxAlternatorPower>15000</MaxAlternatorPower>
-						<ElectricStorageCapacity>50</ElectricStorageCapacity>
+						<AlternatorTechnology>conventional</AlternatorTechnology>
+						<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
 					</ElectricSystem>
 					<PneumaticSystem>
 						<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+						<CompressorDrive>mechanically</CompressorDrive>
 						<Clutch>none</Clutch>
 						<CompressorRatio>1.000</CompressorRatio>
 						<SmartCompressionSystem>false</SmartCompressionSystem>
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 3262117a3d68915aaa85497dadf0c15a32f4197a..5962aa99319c9e567d6c125a67e1229b4d8f37c3 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -149,6 +149,7 @@
     <Compile Include="Models\SimulationComponent\EngineFanAuxTest.cs" />
     <Compile Include="Models\SimulationComponent\GearboxShiftLossesTest.cs" />
     <Compile Include="Models\SimulationComponent\SuperCapTest.cs" />
+    <Compile Include="Utils\CompletedVIF.cs" />
     <Compile Include="Utils\MockElectricConsumer.cs" />
     <Compile Include="Utils\MockHybridControl.cs" />
     <Compile Include="Utils\MockBattery.cs" />
@@ -4319,6 +4320,12 @@
     <Content Include="TestData\Integration\ADAS\Group9_AT_PCCEcoRoll.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="TestData\Integration\Buses\FactorMethod\primary_heavyBus group41.RSLT_VIF.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="TestData\Integration\Buses\FactorMethod\primary_heavyBus group41_AT-P.RSLT_VIF.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="TestData\Integration\Buses\FactorMethod\primary_heavyBus group41_AT-P.RSLT_PIF.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -4352,6 +4359,9 @@
     <Content Include="TestData\Integration\Buses\FactorMethod\vecto_vehicle-completed_heavyBus_42.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="TestData\Integration\Buses\FactorMethod\vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="TestData\Integration\Buses\FactorMethod\vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_PIF.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
index 2e2d7352d77c68d325129097cf884af52772a7c8..f9364d40d847f3c81893de8c236cf6eb80bbfabc 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
@@ -358,7 +358,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.AreEqual("Variable displacement elec. controlled", aux.SteeringPumpTechnology[0]);
 
 			Assert.AreEqual(1, aux.ElectricSupply.Alternators.Count);
-			Assert.AreEqual("default", aux.ElectricSupply.Alternators[0].Technology);
+			Assert.AreEqual("conventional", aux.ElectricSupply.Alternators[0].Technology);
 			Assert.AreEqual(true, aux.ElectricSupply.SmartElectrics);
 			Assert.AreEqual(15000, aux.ElectricSupply.MaxAlternatorPower.Value());
 			Assert.AreEqual(50.SI(Unit.SI.Watt.Hour).Cast<WattSecond>(), aux.ElectricSupply.ElectricStorageCapacity);
diff --git a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
index 8df188ddefe4526357676fd37a11a63ff5ebe3fc..d6fde08463d7b325301a5ee2029f8df5c740d39c 100644
--- a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
@@ -11,7 +11,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
       <VIN>VEH-1234567890_SmartPS</VIN>
       <Date>2017-02-15T11:00:00Z</Date>
       <LegislativeCategory>M3</LegislativeCategory>
-      <VehicleCategory>Bus</VehicleCategory>
+      <ChassisConfiguration>Bus</ChassisConfiguration>
       <AxleConfiguration>6x2</AxleConfiguration>
       <Articulated>false</Articulated>
       <TechnicalPermissibleMaximumLadenMass>40000</TechnicalPermissibleMaximumLadenMass>
@@ -238,10 +238,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
               <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
             </SteeringPump>
             <ElectricSystem>
-              <AlternatorTechnology>default</AlternatorTechnology>
-              <SmartElectrics>false</SmartElectrics>
-              <MaxAlternatorPower>15000</MaxAlternatorPower>
-              <ElectricStorageCapacity>50</ElectricStorageCapacity>
+              <AlternatorTechnology>conventional</AlternatorTechnology>
+              <SupplyFromHEVPossible>false</SupplyFromHEVPossible>
             </ElectricSystem>
             <PneumaticSystem>
               <SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
diff --git a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
index 8fafa032e99ffae2e46cab5f5c5e203cd505c775..e576b9c606316cfbe8d53a9e1fdf3fdc19b81621 100644
--- a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml	
+++ b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml	
@@ -1,583 +1,577 @@
 <?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" 
-xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 E:\QUAM\Workspace\VECTO_DEV_Buses\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
-  <PrimaryVehicle>
-  <Data xsi:type="PrimaryVehicleDataType" id="PIF-584956b9e3ab43acaf97">
-    <Vehicle xsi:type="VehiclePIFType">
-      <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
-      <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
-      <Model>Generic Model Primary</Model>
-      <VIN>VEH-1234567890_SmartPS</VIN>
-      <Date>2017-02-15T11:00:00Z</Date>
-      <LegislativeCategory>M3</LegislativeCategory>
-      <VehicleCategory>Bus</VehicleCategory>
-      <AxleConfiguration>6x2</AxleConfiguration>
-      <Articulated>false</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>false</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 Primary</Manufacturer>
-            <Model>Bus 6x2 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>1800</RatedSpeed>
-            <RatedPower>325032</RatedPower>
-            <MaxEngineTorque>2134</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="1188.00" dragTorque="-138.00" />
-                <Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00" />
-                <Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00" />
-                <Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00" />
-                <Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00" />
-                <Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00" />
-                <Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00" />
-                <Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00" />
-                <Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00" />
-                <Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00" />
-              </FullLoadAndDragCurve>
-              <Fuels>
-                <FuelType>Diesel CI</FuelType>
-              </Fuels>
-            </Mode>
-          </Data>
-        </Engine>
-        <Transmission>
-          <Data xsi:type="TransmissionDataPIFType">
-            <Manufacturer>Generic Gearbox Manufacturer Primary</Manufacturer>
-            <Model>Generic 40t Long Haul Truck Gearbox Primary</Model>
-            <MainCertificationMethod>Standard values</MainCertificationMethod>
-            <Date>2017-01-11T11:00:00Z</Date>
-            <AppVersion>3.0.1</AppVersion>
-            <TransmissionType>AMT</TransmissionType>
-            <Gears xsi:type="TransmissionGearsPIFType">
-              <Gear number="1">
-                <Ratio>14.930</Ratio>
-                <MaxTorque>1900</MaxTorque>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="2">
-                <Ratio>11.640</Ratio>
-                <MaxTorque>1900</MaxTorque>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="3">
-                <Ratio>9.020</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="4">
-                <Ratio>7.040</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="5">
-                <Ratio>5.640</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="6">
-                <Ratio>4.400</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="7">
-                <Ratio>3.390</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="8">
-                <Ratio>2.650</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="9">
-                <Ratio>2.050</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="10">
-                <Ratio>1.600</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="11">
-                <Ratio>1.280</Ratio>
-                <MaxSpeed>2000</MaxSpeed>
-              </Gear>
-              <Gear number="12">
-                <Ratio>1.000</Ratio>
-              </Gear>
-            </Gears>
-          </Data>
-        </Transmission>
-        <Axlegear>
-          <Data xsi:type="AxlegearDataPIFType">
-            <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
-            <Model>Generic 40t Long Haul Truck AxleGear Primary</Model>
-            <CertificationMethod>Standard values</CertificationMethod>
-            <Date>2017-01-11T11:00:00Z</Date>
-            <AppVersion>3.0.1</AppVersion>
-            <LineType>Single portal axle</LineType>
-            <Ratio>2.590</Ratio>
-          </Data>
-        </Axlegear>
-        <AxleWheels>
-            <Data xsi:type="AxleWheelsDataPIFType">
-<!--        <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>
-              <vif0.1:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
-                <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>
-              </vif0.1:Axle>
-              <vif0.1:Axle axleNumber="2" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
-                <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>
-              </vif0.1:Axle>
-              <vif0.1:Axle axleNumber="3" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
-                <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>
-              </vif0.1:Axle>
-            </Axles>
-          </Data>
-        </AxleWheels>
-        <Auxiliaries>
-          <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="AuxiliaryDataPIFType">
-            <Fan>
-              <Technology>Hydraulic driven - Constant displacement pump</Technology>
-            </Fan>
-            <SteeringPump>
-              <Technology axleNumber="1">Variable displacement elec. controlled</Technology>
-            </SteeringPump>
-            <ElectricSystem>
-              <AlternatorTechnology>default</AlternatorTechnology>
-              <SmartElectrics>false</SmartElectrics>
-              <MaxAlternatorPower>15000</MaxAlternatorPower>
-              <ElectricStorageCapacity>50</ElectricStorageCapacity>
-            </ElectricSystem>
-            <PneumaticSystem>
-              <SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
-              <CompressorDrive>mechanically</CompressorDrive>
-              <Clutch>none</Clutch>
-              <CompressorRatio>1.000</CompressorRatio>
-              <SmartCompressionSystem>true</SmartCompressionSystem>
-              <SmartRegenerationSystem>false</SmartRegenerationSystem>
-              <AirsuspensionControl>electronically</AirsuspensionControl>
-              <SCRReagentDosing>true</SCRReagentDosing>
-            </PneumaticSystem>
-            <HVAC>
-              <AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
-              <EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
-            </HVAC>
-          </Data>
-        </Auxiliaries>
-      </Components>
-    </Vehicle>
-    <InputDataSignature>
-      <di:Reference URI="#VEH-PrimaryBus_SmartPS">
-        <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>KyEUoR+pb/fnqRuLFC53Ft+RhDf+ABAdd1xxsMwH7io=</di:DigestValue>
-      </di:Reference>
-    </InputDataSignature>
-    <ManufacturerRecordSignature>
-      <di:Reference URI="#RESULT-77ea5cb9575a4fe3b401">
-        <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>jIFYjdZEqVpxFinMBSoXvJg8Wl3OjE09xRAnjEgnhhY=</di:DigestValue>
-      </di:Reference>
-    </ManufacturerRecordSignature>
-    <Results>
-      <Status>success</Status>
-      <Result status="success">
-        <VehicleGroup>P33SD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
-          <Payload unit="kg">1352.52</Payload>
-          <PassengerCount>19.89</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">21.22359</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1555.73</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33SD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
-          <Payload unit="kg">6762.60</Payload>
-          <PassengerCount>99.45</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">25.40945</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1862.57</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33SD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
-          <Payload unit="kg">1352.52</Payload>
-          <PassengerCount>19.89</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">16.74101</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1227.15</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33SD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
-          <Payload unit="kg">6762.60</Payload>
-          <PassengerCount>99.45</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">20.24221</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1483.80</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33SD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
-          <Payload unit="kg">1352.52</Payload>
-          <PassengerCount>19.89</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">14.34578</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1051.58</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33SD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
-          <Payload unit="kg">6762.60</Payload>
-          <PassengerCount>99.45</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">17.60016</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1290.13</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33DD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
-          <Payload unit="kg">1578.29</Payload>
-          <PassengerCount>23.21</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">22.72091</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1665.49</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33DD</VehicleGroup>
-        <Mission>Heavy Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
-          <Payload unit="kg">7891.43</Payload>
-          <PassengerCount>116.05</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">27.95930</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">2049.48</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33DD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
-          <Payload unit="kg">1578.29</Payload>
-          <PassengerCount>23.21</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">17.90756</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1312.66</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33DD</VehicleGroup>
-        <Mission>Urban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
-          <Payload unit="kg">7891.43</Payload>
-          <PassengerCount>116.05</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">22.23796</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1630.09</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33DD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
-          <Payload unit="kg">1578.29</Payload>
-          <PassengerCount>23.21</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">15.28035</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1120.08</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P33DD</VehicleGroup>
-        <Mission>Suburban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
-          <Payload unit="kg">7891.43</Payload>
-          <PassengerCount>116.05</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">19.26201</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1411.95</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16239.55</TotalVehicleMass>
-          <Payload unit="kg">1254.68</Payload>
-          <PassengerCount>14.46</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">11.82464</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">866.77</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34SD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
-          <Payload unit="kg">4106.21</Payload>
-          <PassengerCount>57.83</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">13.32341</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">976.63</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34SD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">16490.49</TotalVehicleMass>
-          <Payload unit="kg">1277.49</Payload>
-          <PassengerCount>17.99</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">8.71847</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">639.08</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34SD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">18406.72</TotalVehicleMass>
-          <Payload unit="kg">3193.72</Payload>
-          <PassengerCount>44.98</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">9.20255</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">674.57</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34DD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">19298.40</TotalVehicleMass>
-          <Payload unit="kg">1448.40</Payload>
-          <PassengerCount>20.40</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">13.44807</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">985.77</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34DD</VehicleGroup>
-        <Mission>Interurban</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
-          <Payload unit="kg">5793.60</Payload>
-          <PassengerCount>81.60</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">15.56740</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">1141.12</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34DD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">19703.95</TotalVehicleMass>
-          <Payload unit="kg">1853.95</Payload>
-          <PassengerCount>26.11</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">9.82937</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">720.51</CO2>
-      </Result>
-      <Result status="success">
-        <VehicleGroup>P34DD</VehicleGroup>
-        <Mission>Coach</Mission>
-        <SimulationParameters>
-          <TotalVehicleMass unit="kg">22484.88</TotalVehicleMass>
-          <Payload unit="kg">4634.88</Payload>
-          <PassengerCount>65.28</PassengerCount>
-          <FuelMode>single fuel mode</FuelMode>
-        </SimulationParameters>
-        <Fuel type="Diesel CI">
-          <EnergyConsumption unit="MJ/km">10.56728</EnergyConsumption>
-        </Fuel>
-        <CO2 unit="g/km">774.60</CO2>
-      </Result>
-    </Results>
-    <ApplicationInformation>
-      <SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
-      <Date>2020-05-27T08:16:48.0278823Z</Date>
-    </ApplicationInformation>
-  </Data>
-    <Signature>
-    <di:Reference URI="#PIF-584956b9e3ab43acaf97">
-      <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>GPW3cyV+VQrDzyGeryMrakfOlD+YUWtdaHz/C2lhxJQ=</di:DigestValue>
-    </di:Reference>
-  </Signature>
-  </PrimaryVehicle>
-</VectoOutputMultistage>
\ No newline at end of file
+<VectoOutputMultistage xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistage.0.1.xsd">
+	<PrimaryVehicle>
+		<Data xsi:type="PrimaryVehicleDataType" id="PIF-584956b9e3ab43acaf97">
+			<Vehicle xsi:type="VehiclePIFType">
+				<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
+				<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+				<Model>Generic Model Primary</Model>
+				<VIN>VEH-1234567890_SmartPS</VIN>
+				<Date>2017-02-15T11:00:00Z</Date>
+				<LegislativeCategory>M3</LegislativeCategory>
+				<ChassisConfiguration>Bus</ChassisConfiguration>
+				<AxleConfiguration>6x2</AxleConfiguration>
+				<Articulated>false</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>false</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 Primary</Manufacturer>
+							<Model>Bus 6x2 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>1800</RatedSpeed>
+							<RatedPower>325032</RatedPower>
+							<MaxEngineTorque>2134</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="1188.00" dragTorque="-138.00"/>
+									<Entry engineSpeed="800.00" maxTorque="1661.00" dragTorque="-143.00"/>
+									<Entry engineSpeed="1000.00" maxTorque="2134.00" dragTorque="-152.00"/>
+									<Entry engineSpeed="1200.00" maxTorque="2134.00" dragTorque="-165.00"/>
+									<Entry engineSpeed="1400.00" maxTorque="2134.00" dragTorque="-187.00"/>
+									<Entry engineSpeed="1600.00" maxTorque="1928.00" dragTorque="-217.00"/>
+									<Entry engineSpeed="1800.00" maxTorque="1722.00" dragTorque="-244.00"/>
+									<Entry engineSpeed="2000.00" maxTorque="1253.00" dragTorque="-278.00"/>
+									<Entry engineSpeed="2100.00" maxTorque="1019.00" dragTorque="-296.00"/>
+									<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00"/>
+								</FullLoadAndDragCurve>
+								<Fuels>
+									<FuelType>Diesel CI</FuelType>
+								</Fuels>
+							</Mode>
+						</Data>
+					</Engine>
+					<Transmission>
+						<Data xsi:type="TransmissionDataPIFType">
+							<Manufacturer>Generic Gearbox Manufacturer Primary</Manufacturer>
+							<Model>Generic 40t Long Haul Truck Gearbox Primary</Model>
+							<MainCertificationMethod>Standard values</MainCertificationMethod>
+							<Date>2017-01-11T11:00:00Z</Date>
+							<AppVersion>3.0.1</AppVersion>
+							<TransmissionType>AMT</TransmissionType>
+							<Gears xsi:type="TransmissionGearsPIFType">
+								<Gear number="1">
+									<Ratio>14.930</Ratio>
+									<MaxTorque>1900</MaxTorque>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="2">
+									<Ratio>11.640</Ratio>
+									<MaxTorque>1900</MaxTorque>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="3">
+									<Ratio>9.020</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="4">
+									<Ratio>7.040</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="5">
+									<Ratio>5.640</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="6">
+									<Ratio>4.400</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="7">
+									<Ratio>3.390</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="8">
+									<Ratio>2.650</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="9">
+									<Ratio>2.050</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="10">
+									<Ratio>1.600</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="11">
+									<Ratio>1.280</Ratio>
+									<MaxSpeed>2000</MaxSpeed>
+								</Gear>
+								<Gear number="12">
+									<Ratio>1.000</Ratio>
+								</Gear>
+							</Gears>
+						</Data>
+					</Transmission>
+					<Axlegear>
+						<Data xsi:type="AxlegearDataPIFType">
+							<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+							<Model>Generic 40t Long Haul Truck AxleGear Primary</Model>
+							<CertificationMethod>Standard values</CertificationMethod>
+							<Date>2017-01-11T11:00:00Z</Date>
+							<AppVersion>3.0.1</AppVersion>
+							<LineType>Single portal axle</LineType>
+							<Ratio>2.590</Ratio>
+						</Data>
+					</Axlegear>
+					<AxleWheels>
+						<Data xsi:type="AxleWheelsDataPIFType">
+							<Axles>
+								<vif0.1:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+									<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>
+								</vif0.1:Axle>
+								<vif0.1:Axle axleNumber="2" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+									<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>
+								</vif0.1:Axle>
+								<vif0.1:Axle axleNumber="3" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+									<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>
+								</vif0.1:Axle>
+							</Axles>
+						</Data>
+					</AxleWheels>
+					<Auxiliaries>
+						<Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="AuxiliaryDataPIFType">
+							<Fan>
+								<Technology>Hydraulic driven - Constant displacement pump</Technology>
+							</Fan>
+							<SteeringPump>
+								<Technology axleNumber="1">Variable displacement elec. controlled</Technology>
+							</SteeringPump>
+							<ElectricSystem>
+								<AlternatorTechnology>conventional</AlternatorTechnology>
+								<SupplyFromHEVPossible>false</SupplyFromHEVPossible>
+							</ElectricSystem>
+							<PneumaticSystem>
+								<SizeOfAirSupply>Large Supply 2-stage</SizeOfAirSupply>
+								<CompressorDrive>mechanically</CompressorDrive>
+								<Clutch>none</Clutch>
+								<CompressorRatio>1.000</CompressorRatio>
+								<SmartCompressionSystem>true</SmartCompressionSystem>
+								<SmartRegenerationSystem>false</SmartRegenerationSystem>
+								<AirsuspensionControl>electronically</AirsuspensionControl>
+								<SCRReagentDosing>true</SCRReagentDosing>
+							</PneumaticSystem>
+							<HVAC>
+								<AdjustableCoolantThermostat>true</AdjustableCoolantThermostat>
+								<EngineWasteGasHeatExchanger>true</EngineWasteGasHeatExchanger>
+							</HVAC>
+						</Data>
+					</Auxiliaries>
+				</Components>
+			</Vehicle>
+			<InputDataSignature>
+				<di:Reference URI="#VEH-PrimaryBus_SmartPS">
+					<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>KyEUoR+pb/fnqRuLFC53Ft+RhDf+ABAdd1xxsMwH7io=</di:DigestValue>
+				</di:Reference>
+			</InputDataSignature>
+			<ManufacturerRecordSignature>
+				<di:Reference URI="#RESULT-77ea5cb9575a4fe3b401">
+					<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>jIFYjdZEqVpxFinMBSoXvJg8Wl3OjE09xRAnjEgnhhY=</di:DigestValue>
+				</di:Reference>
+			</ManufacturerRecordSignature>
+			<Results>
+				<Status>success</Status>
+				<Result status="success">
+					<VehicleGroup>P33SD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
+						<Payload unit="kg">1352.52</Payload>
+						<PassengerCount>19.89</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">21.22359</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1555.73</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33SD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
+						<Payload unit="kg">6762.60</Payload>
+						<PassengerCount>99.45</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">25.40945</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1862.57</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33SD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
+						<Payload unit="kg">1352.52</Payload>
+						<PassengerCount>19.89</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">16.74101</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1227.15</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33SD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
+						<Payload unit="kg">6762.60</Payload>
+						<PassengerCount>99.45</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">20.24221</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1483.80</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33SD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">15527.52</TotalVehicleMass>
+						<Payload unit="kg">1352.52</Payload>
+						<PassengerCount>19.89</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">14.34578</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1051.58</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33SD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">20937.60</TotalVehicleMass>
+						<Payload unit="kg">6762.60</Payload>
+						<PassengerCount>99.45</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">17.60016</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1290.13</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33DD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
+						<Payload unit="kg">1578.29</Payload>
+						<PassengerCount>23.21</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">22.72091</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1665.49</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33DD</VehicleGroup>
+					<Mission>Heavy Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
+						<Payload unit="kg">7891.43</Payload>
+						<PassengerCount>116.05</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">27.95930</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">2049.48</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33DD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
+						<Payload unit="kg">1578.29</Payload>
+						<PassengerCount>23.21</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">17.90756</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1312.66</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33DD</VehicleGroup>
+					<Mission>Urban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
+						<Payload unit="kg">7891.43</Payload>
+						<PassengerCount>116.05</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">22.23796</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1630.09</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33DD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16303.29</TotalVehicleMass>
+						<Payload unit="kg">1578.29</Payload>
+						<PassengerCount>23.21</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">15.28035</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1120.08</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P33DD</VehicleGroup>
+					<Mission>Suburban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">22616.43</TotalVehicleMass>
+						<Payload unit="kg">7891.43</Payload>
+						<PassengerCount>116.05</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">19.26201</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1411.95</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16239.55</TotalVehicleMass>
+						<Payload unit="kg">1254.68</Payload>
+						<PassengerCount>14.46</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">11.82464</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">866.77</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34SD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
+						<Payload unit="kg">4106.21</Payload>
+						<PassengerCount>57.83</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">13.32341</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">976.63</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34SD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">16490.49</TotalVehicleMass>
+						<Payload unit="kg">1277.49</Payload>
+						<PassengerCount>17.99</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">8.71847</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">639.08</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34SD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">18406.72</TotalVehicleMass>
+						<Payload unit="kg">3193.72</Payload>
+						<PassengerCount>44.98</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">9.20255</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">674.57</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34DD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">19298.40</TotalVehicleMass>
+						<Payload unit="kg">1448.40</Payload>
+						<PassengerCount>20.40</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">13.44807</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">985.77</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34DD</VehicleGroup>
+					<Mission>Interurban</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
+						<Payload unit="kg">5793.60</Payload>
+						<PassengerCount>81.60</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">15.56740</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">1141.12</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34DD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">19703.95</TotalVehicleMass>
+						<Payload unit="kg">1853.95</Payload>
+						<PassengerCount>26.11</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">9.82937</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">720.51</CO2>
+				</Result>
+				<Result status="success">
+					<VehicleGroup>P34DD</VehicleGroup>
+					<Mission>Coach</Mission>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">22484.88</TotalVehicleMass>
+						<Payload unit="kg">4634.88</Payload>
+						<PassengerCount>65.28</PassengerCount>
+						<FuelMode>single fuel mode</FuelMode>
+					</SimulationParameters>
+					<Fuel type="Diesel CI">
+						<EnergyConsumption unit="MJ/km">10.56728</EnergyConsumption>
+					</Fuel>
+					<CO2 unit="g/km">774.60</CO2>
+				</Result>
+			</Results>
+			<ApplicationInformation>
+				<SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+				<Date>2020-05-27T08:16:48.0278823Z</Date>
+			</ApplicationInformation>
+		</Data>
+		<Signature>
+			<di:Reference URI="#PIF-584956b9e3ab43acaf97">
+				<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>GPW3cyV+VQrDzyGeryMrakfOlD+YUWtdaHz/C2lhxJQ=</di:DigestValue>
+			</di:Reference>
+		</Signature>
+	</PrimaryVehicle>
+</VectoOutputMultistage>