Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/DesignWaterLevelCalculation.cs
===================================================================
diff -u -rec03b23520b9fbc7e2f79f2a5589bb832b510fda -ra5c551a343fee7ea3d7e46dd36c82cf180a1b597
--- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/DesignWaterLevelCalculation.cs	(.../DesignWaterLevelCalculation.cs)	(revision ec03b23520b9fbc7e2f79f2a5589bb832b510fda)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/DesignWaterLevelCalculation.cs	(.../DesignWaterLevelCalculation.cs)	(revision a5c551a343fee7ea3d7e46dd36c82cf180a1b597)
@@ -47,43 +47,62 @@
         }
 
         /// <summary>
-        /// Gets a value indicating whether this calculation has already been calculated.
+        /// Gets the observable object to notify upon an internal state change.
         /// </summary>
-        /// <returns></returns>
-        public bool IsCalculated()
+        public IObservable ObservableObject
         {
-            HydraulicBoundaryLocationCalculation calculation = hydraulicBoundaryLocation.DesignWaterLevelCalculation;
-            return calculation.HasOutput
-                   && calculation.InputParameters.ShouldIllustrationPointsBeCalculated == calculation.Output.HasIllustrationPoints;
+            get
+            {
+                return hydraulicBoundaryLocation;
+            }
         }
 
-        /// <summary>
-        /// Gets the observable object to notify upon an internal state change.
-        /// </summary>
-        /// <returns></returns>
-        public IObservable GetObservableObject()
+        public long Id
         {
-            return hydraulicBoundaryLocation;
+            get
+            {
+                return hydraulicBoundaryLocation.Id;
+            }
         }
 
-        public long GetId()
+        public string Name
         {
-            return hydraulicBoundaryLocation.Id;
+            get
+            {
+                return hydraulicBoundaryLocation.Name;
+            }
         }
 
-        public string GetName()
+        public bool CalculateIllustrationPoints
         {
-            return hydraulicBoundaryLocation.Name;
+            get
+            {
+                return hydraulicBoundaryLocation.DesignWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated;
+            }
         }
 
-        public bool GetCalculateIllustrationPoints()
+        public HydraulicBoundaryLocationOutput Output
         {
-            return hydraulicBoundaryLocation.DesignWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated;
+            get
+            {
+                return hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output;
+            }
+            set
+            {
+                hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output = value;
+            }
         }
 
-        public void SetOutput(HydraulicBoundaryLocationOutput output)
+        /// <summary>
+        /// Gets a value indicating whether this calculation has already been calculated.
+        /// </summary>
+        /// <returns><c>true</c> if the calculation is fully calculated, <c>false</c> otherwise.</returns>
+        /// <remarks>A calculation is fully calculated, depending on if the illustration points are set to be calculated.</remarks>
+        public bool IsCalculated()
         {
-            hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output = output;
+            HydraulicBoundaryLocationCalculation calculation = hydraulicBoundaryLocation.DesignWaterLevelCalculation;
+            return calculation.HasOutput
+                   && calculation.InputParameters.ShouldIllustrationPointsBeCalculated == calculation.Output.HasIllustrationPoints;
         }
     }
 }
\ No newline at end of file