diff --git a/VectoMockup/VectoMockup/Reports/MockupReportFactory.cs b/VectoMockup/VectoMockup/Reports/MockupReportFactory.cs
index 6efe0cf234625bff3916552bf8781c8a31b14508..58884b2090c2201f84185dec589e48d8e8a0f39a 100644
--- a/VectoMockup/VectoMockup/Reports/MockupReportFactory.cs
+++ b/VectoMockup/VectoMockup/Reports/MockupReportFactory.cs
@@ -13,7 +13,7 @@ using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.Manu
 
 namespace TUGraz.VectoMockup.Reports
 {
-    class MockupReportFactory : IXMLDeclarationReportFactory
+    class MockupReportFactory : IXMLDeclarationReportFactory, IMockupDeclarationReportFactory
     {
         private readonly IManufacturerReportFactory _mrfFactory;
         private readonly ICustomerInformationFileFactory _cifFactory;
@@ -76,7 +76,7 @@ namespace TUGraz.VectoMockup.Reports
                 return reportCompleted;
             }
             else {
-				throw new NotImplementedException();
+				//throw new NotImplementedException();
                 var report = new XMLDeclarationReportMultistageBusVehicle(outputDataWriter);
                 return report;
             }
@@ -123,5 +123,18 @@ namespace TUGraz.VectoMockup.Reports
         }
 
         #endregion
-    }
+
+		#region Implementation of IMockupDeclarationReportFactory
+
+		public IManufacturerReportFactory MrfFactory => _mrfFactory;
+		public ICustomerInformationFileFactory CifFactory => _cifFactory;
+
+		#endregion
+	}
+
+	internal interface IMockupDeclarationReportFactory
+	{
+		IManufacturerReportFactory MrfFactory { get; }
+        ICustomerInformationFileFactory CifFactory { get; }
+	}
 }