Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionExtendedView.cs
===================================================================
diff -u -r860456f6b63623abee26e389444876d936864351 -re39e10b6a8e6d178ed12ce38d6180e5577b8e163
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionExtendedView.cs	(.../AssessmentSectionExtendedView.cs)	(revision 860456f6b63623abee26e389444876d936864351)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionExtendedView.cs	(.../AssessmentSectionExtendedView.cs)	(revision e39e10b6a8e6d178ed12ce38d6180e5577b8e163)
@@ -34,8 +34,6 @@
     /// </summary>
     public partial class AssessmentSectionExtendedView : AssessmentSectionReferenceLineView
     {
-        private readonly IAssessmentSection assessmentSection;
-
         private readonly MapPointData hydraulicBoundaryLocationsMapData;
 
         private Observer hydraulicBoundaryLocationsObserver;
@@ -58,8 +56,6 @@
         {
             InitializeComponent();
 
-            this.assessmentSection = assessmentSection;
-
             CreateObservers();
 
             hydraulicBoundaryLocationsMapData = RiskeerMapDataFactory.CreateHydraulicBoundaryLocationsMapData();
@@ -92,25 +88,25 @@
         private void CreateObservers()
         {
             waterLevelCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver(
-                assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, UpdateHydraulicBoundaryLocationsMapData);
+                AssessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, UpdateHydraulicBoundaryLocationsMapData);
             waterLevelCalculationsForSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver(
-                assessmentSection.WaterLevelCalculationsForSignalingNorm, UpdateHydraulicBoundaryLocationsMapData);
+                AssessmentSection.WaterLevelCalculationsForSignalingNorm, UpdateHydraulicBoundaryLocationsMapData);
             waterLevelCalculationsForLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver(
-                assessmentSection.WaterLevelCalculationsForLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData);
+                AssessmentSection.WaterLevelCalculationsForLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData);
             waterLevelCalculationsForFactorizedLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver(
-                assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData);
+                AssessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData);
             waveHeightCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver(
-                assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm, UpdateHydraulicBoundaryLocationsMapData);
+                AssessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm, UpdateHydraulicBoundaryLocationsMapData);
             waveHeightCalculationsForSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver(
-                assessmentSection.WaveHeightCalculationsForSignalingNorm, UpdateHydraulicBoundaryLocationsMapData);
+                AssessmentSection.WaveHeightCalculationsForSignalingNorm, UpdateHydraulicBoundaryLocationsMapData);
             waveHeightCalculationsForLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver(
-                assessmentSection.WaveHeightCalculationsForLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData);
+                AssessmentSection.WaveHeightCalculationsForLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData);
             waveHeightCalculationsForFactorizedLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver(
-                assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData);
+                AssessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData);
 
             hydraulicBoundaryLocationsObserver = new Observer(UpdateHydraulicBoundaryLocationsMapData)
             {
-                Observable = assessmentSection.HydraulicBoundaryDatabase.Locations
+                Observable = AssessmentSection.HydraulicBoundaryDatabase.Locations
             };
         }
 
@@ -129,7 +125,7 @@
 
         private void SetHydraulicBoundaryLocationsMapData()
         {
-            hydraulicBoundaryLocationsMapData.Features = RiskeerMapDataFeaturesFactory.CreateHydraulicBoundaryLocationFeatures(assessmentSection);
+            hydraulicBoundaryLocationsMapData.Features = RiskeerMapDataFeaturesFactory.CreateHydraulicBoundaryLocationFeatures(AssessmentSection);
         }
 
         #endregion
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionReferenceLineView.cs
===================================================================
diff -u -r60b0b93589099f5f331ebf12aa2d5e646d325963 -re39e10b6a8e6d178ed12ce38d6180e5577b8e163
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionReferenceLineView.cs	(.../AssessmentSectionReferenceLineView.cs)	(revision 60b0b93589099f5f331ebf12aa2d5e646d325963)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionReferenceLineView.cs	(.../AssessmentSectionReferenceLineView.cs)	(revision e39e10b6a8e6d178ed12ce38d6180e5577b8e163)
@@ -35,7 +35,7 @@
     /// </summary>
     public partial class AssessmentSectionReferenceLineView : UserControl, IMapView
     {
-        private readonly IAssessmentSection assessmentSection;
+        protected IAssessmentSection AssessmentSection { get; set; }
 
         private readonly MapLineData referenceLineMapData;
 
@@ -57,7 +57,7 @@
 
             InitializeComponent();
 
-            this.assessmentSection = assessmentSection;
+            AssessmentSection = assessmentSection;
 
             CreateObservers();
 
@@ -83,7 +83,7 @@
 
         protected override void OnLoad(EventArgs e)
         {
-            riskeerMapControl.SetAllData(MapDataCollection, assessmentSection.BackgroundData);
+            riskeerMapControl.SetAllData(MapDataCollection, AssessmentSection.BackgroundData);
             
             base.OnLoad(e);
         }
@@ -105,12 +105,12 @@
         {
             assessmentSectionObserver = new Observer(UpdateReferenceLineMapData)
             {
-                Observable = assessmentSection
+                Observable = AssessmentSection
             };
 
             referenceLineObserver = new Observer(UpdateReferenceLineMapData)
             {
-                Observable = assessmentSection.ReferenceLine
+                Observable = AssessmentSection.ReferenceLine
             };
         }
 
@@ -129,7 +129,7 @@
 
         private void SetReferenceLineMapData()
         {
-            referenceLineMapData.Features = RiskeerMapDataFeaturesFactory.CreateReferenceLineFeatures(assessmentSection.ReferenceLine, assessmentSection.Id, assessmentSection.Name);
+            referenceLineMapData.Features = RiskeerMapDataFeaturesFactory.CreateReferenceLineFeatures(AssessmentSection.ReferenceLine, AssessmentSection.Id, AssessmentSection.Name);
         }
 
         #endregion