diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index 3fe7fd624b078f5804de09e3a6cec9f175588cb4..0321bf56f5ed1332cc35e6720af88a5dd88cfbcc 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -52,6 +52,8 @@ namespace TUGraz.VectoCommon.InputData
 		string JobName { get; }
 
 		string ShiftStrategy { get; }
+
+		VectoSimulationJobType JobType { get; }
 	}
 
 	public interface IComponentInputData
diff --git a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
index 0541f0ecda211ef9db82cfec04b9d6491f368a85..27392fbf11334dcdec327cbb6e5b9c7cde59ccb4 100644
--- a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
@@ -49,14 +49,8 @@ namespace TUGraz.VectoCommon.InputData
         /// </summary>
         IList<ICycleData> Cycles { get; }
 
-		/// <summary>
-		/// P001
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		VectoSimulationJobType JobType { get; }
-
+		//ToDo Remove use JobType
 		IEngineEngineeringInputData EngineOnly { get; }
-
 	}
 
 	public enum VectoSimulationJobType
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index 2f624cce29bced29707de1519367e33d0154fb27..d7ca43a1f9b9c5b6776a47c630edd913dcc80562 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -1148,6 +1148,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 		public IVehicleDeclarationInputData Vehicle { get { return PrimaryVehicle; } }
 		public string JobName { get; }
 		public string ShiftStrategy { get { return ""; } }
+		public VectoSimulationJobType JobType
+		{
+			get { return VectoSimulationJobType.ConventionalVehicle; }
+		}
 
 		#endregion
 	}
@@ -1202,6 +1206,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 		public IVehicleDeclarationInputData Vehicle { get; }
 		public string JobName { get; }
 		public string ShiftStrategy { get { return ""; } }
+		public VectoSimulationJobType JobType
+		{
+			get { return VectoSimulationJobType.ConventionalVehicle; }
+		}
 
 		#endregion
 	}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs
index 9f9a1a6051c201d484f9603eb300e45c7eafb960..7ccafa42531791cd265490a0df24011c679585fd 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs
@@ -56,6 +56,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 		}
 
 		public virtual string ShiftStrategy { get { return null; } }
+		public VectoSimulationJobType JobType
+		{
+			get { return VectoSimulationJobType.ConventionalVehicle; }
+		}
 
 		#endregion
 
@@ -118,6 +122,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 		public bool SavedInDeclarationMode { get; }
 		public string JobName { get; }
 		public string ShiftStrategy { get{ return null; } }
+		public VectoSimulationJobType JobType
+		{
+			get { return VectoSimulationJobType.ConventionalVehicle; }
+		}
 		public IXMLJobDataReader Reader { protected get; set; }
 		public IXMLPrimaryVehicleBusInputData InputData { get; }
 	}
diff --git a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusSanityCheckTests.cs b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusSanityCheckTests.cs
index 1f2bc9e3c0e48b613cbebd25623da6e0db6c26d7..140712e4c4baa519dcca8700ae677f709dd27b96 100644
--- a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusSanityCheckTests.cs
+++ b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusSanityCheckTests.cs
@@ -155,6 +155,10 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
 
 		public string JobName { get; }
 		public string ShiftStrategy { get; }
+		public VectoSimulationJobType JobType
+		{
+			get { return VectoSimulationJobType.ConventionalVehicle; }
+		}
 
 		public DataSource DataSource { get; }
 	}