Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -r6949918830314633db5cc8c16bb2188779fffc93 -r3c832ffce74b527eb1d588aa722840f0a80330b7
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 6949918830314633db5cc8c16bb2188779fffc93)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 3c832ffce74b527eb1d588aa722840f0a80330b7)
@@ -214,7 +214,7 @@
                 (context, filePath) => new ClosingStructuresCalculationConfigurationImporter(
                     filePath,
                     context.WrappedData,
-                    context.AvailableHydraulicBoundaryLocations,
+                    context.AssessmentSection.HydraulicBoundaryDatabase.Locations,
                     context.AvailableForeshoreProfiles,
                     context.AvailableStructures,
                     context.FailureMechanism));
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismItemContextBase.cs
===================================================================
diff -u -r6ef5e439a6d9f40ebd9926251945e0935fbbc314 -r3c832ffce74b527eb1d588aa722840f0a80330b7
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismItemContextBase.cs	(.../FailureMechanismItemContextBase.cs)	(revision 6ef5e439a6d9f40ebd9926251945e0935fbbc314)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismItemContextBase.cs	(.../FailureMechanismItemContextBase.cs)	(revision 3c832ffce74b527eb1d588aa722840f0a80330b7)
@@ -20,13 +20,10 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using Core.Common.Base;
 using Core.Common.Controls.PresentationObjects;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Data.Hydraulics;
 
 namespace Ringtoets.Common.Forms.PresentationObjects
 {
@@ -74,18 +71,5 @@
         /// Gets the assessment section which the context belongs to.
         /// </summary>
         public IAssessmentSection AssessmentSection { get; }
-
-        /// <summary>
-        /// Gets the available hydraulic boundary locations.
-        /// </summary>
-        public IEnumerable<HydraulicBoundaryLocation> AvailableHydraulicBoundaryLocations
-        {
-            get
-            {
-                return AssessmentSection.HydraulicBoundaryDatabase != null
-                           ? AssessmentSection.HydraulicBoundaryDatabase.Locations
-                           : Enumerable.Empty<HydraulicBoundaryLocation>();
-            }
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r3c832ffce74b527eb1d588aa722840f0a80330b7
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs	(.../StructuresInputBaseProperties.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs	(.../StructuresInputBaseProperties.cs)	(revision 3c832ffce74b527eb1d588aa722840f0a80330b7)
@@ -205,7 +205,7 @@
         {
             Point2D referenceLocation = data.WrappedData.Structure?.Location;
             return SelectableHydraulicBoundaryLocationHelper.GetSortedSelectableHydraulicBoundaryLocations(
-                data.AvailableHydraulicBoundaryLocations, referenceLocation);
+                data.AssessmentSection.HydraulicBoundaryDatabase.Locations, referenceLocation);
         }
 
         public abstract IEnumerable<TStructure> GetAvailableStructures();
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismItemContextBaseTest.cs
===================================================================
diff -u -r3022e290bc9001043605f5a972cd15250b0a6a0c -r3c832ffce74b527eb1d588aa722840f0a80330b7
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismItemContextBaseTest.cs	(.../FailureMechanismItemContextBaseTest.cs)	(revision 3022e290bc9001043605f5a972cd15250b0a6a0c)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismItemContextBaseTest.cs	(.../FailureMechanismItemContextBaseTest.cs)	(revision 3c832ffce74b527eb1d588aa722840f0a80330b7)
@@ -20,15 +20,12 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using Core.Common.Base;
 using Core.Common.Controls.PresentationObjects;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Forms.PresentationObjects;
 
 namespace Ringtoets.Common.Forms.Test.PresentationObjects
@@ -93,37 +90,6 @@
             mockRepository.VerifyAll();
         }
 
-        [Test]
-        public void AvailableHydraulicBoundaryLocations_HydraulicBoundaryDatabaseSet_ReturnsAllHydraulicBoundaryLocations()
-        {
-            // Setup
-            var mockRepository = new MockRepository();
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            var observable = mockRepository.Stub<IObservable>();
-            var failureMechanism = mockRepository.Stub<IFailureMechanism>();
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
-            {
-                Locations =
-                {
-                    new HydraulicBoundaryLocation(1, "name", 1.1, 2.2)
-                }
-            };
-
-            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
-
-            mockRepository.ReplayAll();
-
-            var context = new SimpleFailureMechanismItemContext<IObservable, IFailureMechanism>(observable, failureMechanism, assessmentSection);
-
-            // Call
-            IEnumerable<HydraulicBoundaryLocation> availableHydraulicBoundaryLocations = context.AvailableHydraulicBoundaryLocations;
-
-            // Assert
-            Assert.AreEqual(1, availableHydraulicBoundaryLocations.Count());
-            Assert.AreEqual(hydraulicBoundaryDatabase.Locations, availableHydraulicBoundaryLocations);
-            mockRepository.VerifyAll();
-        }
-
         private class SimpleFailureMechanismItemContext<TData, TFailureMechanism> : FailureMechanismItemContextBase<TData, TFailureMechanism>
             where TData : IObservable
             where TFailureMechanism : IFailureMechanism
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsContext.cs
===================================================================
diff -u -r76ff4f24e3f0b4693fe9aaa76250a7203530b1f2 -r3c832ffce74b527eb1d588aa722840f0a80330b7
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsContext.cs	(.../GrassCoverErosionInwardsContext.cs)	(revision 76ff4f24e3f0b4693fe9aaa76250a7203530b1f2)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsContext.cs	(.../GrassCoverErosionInwardsContext.cs)	(revision 3c832ffce74b527eb1d588aa722840f0a80330b7)
@@ -21,12 +21,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Core.Common.Base;
 using Core.Common.Controls.PresentationObjects;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.DikeProfiles;
-using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.GrassCoverErosionInwards.Data;
 
 namespace Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects
@@ -84,19 +82,5 @@
                 return FailureMechanism.DikeProfiles;
             }
         }
