diff --git a/VectoMockup/VectoMockup/Ninject/VIFMockupModule.cs b/VectoMockup/VectoMockup/Ninject/VIFMockupModule.cs
index b4fab35d63678f2cdae92acca6da7333866c2955..5f30f334f259acf7ce35a7f60fc0053ac44fb028 100644
--- a/VectoMockup/VectoMockup/Ninject/VIFMockupModule.cs
+++ b/VectoMockup/VectoMockup/Ninject/VIFMockupModule.cs
@@ -10,6 +10,7 @@ using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.Manu
 using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
 using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile;
 using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1.Components;
 using TUGraz.VectoMockup.Reports;
 
 namespace TUGraz.VectoMockup.Ninject
@@ -46,9 +47,104 @@ namespace TUGraz.VectoMockup.Ninject
 					_vifReportFactoryImplementation.GetVIFReport(vehicleType, jobType, archId, exempted, iepc, ihpc));
 			}
 
-			public IXmlTypeWriter GetConventionalLorryVehicleType()
+			public IXmlTypeWriter GetConventionalVehicleType()
 			{
-				return _vifReportFactoryImplementation.GetConventionalLorryVehicleType();
+				return _vifReportFactoryImplementation.GetConventionalVehicleType();
+			}
+
+			public IXmlTypeWriter GetHevIepcSVehicleType()
+			{
+				return _vifReportFactoryImplementation.GetHevIepcSVehicleType();
+			}
+
+			public IXmlTypeWriter GetHevPxVehicleType()
+			{
+				return _vifReportFactoryImplementation.GetHevPxVehicleType();
+			}
+
+			public IXmlTypeWriter GetHevS2VehicleType()
+			{
+				return _vifReportFactoryImplementation.GetHevS2VehicleType();
+			}
+
+			public IXmlTypeWriter GetHevS3VehicleType()
+			{
+				return _vifReportFactoryImplementation.GetHevS3VehicleType();
+			}
+
+			public IXmlTypeWriter GetHevS4VehicleType()
+			{
+				return _vifReportFactoryImplementation.GetHevS4VehicleType();
+			}
+
+			public IXmlTypeWriter GetIepcVehicleType()
+			{
+				return _vifReportFactoryImplementation.GetIepcVehicleType();
+			}
+
+			public IXmlTypeWriter GetPevE2VehicleType()
+			{
+				return _vifReportFactoryImplementation.GetPevE2VehicleType();
+			}
+
+			public IXmlTypeWriter GetPevE3VehicleType()
+			{
+				return _vifReportFactoryImplementation.GetPevE3VehicleType();
+			}
+
+			public IXmlTypeWriter GetPevE4VehicleType()
+			{
+				return _vifReportFactoryImplementation.GetPevE4VehicleType();
+			}
+
+			public IXmlTypeWriter GetConventionalComponentType()
+			{
+				return _vifReportFactoryImplementation.GetConventionalComponentType();
+			}
+
+			public IXmlTypeWriter GetHevIepcSComponentVIFType()
+			{
+				return _vifReportFactoryImplementation.GetHevIepcSComponentVIFType();
+			}
+
+			public IXmlTypeWriter GetHevPxComponentVIFType()
+			{
+				return _vifReportFactoryImplementation.GetHevPxComponentVIFType();
+			}
+
+			public IXmlTypeWriter GetHevS2ComponentVIFType()
+			{
+				return _vifReportFactoryImplementation.GetHevS2ComponentVIFType();
+			}
+
+			public IXmlTypeWriter GetHevS3ComponentVIFType()
+			{
+				return _vifReportFactoryImplementation.GetHevS3ComponentVIFType();
+			}
+
+			public IXmlTypeWriter GetHevS4ComponentVIFType()
+			{
+				return _vifReportFactoryImplementation.GetHevS4ComponentVIFType();
+			}
+
+			public IXmlTypeWriter GetPevE2ComponentVIFType()
+			{
+				return _vifReportFactoryImplementation.GetPevE2ComponentVIFType();
+			}
+
+			public IXmlTypeWriter GetPevE3ComponentVIFType()
+			{
+				return _vifReportFactoryImplementation.GetPevE3ComponentVIFType();
+			}
+
+			public IXmlTypeWriter GetPevE4ComponentVIFType()
+			{
+				return _vifReportFactoryImplementation.GetPevE4ComponentVIFType();
+			}
+
+			public IXmlTypeWriter GetIepcComponentVIFType()
+			{
+				return _vifReportFactoryImplementation.GetIepcComponentVIFType();
 			}
 
 			public IXmlTypeWriter GetTorqueConvertType()
