diff --git a/VectoMockup/VectoMockup/MockupModalDataContainer.cs b/VectoMockup/VectoMockup/MockupModalDataContainer.cs
index c5ddedd060b2972d1097bbf27746368bb0c35f82..01bcdb7aff02138146654d41c133617a5c66462a 100644
--- a/VectoMockup/VectoMockup/MockupModalDataContainer.cs
+++ b/VectoMockup/VectoMockup/MockupModalDataContainer.cs
@@ -6,6 +6,7 @@ using TUGraz.VectoCommon.InputData;
 using TUGraz.VectoCommon.Utils;
 using TUGraz.VectoCore.Models.Simulation.Data;
 using TUGraz.VectoCore.Models.Simulation.Impl;
+using TUGraz.VectoCore.Models.SimulationComponent;
 using TUGraz.VectoCore.OutputData;
 
 namespace TUGraz.VectoMockup
@@ -185,10 +186,10 @@ namespace TUGraz.VectoMockup
 			_modalDataContainerImplementation.CalculateAggregateValues();
 		}
 
-		public void AddElectricMotor(PowertrainPosition pos)
-		{
-			_modalDataContainerImplementation.AddElectricMotor(pos);
-		}
+		//public void AddElectricMotor(PowertrainPosition pos)
+		//{
+		//	_modalDataContainerImplementation.AddElectricMotor(pos);
+		//}
 
 		public KilogramPerWattSecond VehicleLineSlope(IFuelProperties fuel)
 		{
@@ -278,6 +279,15 @@ namespace TUGraz.VectoMockup
 		}
 
 		public ICorrectedModalData CorrectedModalData => _modalDataContainerImplementation.CorrectedModalData;
+		public void RegisterComponent(VectoSimulationComponent component)
+		{
+			throw new NotImplementedException();
+		}
+
+		public bool ContainsColumn(string modalResultField)
+		{
+			throw new NotImplementedException();
+		}
 
 		#endregion
 	}
diff --git a/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs b/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs
index 90fb473ab9f05bfa336bcb2670d8c783fd8ec312..67d747fd31aa886b18a2d53387e066d7fa59e2cd 100644
--- a/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs
+++ b/VectoMockup/VectoMockup/Simulation/SimulatorFactory/MockupSimulatorFactories.cs
@@ -77,7 +77,7 @@ namespace TUGraz.VectoMockup.Simulation.SimulatorFactory
 			});
 		}
 
-		protected override IVectoRun GetNonExemptedRun(VectoRunData data, int current, VectoRunData d, ref bool warning1Hz)
+		protected override IVectoRun GetNonExemptedRun(VectoRunData data, int current, VectoRunData d, ref bool warning1Hz, ref bool firstRun)
 		{
 			var addReportResult = PrepareReport(data);
 			return new MockupRun(new VehicleContainer(ExecutionMode.Declaration,