-
-        /// <summary>
-        /// Gets the available hydraulic boundary locations in order for the user to select one to 
-        /// set <see cref="GrassCoverErosionInwardsInput.HydraulicBoundaryLocation"/>.
-        /// </summary>
-        public IEnumerable<HydraulicBoundaryLocation> AvailableHydraulicBoundaryLocations
-        {
-            get
-            {
-                return AssessmentSection.HydraulicBoundaryDatabase == null ?
-                           Enumerable.Empty<HydraulicBoundaryLocation>() :
-                           AssessmentSection.HydraulicBoundaryDatabase.Locations;
-            }
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs
===================================================================
diff -u -rfcad48d7beb394e1ac15cfe4289a7381e05aa883 -r3c832ffce74b527eb1d588aa722840f0a80330b7
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs	(.../GrassCoverErosionInwardsInputContextProperties.cs)	(revision fcad48d7beb394e1ac15cfe4289a7381e05aa883)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs	(.../GrassCoverErosionInwardsInputContextProperties.cs)	(revision 3c832ffce74b527eb1d588aa722840f0a80330b7)
@@ -361,7 +361,7 @@
             Point2D calculationLocation = data.WrappedData.DikeProfile?.WorldReferencePoint;
 
             return SelectableHydraulicBoundaryLocationHelper.GetSortedSelectableHydraulicBoundaryLocations(
-                data.AvailableHydraulicBoundaryLocations, calculationLocation);
+                data.AssessmentSection.HydraulicBoundaryDatabase.Locations, calculationLocation);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs
===================================================================
diff -u -r6949918830314633db5cc8c16bb2188779fffc93 -r3c832ffce74b527eb1d588aa722840f0a80330b7
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision 6949918830314633db5cc8c16bb2188779fffc93)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision 3c832ffce74b527eb1d588aa722840f0a80330b7)
@@ -109,7 +109,7 @@
                 (context, filePath) => new GrassCoverErosionInwardsCalculationConfigurationImporter(
                     filePath,
                     context.WrappedData,
-                    context.AvailableHydraulicBoundaryLocations,
+                    context.AssessmentSection.HydraulicBoundaryDatabase.Locations,
                     context.AvailableDikeProfiles,
                     context.FailureMechanism));
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsContextTest.cs
===================================================================
diff -u -r76ff4f24e3f0b4693fe9aaa76250a7203530b1f2 -r3c832ffce74b527eb1d588aa722840f0a80330b7
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsContextTest.cs	(.../GrassCoverErosionInwardsContextTest.cs)	(revision 76ff4f24e3f0b4693fe9aaa76250a7203530b1f2)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsContextTest.cs	(.../GrassCoverErosionInwardsContextTest.cs)	(revision 3c832ffce74b527eb1d588aa722840f0a80330b7)
@@ -20,14 +20,11 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using Core.Common.Base;
 using Core.Common.Controls.PresentationObjects;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
 
@@ -55,7 +52,6 @@
             Assert.AreSame(target, context.WrappedData);
             Assert.AreSame(assessmentSection, context.AssessmentSection);
             Assert.AreSame(failureMechanism, context.FailureMechanism);
