Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs
===================================================================
diff -u -r546904adcf2ed2bb08da2ad7ba1124ad8b5cfa9c -ra8e4d7054ebef465eb8647d2c90da9a4d52f63b9
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs	(.../AssessmentSectionEntityReadExtensions.cs)	(revision 546904adcf2ed2bb08da2ad7ba1124ad8b5cfa9c)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs	(.../AssessmentSectionEntityReadExtensions.cs)	(revision a8e4d7054ebef465eb8647d2c90da9a4d52f63b9)
@@ -124,25 +124,22 @@
             {
                 HydraRingPreprocessorEntity preprocessorEntity = entity.HydraRingPreprocessorEntities.FirstOrDefault();
 
-                var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
-                {
-                    FilePath = entity.HydraulicDatabaseLocation,
-                    Version = entity.HydraulicDatabaseVersion
-                };
+                HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase;
 
+                hydraulicBoundaryDatabase.FilePath = entity.HydraulicDatabaseLocation;
+                hydraulicBoundaryDatabase.Version = entity.HydraulicDatabaseVersion;
+
                 if (preprocessorEntity != null)
                 {
                     hydraulicBoundaryDatabase.CanUsePreprocessor = true;
                     hydraulicBoundaryDatabase.UsePreprocessor = Convert.ToBoolean(preprocessorEntity.UsePreprocessor);
                     hydraulicBoundaryDatabase.PreprocessorDirectory = preprocessorEntity.PreprocessorDirectory;
                 }
 
-                assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
-
-                foreach (HydraulicLocationEntity hydraulicLocationEntity in entity.HydraulicLocationEntities.OrderBy(hl => hl.Order))
-                {
-                    assessmentSection.HydraulicBoundaryDatabase.Locations.Add(hydraulicLocationEntity.Read(collector));
-                }
+                hydraulicBoundaryDatabase.Locations.AddRange(entity.HydraulicLocationEntities
+                                                                   .OrderBy(hl => hl.Order)
+                                                                   .Select(hle => hle.Read(collector))
+                                                                   .ToArray());
             }
         }
 
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/AssessmentSectionCreateExtensionsTest.cs
===================================================================
diff -u -r546904adcf2ed2bb08da2ad7ba1124ad8b5cfa9c -ra8e4d7054ebef465eb8647d2c90da9a4d52f63b9
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/AssessmentSectionCreateExtensionsTest.cs	(.../AssessmentSectionCreateExtensionsTest.cs)	(revision 546904adcf2ed2bb08da2ad7ba1124ad8b5cfa9c)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/AssessmentSectionCreateExtensionsTest.cs	(.../AssessmentSectionCreateExtensionsTest.cs)	(revision a8e4d7054ebef465eb8647d2c90da9a4d52f63b9)
@@ -192,7 +192,7 @@
 
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
-                HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+                HydraulicBoundaryDatabase =
                 {
                     FilePath = testFilePath,
                     Version = testVersion,
@@ -225,7 +225,7 @@
 
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
-                HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+                HydraulicBoundaryDatabase =
                 {
                     FilePath = testFilePath,
                     Version = testVersion,
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -r546904adcf2ed2bb08da2ad7ba1124ad8b5cfa9c -ra8e4d7054ebef465eb8647d2c90da9a4d52f63b9
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision 546904adcf2ed2bb08da2ad7ba1124ad8b5cfa9c)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision a8e4d7054ebef465eb8647d2c90da9a4d52f63b9)
@@ -77,7 +77,14 @@
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
                 Name = "assessmentSection",
-                HydraulicBoundaryDatabase = GetHydraulicBoundaryDatabase(),
+                HydraulicBoundaryDatabase =
+                {
+                    FilePath = "/temp/test",
+                    Version = "1.0",
+                    CanUsePreprocessor = true,
+                    UsePreprocessor = true,
+                    PreprocessorDirectory = "/temp/preprocessor"
+                },
                 ReferenceLine = GetReferenceLine(),
                 Id = "12-2",
                 FailureMechanismContribution =
@@ -88,6 +95,8 @@
                 }
             };
 
+            assessmentSection.HydraulicBoundaryDatabase.Locations.AddRange(GetHydraulicBoundaryLocations());
+
             MacroStabilityInwardsFailureMechanism macroStabilityInwardsFailureMechanism = assessmentSection.MacroStabilityInwards;
             ConfigureMacroStabilityInwardsFailureMechanism(macroStabilityInwardsFailureMechanism, assessmentSection);
             AddSections(macroStabilityInwardsFailureMechanism);
@@ -327,9 +336,9 @@
             return referenceLine;
         }
 
-        private static HydraulicBoundaryDatabase GetHydraulicBoundaryDatabase()
+        private static IEnumerable<HydraulicBoundaryLocation> GetHydraulicBoundaryLocations()
         {
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(13001, "test", 152.3, 2938.5)
+            yield return new HydraulicBoundaryLocation(13001, "test", 152.3, 2938.5)
             {
                 DesignWaterLevelCalculation =
                 {
@@ -349,7 +358,7 @@
                                                                              GetConfiguredGeneralResultTopLevelSubMechanismIllustrationPoint());
             var waveHeightOutput = new HydraulicBoundaryLocationOutput(2.4, 0, 0, 0, 0, CalculationConvergence.CalculatedNotConverged,
                                                                        GetConfiguredGeneralResultTopLevelSubMechanismIllustrationPoint());
-            var hydraulicBoundaryLocationWithIllustrationPoints = new HydraulicBoundaryLocation(13002, "test2", 135.2, 5293.8)
+            yield return new HydraulicBoundaryLocation(13002, "test2", 135.2, 5293.8)
             {
                 DesignWaterLevelCalculation =
                 {
@@ -368,22 +377,6 @@
                     Output = waveHeightOutput
                 }
             };
-
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
-            {
-                FilePath = "/temp/test",
-                Version = "1.0",
-                Locations =
-                {
-                    hydraulicBoundaryLocation,
-                    hydraulicBoundaryLocationWithIllustrationPoints
-                },
-                CanUsePreprocessor = true,
-                UsePreprocessor = true,
-                PreprocessorDirectory = "/temp/preprocessor"
-            };
-
-            return hydraulicBoundaryDatabase;
         }
 
         private static GeneralResult<TopLevelSubMechanismIllustrationPoint> GetConfiguredGeneralResultTopLevelSubMechanismIllustrationPoint()