Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs
===================================================================
diff -u -r326ee7c1b4612e9f4d5f6751df6d6808fdf9b356 -re8801b68dc8b7fd33537902529a2adbb08489546
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs	(.../HydraulicBoundaryDatabaseUpdateHandler.cs)	(revision 326ee7c1b4612e9f4d5f6751df6d6808fdf9b356)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs	(.../HydraulicBoundaryDatabaseUpdateHandler.cs)	(revision e8801b68dc8b7fd33537902529a2adbb08489546)
@@ -25,7 +25,6 @@
 using System.Windows.Forms;
 using Core.Common.Base;
 using Riskeer.Common.Data.Hydraulics;
-using Riskeer.DuneErosion.Data;
 using Riskeer.DuneErosion.Plugin.Handlers;
 using Riskeer.HydraRing.IO.HydraulicBoundaryDatabase;
 using Riskeer.HydraRing.IO.HydraulicLocationConfigurationDatabase;
@@ -208,21 +207,10 @@
                 assessmentSection.DuneErosion.DuneLocations
             };
 
-            foreach (HydraulicBoundaryLocationCalculationsForTargetProbability element in assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities)
-            {
-                locationsAndCalculationsObservables.Add(element.HydraulicBoundaryLocationCalculations);
-            }
+            locationsAndCalculationsObservables.AddRange(assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.Select(element => element.HydraulicBoundaryLocationCalculations));
+            locationsAndCalculationsObservables.AddRange(assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.Select(element => element.HydraulicBoundaryLocationCalculations));
+            locationsAndCalculationsObservables.AddRange(assessmentSection.DuneErosion.DuneLocationCalculationsForUserDefinedTargetProbabilities.Select(element => element.DuneLocationCalculations));
 
-            foreach (HydraulicBoundaryLocationCalculationsForTargetProbability element in assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities)
-            {
-                locationsAndCalculationsObservables.Add(element.HydraulicBoundaryLocationCalculations);
-            }
-
-            foreach (DuneLocationCalculationsForTargetProbability element in assessmentSection.DuneErosion.DuneLocationCalculationsForUserDefinedTargetProbabilities)
-            {
-                locationsAndCalculationsObservables.Add(element.DuneLocationCalculations);
-            }
-
             return locationsAndCalculationsObservables;
         }
 
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs
===================================================================
diff -u -r326ee7c1b4612e9f4d5f6751df6d6808fdf9b356 -re8801b68dc8b7fd33537902529a2adbb08489546
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs	(.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs)	(revision 326ee7c1b4612e9f4d5f6751df6d6808fdf9b356)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs	(.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs)	(revision e8801b68dc8b7fd33537902529a2adbb08489546)
@@ -31,7 +31,6 @@
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Data.TestUtil;
-using Riskeer.DuneErosion.Data;
 using Riskeer.DuneErosion.Plugin.Handlers;
 using Riskeer.GrassCoverErosionOutwards.Data;
 using Riskeer.HydraRing.IO.HydraulicBoundaryDatabase;
@@ -813,21 +812,10 @@
                 assessmentSection.DuneErosion.DuneLocations
             };
 
-            foreach (HydraulicBoundaryLocationCalculationsForTargetProbability element in assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities)
-            {
-                observables.Add(element.HydraulicBoundaryLocationCalculations);
-            }
+            observables.AddRange(assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.Select(element => element.HydraulicBoundaryLocationCalculations));
+            observables.AddRange(assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.Select(element => element.HydraulicBoundaryLocationCalculations));
+            observables.AddRange(assessmentSection.DuneErosion.DuneLocationCalculationsForUserDefinedTargetProbabilities.Select(element => element.DuneLocationCalculations));
 
-            foreach (HydraulicBoundaryLocationCalculationsForTargetProbability element in assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities)
-            {
-                observables.Add(element.HydraulicBoundaryLocationCalculations);
-            }
-
-            foreach (DuneLocationCalculationsForTargetProbability element in assessmentSection.DuneErosion.DuneLocationCalculationsForUserDefinedTargetProbabilities)
-            {
-                observables.Add(element.DuneLocationCalculations);
-            }
-
             CollectionAssert.AreEqual(observables, changedObjects);
             mocks.VerifyAll();
         }