Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorLocationTests.cs
===================================================================
diff -u -r5979 -r6156
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorLocationTests.cs	(.../SensorLocationTests.cs)	(revision 5979)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorLocationTests.cs	(.../SensorLocationTests.cs)	(revision 6156)
@@ -458,8 +458,8 @@
         };
         SensorLocation sensorLocation = CreateValidSensorLocation();
 
-        location.RiverLevel = testValue;
-        Assert.That(location.RiverLevel, Is.EqualTo(testValue));
+        location.CurrentScenario.RiverLevel = testValue;
+        Assert.That(location.CurrentScenario.RiverLevel, Is.EqualTo(testValue));
 
         sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
 
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs
===================================================================
diff -u -r6107 -r6156
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 6107)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 6156)
@@ -459,19 +459,7 @@
     /// </value>
     public StabilityOptions StabilityOptions { get; set; }
 
-    #region Waterlevels
-
     /// <summary>
-    /// Gets or sets the river level.
-    /// </summary>
-    /// <value>
-    /// The river level.
-    /// </value>
-    public virtual double RiverLevel { get; set; }
-
-    #endregion
-
-    /// <summary>
     /// Gets or sets the model parameters for pl lines.
     /// </summary>
     /// <value>