-            CollectionAssert.IsEmpty(context.AvailableHydraulicBoundaryLocations);
             mockRepository.VerifyAll();
         }
 
@@ -93,38 +89,6 @@
             Assert.AreEqual("assessmentSection", exception.ParamName);
         }
 
-        [Test]
-        public void AvailableHydraulicBoundaryLocations_HydraulicBoundaryDatabaseSet_ReturnsAllHydraulicBoundaryLocations()
-        {
-            // Setup
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
-            {
-                Locations =
-                {
-                    new HydraulicBoundaryLocation(1, "name", 1.1, 2.2)
-                }
-            };
-
-            var mockRepository = new MockRepository();
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-
-            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
-
-            mockRepository.ReplayAll();
-
-            var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
-            var target = new ObservableObject();
-            var context = new SimpleGrassCoverErosionInwardsContext<ObservableObject>(target, failureMechanism, assessmentSection);
-
-            // Call
-            IEnumerable<HydraulicBoundaryLocation> availableHydraulicBoundaryLocations = context.AvailableHydraulicBoundaryLocations;
-
-            // Assert
-            Assert.AreEqual(1, availableHydraulicBoundaryLocations.Count());
-            Assert.AreEqual(hydraulicBoundaryDatabase.Locations, availableHydraulicBoundaryLocations);
-            mockRepository.VerifyAll();
-        }
-
         private class ObservableObject : Observable {}
 
         private class SimpleGrassCoverErosionInwardsContext<T> : GrassCoverErosionInwardsContext<T> where T : IObservable
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -r6949918830314633db5cc8c16bb2188779fffc93 -r3c832ffce74b527eb1d588aa722840f0a80330b7
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 6949918830314633db5cc8c16bb2188779fffc93)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 3c832ffce74b527eb1d588aa722840f0a80330b7)
@@ -109,7 +109,7 @@
                 (context, filePath) => new HeightStructuresCalculationConfigurationImporter(
                     filePath,
                     context.WrappedData,
-                    context.AvailableHydraulicBoundaryLocations,
+                    context.AssessmentSection.HydraulicBoundaryDatabase.Locations,
                     context.AvailableForeshoreProfiles,
                     context.AvailableStructures,
                     context.FailureMechanism));
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsContext.cs
===================================================================
diff -u -rc4392a12110e2bb3549c5fee1ec319c229b67198 -r3c832ffce74b527eb1d588aa722840f0a80330b7
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsContext.cs	(.../MacroStabilityInwardsContext.cs)	(revision c4392a12110e2bb3549c5fee1ec319c229b67198)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsContext.cs	(.../MacroStabilityInwardsContext.cs)	(revision 3c832ffce74b527eb1d588aa722840f0a80330b7)
@@ -21,11 +21,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Core.Common.Base;
 using Core.Common.Controls.PresentationObjects;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Primitives;
@@ -75,22 +73,6 @@
         public IEnumerable<MacroStabilityInwardsStochasticSoilModel> AvailableStochasticSoilModels { get; }
 
         /// <summary>
