diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/GearData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/GearData.cs
index e864ad1198eb6fb5b501235fc00100fbfb382d85..05619e7e9ca0db726729f04d2f8cf45968a4f0b6 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/GearData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/GearData.cs
@@ -48,7 +48,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox
 		[Required, Range(double.Epsilon, 25)]
 		public double Ratio { get; internal set; }
 
-		public bool TorqueConverterActive { get; internal set; } // TODO mk-2016-05-09: Refactor TorqueConverterActive Flag when implementing Torque Converter
+		// TODO mk-2016-05-09: Refactor TorqueConverterActive Flag when implementing Torque Converter
+		public bool TorqueConverterActive { get; internal set; }
 
 		// public double AverageEfficiency { get; internal set; }
 	}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
index 140e823bf57be97c65b671a448bb71d42976eaf6..8ceece580b492ddb06ae2e1c96365c9c8c0e6437 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
@@ -44,16 +44,14 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
 	[CustomValidation(typeof(VehicleData), "ValidateVehicleData")]
 	public class VehicleData : SimulationComponentData
 	{
-		//public string BasePath { get; internal set; }
-		private List<Axle> _axleData;
-
 		public VehicleCategory VehicleCategory { get; internal set; }
 		public VehicleClass VehicleClass { get; internal set; }
-		//public CrossWindCorrectionMode CrossWindCorrectionMode { get; internal set; }
 
 		[Required, ValidateObject]
 		public ICrossWindCorrection CrossWindCorrectionCurve { get; internal set; }
 
+		private List<Axle> _axleData;
+
 		/// <summary>
 		///     Set the properties for all axles of the vehicle
 		/// </summary>
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
index bfeeaef886f2f778e688a2c8743fb37771641cd7..ae0d3c9e6a984bc5f475d7eb8193c2172bad23d2 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
@@ -70,7 +70,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 		protected readonly Watt StationaryIdleFullLoadPower;
 
-		internal readonly CombustionEngineData ModelData;
+		[ValidateObject] internal readonly CombustionEngineData ModelData;
 
 		protected IEngineAuxPort EngineAux;
 
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
index 6a32160a24a0754063f1268cc4ed39ae7c42bea7..fb346107b979b1e6cd007db8d8471ed7598bd288 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
@@ -56,7 +56,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 		/// <summary>
 		/// The data and settings for the gearbox.
 		/// </summary>
-		internal readonly GearboxData ModelData;
+		[ValidateObject] internal readonly GearboxData ModelData;
 
 		public bool ClutchClosed(Second absTime)
 		{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
index d20b7faee1ebb223e8c7e5b24002e22e5a1932bb..de6636e814f6ea05dbf3fc7f54ac5665899b6d9a 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
@@ -56,7 +56,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 		/// <summary>
 		/// The data and settings for the gearbox.
 		/// </summary>
-		internal readonly GearboxData ModelData;
+		[ValidateObject] internal readonly GearboxData ModelData;
 
 		/// <summary>
 		/// The shift strategy.
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
index ba1b31c50455379843b8652657b1dc44992f18f8..c534ea2cafde83e0f7db3f71266281e31bf7576e 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
@@ -47,7 +47,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 		IDriverDemandOutPort
 	{
 		//private readonly CrossWindCorrectionCurve _airResistanceCurve;
-		internal readonly VehicleData ModelData;
+		[ValidateObject] internal readonly VehicleData ModelData;
 
 		protected IFvOutPort NextComponent;