@@ -56,6 +152,11 @@ namespace TUGraz.VectoMockup.Ninject
 				return _vifReportFactoryImplementation.GetTorqueConvertType();
 			}
 
+			public IXmlTypeWriter GetIepcType()
+			{
+				return _vifReportFactoryImplementation.GetIepcType();
+			}
+
 			public IXmlTypeWriter GetTorqueLimitsType()
 			{
 				return _vifReportFactoryImplementation.GetTorqueLimitsType();
@@ -72,10 +173,50 @@ namespace TUGraz.VectoMockup.Ninject
 			}
 
 			public IReportOutputGroup GetPrimaryBusGeneralParameterGroup()
+			{
+				return _vifReportFactoryImplementation.GetPrimaryBusGeneralParameterGroup();
+			}
+
+			public IReportOutputGroup GetPrimaryBusChassisParameterGroup()
 			{
 				throw new NotImplementedException();
 			}
 
+			public IReportOutputGroup GetPrimaryBusRetarderParameterGroup()
+			{
+				return _vifReportFactoryImplementation.GetPrimaryBusRetarderParameterGroup();
+			}
+
+			public IReportOutputGroup GetPrimaryBusXevParameterGroup()
+			{
+				return _vifReportFactoryImplementation.GetPrimaryBusXevParameterGroup();
+			}
+
+			public IReportOutputGroup GetHevIepcSVehicleParameterGroup()
+			{
+				return _vifReportFactoryImplementation.GetHevIepcSVehicleParameterGroup();
+			}
+
+			public IReportOutputGroup GetHevSxVehicleParameterGroup()
+			{
+				return _vifReportFactoryImplementation.GetHevSxVehicleParameterGroup();
+			}
+
+			public IReportOutputGroup GetIepcVehicleParameterGroup()
+			{
+				return _vifReportFactoryImplementation.GetIepcVehicleParameterGroup();
+			}
+
+			public IReportOutputGroup GetPevExVehicleParmeterGroup()
+			{
+				return _vifReportFactoryImplementation.GetPevExVehicleParmeterGroup();
+			}
+
+			public IReportOutputGroup GetHevPxVehicleParameterGroup()
+			{
+				return _vifReportFactoryImplementation.GetHevPxVehicleParameterGroup();
+			}
+
 			public IXmlTypeWriter GetAdasType()
 			{
 				return _vifReportFactoryImplementation.GetAdasType();
@@ -91,6 +232,26 @@ namespace TUGraz.VectoMockup.Ninject
 				return _vifReportFactoryImplementation.GetAuxiliaryType();
 			}
 
+			public IXmlTypeWriter GetAuxiliaryHevSType()
+			{
+				return _vifReportFactoryImplementation.GetAuxiliaryHevSType();
+			}
+
+			public IXmlTypeWriter GetAuxiliaryHevPType()
+			{
+				return _vifReportFactoryImplementation.GetAuxiliaryHevPType();
+			}
+
+			public IXmlTypeWriter GetAuxiliaryIEPCType()
+			{
+				return _vifReportFactoryImplementation.GetAuxiliaryIEPCType();
+			}
+
+			public IXmlTypeWriter GetAuxiliaryPEVType()
+			{
+				return _vifReportFactoryImplementation.GetAuxiliaryPEVType();
+			}
+
 			public IXmlTypeWriter GetAxlegearType()
 			{
 				return _vifReportFactoryImplementation.GetAxlegearType();
@@ -101,6 +262,36 @@ namespace TUGraz.VectoMockup.Ninject
 				return _vifReportFactoryImplementation.GetAxleWheelsType();
 			}
 
+			public IXmlTypeWriter GetBoostingLimitationsType()
+			{
+				return _vifReportFactoryImplementation.GetBoostingLimitationsType();
+			}
+
+			public IXmlTypeWriter GetElectricEnergyStorageType()
+			{
+				return _vifReportFactoryImplementation.GetElectricEnergyStorageType();
+			}
+
+			public IXmlTypeWriter GetElectricMachineGENType()
+			{
+				return _vifReportFactoryImplementation.GetElectricMachineGENType();
+			}
+
+			public IXmlElectricMachineSystemType GetElectricMachineSystemType()
+			{
+				return _vifReportFactoryImplementation.GetElectricMachineSystemType();
+			}
+
+			public IXmlTypeWriter GetElectricMachineType()
+			{
+				return _vifReportFactoryImplementation.GetElectricMachineType();
+			}
+
+			public IXmlTypeWriter GetElectricMotorTorqueLimitsType()
+			{
+				return _vifReportFactoryImplementation.GetElectricMotorTorqueLimitsType();
+			}
+
 			public IXmlTypeWriter GetEngineType()
 			{
 				return _vifReportFactoryImplementation.GetEngineType();