-        /// Gets the available hydraulic boundary locations in order for the user to select one to 
-        /// set <see cref="MacroStabilityInwardsInput.HydraulicBoundaryLocation"/>.
-        /// </summary>
-        public IEnumerable<HydraulicBoundaryLocation> AvailableHydraulicBoundaryLocations
-        {
-            get
-            {
-                if (AssessmentSection.HydraulicBoundaryDatabase == null)
-                {
-                    return Enumerable.Empty<HydraulicBoundaryLocation>();
-                }
-                return AssessmentSection.HydraulicBoundaryDatabase.Locations;
-            }
-        }
-
-        /// <summary>
         /// Gets the failure mechanism which the context belongs to.
         /// </summary>
         public MacroStabilityInwardsFailureMechanism FailureMechanism { get; }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsInputContextProperties.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r3c832ffce74b527eb1d588aa722840f0a80330b7
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsInputContextProperties.cs	(.../MacroStabilityInwardsInputContextProperties.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsInputContextProperties.cs	(.../MacroStabilityInwardsInputContextProperties.cs)	(revision 3c832ffce74b527eb1d588aa722840f0a80330b7)
@@ -150,7 +150,7 @@
         {
             Point2D referencePoint = SurfaceLine?.ReferenceLineIntersectionWorldPoint;
             return SelectableHydraulicBoundaryLocationHelper.GetSortedSelectableHydraulicBoundaryLocations(
-                data.AvailableHydraulicBoundaryLocations, referencePoint);
+                data.AssessmentSection.HydraulicBoundaryDatabase.Locations, referencePoint);
         }
 
         #region Hydraulic data
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs
===================================================================
diff -u -r6949918830314633db5cc8c16bb2188779fffc93 -r3c832ffce74b527eb1d588aa722840f0a80330b7
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs	(.../MacroStabilityInwardsPlugin.cs)	(revision 6949918830314633db5cc8c16bb2188779fffc93)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs	(.../MacroStabilityInwardsPlugin.cs)	(revision 3c832ffce74b527eb1d588aa722840f0a80330b7)
@@ -135,7 +135,7 @@
                     new MacroStabilityInwardsCalculationConfigurationImporter(
                         filePath,
                         context.WrappedData,
-                        context.AvailableHydraulicBoundaryLocations,
+                        context.AssessmentSection.HydraulicBoundaryDatabase.Locations,
                         context.FailureMechanism));
         }
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingContext.cs
===================================================================
diff -u -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 -r3c832ffce74b527eb1d588aa722840f0a80330b7
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingContext.cs	(.../PipingContext.cs)	(revision db77ae03f93f27b25268dd9f62f0091a47fe22d8)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingContext.cs	(.../PipingContext.cs)	(revision 3c832ffce74b527eb1d588aa722840f0a80330b7)
@@ -21,11 +21,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Core.Common.Base;
 using Core.Common.Controls.PresentationObjects;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.IO.SoilProfile;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Data.SoilProfile;
@@ -76,22 +74,6 @@
         public IEnumerable<PipingStochasticSoilModel> AvailableStochasticSoilModels { get; }
 
         /// <summary>
-        /// Gets the available hydraulic boundary locations in order for the user to select one to 
-        /// set <see cref="PipingInput.HydraulicBoundaryLocation"/>.
-        /// </summary>
-        public IEnumerable<HydraulicBoundaryLocation> AvailableHydraulicBoundaryLocations
-        {
-            get
-            {
-                if (AssessmentSection.HydraulicBoundaryDatabase == null)
-                {
-                    return Enumerable.Empty<HydraulicBoundaryLocation>();
-                }
-                return AssessmentSection.HydraulicBoundaryDatabase.Locations;
-            }
-        }
-
-        /// <summary>
         /// Gets the piping failure mechanism which the piping context belongs to.
         /// </summary>
         public PipingFailureMechanism FailureMechanism { get; }
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r3c832ffce74b527eb1d588aa722840f0a80330b7
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs	(.../PipingInputContextProperties.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs	(.../PipingInputContextProperties.cs)	(revision 3c832ffce74b527eb1d588aa722840f0a80330b7)
@@ -157,7 +157,7 @@
         {
             Point2D referencePoint = SurfaceLine?.ReferenceLineIntersectionWorldPoint;
             return SelectableHydraulicBoundaryLocationHelper.GetSortedSelectableHydraulicBoundaryLocations(
-                data.AvailableHydraulicBoundaryLocations, referencePoint);
+                data.AssessmentSection.HydraulicBoundaryDatabase.Locations, referencePoint);
         }
 
         #region Hydraulic data
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r6949918830314633db5cc8c16bb2188779fffc93 -r3c832ffce74b527eb1d588aa722840f0a80330b7
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 6949918830314633db5cc8c16bb2188779fffc93)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 3c832ffce74b527eb1d588aa722840f0a80330b7)
@@ -133,7 +133,7 @@
                     new PipingCalculationConfigurationImporter(
                         filePath,
                         context.WrappedData,
-                        context.AvailableHydraulicBoundaryLocations,
+                        context.AssessmentSection.HydraulicBoundaryDatabase.Locations,
                         context.FailureMechanism));
         }
 
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -r6949918830314633db5cc8c16bb2188779fffc93 -r3c832ffce74b527eb1d588aa722840f0a80330b7
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 6949918830314633db5cc8c16bb2188779fffc93)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 3c832ffce74b527eb1d588aa722840f0a80330b7)
@@ -212,7 +212,7 @@
                 (context, filePath) => new StabilityPointStructuresCalculationConfigurationImporter(
                     filePath,
                     context.WrappedData,
-                    context.AvailableHydraulicBoundaryLocations,
+                    context.AssessmentSection.HydraulicBoundaryDatabase.Locations,
                     context.AvailableForeshoreProfiles,
                     context.AvailableStructures,
                     context.FailureMechanism));