diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
index 98e66474e8431930de1e87a2825738a429fe92af..dfdb6ccfc209e6c31877c4751a518ca4e51f8a9b 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
@@ -31,9 +31,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Threading;
+using Newtonsoft.Json;
 using TUGraz.VectoCommon.Exceptions;
 using TUGraz.VectoCommon.InputData;
 using TUGraz.VectoCommon.Models;
@@ -44,6 +46,7 @@ using TUGraz.VectoCore.Models.Declaration;
 using TUGraz.VectoCore.Models.Simulation.Data;
 using TUGraz.VectoCore.Models.SimulationComponent.Data;
 using TUGraz.VectoCore.OutputData;
+using TUGraz.VectoCore.OutputData.FileIO;
 using TUGraz.VectoCore.OutputData.ModFilter;
 using TUGraz.VectoCore.OutputData.XML;
 
@@ -202,6 +205,14 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 					WriteModalResults = _mode != ExecutionMode.Declaration || WriteModalResults
 				};
 
+
+			// TODO: MQ 20200410 - Remove for official release!
+			File.WriteAllText(
+				Path.Combine(
+					(ModWriter as FileOutputWriter)?.BasePath ?? "", $"{data.JobName}_{data.Cycle.Name}{data.ModFileSuffix}.json"),
+					JsonConvert.SerializeObject(data, Formatting.Indented));
+
+
 			var builder = new PowertrainBuilder(
 				modContainer, modData => {
 					if (SumData != null) {
diff --git a/VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs
index eb6c548380da6d11e34edb2d1ae3f82b26e8b471..b9bb4f344c80aa4cd42eb76c3927206c2dbd4f85 100644
--- a/VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs
+++ b/VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs
@@ -45,7 +45,7 @@ namespace TUGraz.VectoCore.OutputData.FileIO
 	{
 		private readonly string _jobFile;
 
-		private string BasePath
+		public string BasePath
 		{
 			get { return Path.GetDirectoryName(_jobFile); }
 		}