diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index ed87326f160e4ffa691f842458c3bd9371b3464f..1eb58e359feaacb619834676b502339b763f67fb 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -261,7 +261,7 @@ namespace TUGraz.VectoCommon.InputData
 		/// P096, P097, P098
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
-		DataTable LossMap { get; }
+		TableData LossMap { get; }
 
 		/// <summary>
 		/// P079
@@ -344,7 +344,7 @@ namespace TUGraz.VectoCommon.InputData
 		/// P028, P029, P030, P031, P032, P119, P120, P121, P122, P123, P124, P125, P126
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
-		DataTable CycleData { get; }
+		TableData CycleData { get; }
 	}
 
 	public interface IDriverDeclarationInputData
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
index 6de5467139a2de36cea47b5f63e616afcc8df586..0ca3625a09604af87ef3d6350374ea21e7739891 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
@@ -124,7 +124,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			}
 		}
 
-		public DataTable LossMap
+		public TableData LossMap
 		{
 			[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design",
 				"CA1065:DoNotRaiseExceptionsInUnexpectedLocations")]
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index 59dff40155d09bd6b5086fcdbc0e87ca2d22c94d..58acc3f13069b4f4576fe03bce1086c7cce0f304 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -312,7 +312,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 				foreach (var cycle in Body.GetEx(JsonKeys.Job_Cycles)) {
 					//.Select(cycle => 
 					var cycleFile = Path.Combine(BasePath, cycle.Value<string>());
-					DataTable cycleData;
+					TableData cycleData;
 					if (File.Exists(cycleFile)) {
 						cycleData = VectoCSVFile.Read(cycleFile);
 					} else {
diff --git a/VectoCore/VectoCore/InputData/Impl/InputData.cs b/VectoCore/VectoCore/InputData/Impl/InputData.cs
index ca8bdf53478601dc0aa263786070b3535541fd29..22c6fbf007a36c743d82237d1f90e0d50e5c56fd 100644
--- a/VectoCore/VectoCore/InputData/Impl/InputData.cs
+++ b/VectoCore/VectoCore/InputData/Impl/InputData.cs
@@ -41,7 +41,7 @@ namespace TUGraz.VectoCore.InputData.Impl
 	{
 		public string Name { get; internal set; }
 
-		public DataTable CycleData { get; internal set; }
+		public TableData CycleData { get; internal set; }
 	}
 
 	public class StartStopInputData : IStartStopEngineeringInputData