Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -recbba2f636e82f8d94ee7deea09730e39190d2bb -rb9e9b0638b105dcf98416389e149808eaa435f0a
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision ecbba2f636e82f8d94ee7deea09730e39190d2bb)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision b9e9b0638b105dcf98416389e149808eaa435f0a)
@@ -1855,17 +1855,32 @@
                                                         HydraulicBoundaryData actualHydraulicBoundaryData)
         {
             Assert.IsNotNull(expectedHydraulicBoundaryData);
-            Assert.AreEqual(expectedHydraulicBoundaryData.Version, actualHydraulicBoundaryData.Version);
-            Assert.AreEqual(expectedHydraulicBoundaryData.FilePath, actualHydraulicBoundaryData.FilePath);
 
+            AssertCollectionAndItems(expectedHydraulicBoundaryData.HydraulicBoundaryDatabases,
+                                     actualHydraulicBoundaryData.HydraulicBoundaryDatabases,
+                                     AssertHydraulicBoundaryDatabase);
+
             AssertHydraulicLocationConfigurationDatabase(expectedHydraulicBoundaryData.HydraulicLocationConfigurationDatabase,
                                                          actualHydraulicBoundaryData.HydraulicLocationConfigurationDatabase);
+        }
 
-            Assert.AreEqual(expectedHydraulicBoundaryData.Locations.Count, actualHydraulicBoundaryData.Locations.Count);
+        private static void AssertHydraulicBoundaryDatabase(HydraulicBoundaryDatabase expectedDatabase, HydraulicBoundaryDatabase actualDatabase)
+        {
+            Assert.AreEqual(expectedDatabase.FilePath, actualDatabase.FilePath);
+            Assert.AreEqual(expectedDatabase.Version, actualDatabase.Version);
+            Assert.AreEqual(expectedDatabase.UsePreprocessorClosure, actualDatabase.UsePreprocessorClosure);
 
-            AssertHydraulicBoundaryLocations(expectedHydraulicBoundaryData.Locations, actualHydraulicBoundaryData.Locations);
+            AssertCollectionAndItems(expectedDatabase.Locations, actualDatabase.Locations, AssertHydraulicBoundaryLocation);
         }
 
+        private static void AssertHydraulicBoundaryLocation(HydraulicBoundaryLocation expectedBoundaryLocation,
+                                                            HydraulicBoundaryLocation actualBoundaryLocation)
+        {
+            Assert.AreEqual(expectedBoundaryLocation.Id, actualBoundaryLocation.Id);
+            Assert.AreEqual(expectedBoundaryLocation.Name, actualBoundaryLocation.Name);
+            Assert.AreEqual(expectedBoundaryLocation.Location, actualBoundaryLocation.Location);
+        }
+
         private static void AssertHydraulicLocationConfigurationDatabase(HydraulicLocationConfigurationDatabase expectedDatabase,
                                                                          HydraulicLocationConfigurationDatabase actualDatabase)
         {
@@ -1881,22 +1896,6 @@
             Assert.AreEqual(expectedDatabase.Comment, actualDatabase.Comment);
         }
 
-        private static void AssertHydraulicBoundaryLocations(IEnumerable<HydraulicBoundaryLocation> expectedHydraulicBoundaryLocations,
-                                                             IEnumerable<HydraulicBoundaryLocation> actualHydraulicBoundaryLocations)
-        {
-            AssertCollectionAndItems(expectedHydraulicBoundaryLocations,
-                                     actualHydraulicBoundaryLocations,
-                                     AssertHydraulicBoundaryLocation);
-        }
-
-        private static void AssertHydraulicBoundaryLocation(HydraulicBoundaryLocation expectedBoundaryLocation,
-                                                            HydraulicBoundaryLocation actualBoundaryLocation)
-        {
-            Assert.AreEqual(expectedBoundaryLocation.Id, actualBoundaryLocation.Id);
-            Assert.AreEqual(expectedBoundaryLocation.Name, actualBoundaryLocation.Name);
-            Assert.AreEqual(expectedBoundaryLocation.Location, actualBoundaryLocation.Location);
-        }
-
         #endregion
 
         #region Hydraulic Boundary Location Calculations
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -r2607024e88bad3d0f3f1a2bc4d8c93e8703dd18d -rb9e9b0638b105dcf98416389e149808eaa435f0a
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 2607024e88bad3d0f3f1a2bc4d8c93e8703dd18d)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision b9e9b0638b105dcf98416389e149808eaa435f0a)
@@ -102,9 +102,8 @@
 
             HydraulicBoundaryData hydraulicBoundaryData = section.HydraulicBoundaryData;
             Assert.IsNotNull(hydraulicBoundaryData);
-            CollectionAssert.IsEmpty(hydraulicBoundaryData.Locations);
-            Assert.IsNull(hydraulicBoundaryData.FilePath);
-            Assert.IsNull(hydraulicBoundaryData.Version);
+            CollectionAssert.IsEmpty(hydraulicBoundaryData.GetLocations());
+            CollectionAssert.IsEmpty(hydraulicBoundaryData.HydraulicBoundaryDatabases);
 
             HydraulicLocationConfigurationDatabase hydraulicLocationConfigurationDatabase = hydraulicBoundaryData.HydraulicLocationConfigurationDatabase;
             Assert.IsNull(hydraulicLocationConfigurationDatabase.FilePath);
@@ -271,9 +270,8 @@
 
             // Assert
             HydraulicBoundaryData hydraulicBoundaryData = section.HydraulicBoundaryData;
-            CollectionAssert.IsEmpty(hydraulicBoundaryData.Locations);
-            Assert.IsNull(hydraulicBoundaryData.FilePath);
-            Assert.IsNull(hydraulicBoundaryData.Version);
+            CollectionAssert.IsEmpty(hydraulicBoundaryData.GetLocations());
+            CollectionAssert.IsEmpty(hydraulicBoundaryData.HydraulicBoundaryDatabases);
 
             CollectionAssert.IsEmpty(section.WaterLevelCalculationsForSignalFloodingProbability);
             CollectionAssert.IsEmpty(section.WaterLevelCalculationsForMaximumAllowableFloodingProbability);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -r36ad9e967171f9f73bd9314578a0e739bff1fa31 -rb9e9b0638b105dcf98416389e149808eaa435f0a
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision 36ad9e967171f9f73bd9314578a0e739bff1fa31)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision b9e9b0638b105dcf98416389e149808eaa435f0a)
@@ -1,4 +1,4 @@
-// Copyright (C) Stichting Deltares 2022. All rights reserved.
+// Copyright (C) Stichting Deltares 2022. All rights reserved.
 //
 // This file is part of Riskeer.
 //
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
@@ -85,8 +84,10 @@
                 Name = "assessmentSection",
                 HydraulicBoundaryData =
                 {
-                    FilePath = "/temp/test",
-                    Version = "1.0"
+                    HydraulicBoundaryDatabases =
+                    {
+                        new HydraulicBoundaryDatabase()
+                    }
                 },
                 Id = "12-2",
                 FailureMechanismContribution =
@@ -98,6 +99,7 @@
             };
 
             ConfigureHydraulicLocationConfigurationDatabase(assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationDatabase);
+            ConfigureHydraulicBoundaryDatabase(assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases.Single());
 
             assessmentSection.ReferenceLine.SetGeometry(new[]
             {
@@ -107,9 +109,6 @@
                 new Point2D(-3, 2)
             });
 
-            ObservableList<HydraulicBoundaryLocation> hydraulicBoundaryLocations = assessmentSection.HydraulicBoundaryData.Locations;
-            hydraulicBoundaryLocations.AddRange(GetHydraulicBoundaryLocations());
-
             var random = new Random(21);
             assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.AddRange(new[]
             {
@@ -124,7 +123,7 @@
                 new HydraulicBoundaryLocationCalculationsForTargetProbability(random.NextDouble(0, 0.1))
             });
 
-            assessmentSection.SetHydraulicBoundaryLocationCalculations(hydraulicBoundaryLocations);
+            assessmentSection.SetHydraulicBoundaryLocationCalculations(assessmentSection.HydraulicBoundaryData.GetLocations());
             ConfigureHydraulicBoundaryLocationCalculations(assessmentSection);
 
             MacroStabilityInwardsFailureMechanism macroStabilityInwardsFailureMechanism = assessmentSection.MacroStabilityInwards;
@@ -248,8 +247,15 @@
             hydraulicLocationConfigurationDatabase.WindDirection = "WindDirection";
             hydraulicLocationConfigurationDatabase.WindSpeed = "WindSpeed";
             hydraulicLocationConfigurationDatabase.Comment = "Comment";
-            hydraulicLocationConfigurationDatabase.UsePreprocessorClosure = false;
         }
+        
+        private static void ConfigureHydraulicBoundaryDatabase(HydraulicBoundaryDatabase hydraulicBoundaryDatabase)
+        {
+            hydraulicBoundaryDatabase.FilePath = "/temp/test";
+            hydraulicBoundaryDatabase.Version = "1.0";
+            hydraulicBoundaryDatabase.UsePreprocessorClosure = false;
+            hydraulicBoundaryDatabase.Locations.AddRange(GetHydraulicBoundaryLocations());
+        }
 
         private static void SetSections(IFailureMechanism failureMechanism)
         {
@@ -316,7 +322,7 @@
             ConfigureCalculationsWithOutput(assessmentSection, hydraulicLocationWithoutIllustrationPoints);
 
             HydraulicBoundaryLocation hydraulicLocationWithIllustrationPoints = hydraulicBoundaryLocations.ElementAt(1);
-            ConfigureCalculationsWithOutput(assessmentSection, hydraulicLocationWithIllustrationPoints);
+            ConfigureCalculationsWithOutput(assessmentSection, hydraulicLocationWithIllustrationPoints);    
         }
 
         private static void ConfigureCalculationsWithOutput(AssessmentSection assessmentSection,