Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/HydraulicLocationConfigurationSettingsCreateExtensions.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r4cb9b5c812d68586b26b39b4c973e635dd2aa1c8
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/HydraulicLocationConfigurationSettingsCreateExtensions.cs	(.../HydraulicLocationConfigurationSettingsCreateExtensions.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/HydraulicLocationConfigurationSettingsCreateExtensions.cs	(.../HydraulicLocationConfigurationSettingsCreateExtensions.cs)	(revision 4cb9b5c812d68586b26b39b4c973e635dd2aa1c8)
@@ -54,6 +54,7 @@
                 FilePath = hydraulicBoundaryDatabase.FilePath.DeepClone(),
                 Version = hydraulicBoundaryDatabase.Version.DeepClone(),
                 HydraulicLocationConfigurationSettingsFilePath = settings.FilePath.DeepClone(),
+                HydraulicLocationConfigurationSettingsUsePreprocessorClosure = Convert.ToByte(settings.UsePreprocessorClosure),
                 HydraulicLocationConfigurationSettingsScenarioName = settings.ScenarioName.DeepClone(),
                 HydraulicLocationConfigurationSettingsYear = settings.Year,
                 HydraulicLocationConfigurationSettingsScope = settings.Scope.DeepClone(),
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/HydraulicBoundaryDatabaseEntityReadExtensions.cs
===================================================================
diff -u -r56523c0a7ce1c083093e745596681050ac23d18d -r4cb9b5c812d68586b26b39b4c973e635dd2aa1c8
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/HydraulicBoundaryDatabaseEntityReadExtensions.cs	(.../HydraulicBoundaryDatabaseEntityReadExtensions.cs)	(revision 56523c0a7ce1c083093e745596681050ac23d18d)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/HydraulicBoundaryDatabaseEntityReadExtensions.cs	(.../HydraulicBoundaryDatabaseEntityReadExtensions.cs)	(revision 4cb9b5c812d68586b26b39b4c973e635dd2aa1c8)
@@ -53,17 +53,18 @@
             hydraulicBoundaryDatabase.FilePath = entity.FilePath;
             hydraulicBoundaryDatabase.Version = entity.Version;
 
-            hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.SetValues(entity.HydraulicLocationConfigurationSettingsFilePath,
-                                                                                       entity.HydraulicLocationConfigurationSettingsScenarioName,
-                                                                                       entity.HydraulicLocationConfigurationSettingsYear,
-                                                                                       entity.HydraulicLocationConfigurationSettingsScope,
-                                                                                       false,
-                                                                                       entity.HydraulicLocationConfigurationSettingsSeaLevel,
-                                                                                       entity.HydraulicLocationConfigurationSettingsRiverDischarge,
-                                                                                       entity.HydraulicLocationConfigurationSettingsLakeLevel,
-                                                                                       entity.HydraulicLocationConfigurationSettingsWindDirection,
-                                                                                       entity.HydraulicLocationConfigurationSettingsWindSpeed,
-                                                                                       entity.HydraulicLocationConfigurationSettingsComment);
+            hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.SetValues(
+                entity.HydraulicLocationConfigurationSettingsFilePath,
+                entity.HydraulicLocationConfigurationSettingsScenarioName,
+                entity.HydraulicLocationConfigurationSettingsYear,
+                entity.HydraulicLocationConfigurationSettingsScope,
+                Convert.ToBoolean(entity.HydraulicLocationConfigurationSettingsUsePreprocessorClosure),
+                entity.HydraulicLocationConfigurationSettingsSeaLevel,
+                entity.HydraulicLocationConfigurationSettingsRiverDischarge,
+                entity.HydraulicLocationConfigurationSettingsLakeLevel,
+                entity.HydraulicLocationConfigurationSettingsWindDirection,
+                entity.HydraulicLocationConfigurationSettingsWindSpeed,
+                entity.HydraulicLocationConfigurationSettingsComment);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/HydraulicLocationConfigurationSettingsCreateExtensionsTest.cs
===================================================================
diff -u -r56523c0a7ce1c083093e745596681050ac23d18d -r4cb9b5c812d68586b26b39b4c973e635dd2aa1c8
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/HydraulicLocationConfigurationSettingsCreateExtensionsTest.cs	(.../HydraulicLocationConfigurationSettingsCreateExtensionsTest.cs)	(revision 56523c0a7ce1c083093e745596681050ac23d18d)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/HydraulicLocationConfigurationSettingsCreateExtensionsTest.cs	(.../HydraulicLocationConfigurationSettingsCreateExtensionsTest.cs)	(revision 4cb9b5c812d68586b26b39b4c973e635dd2aa1c8)
@@ -56,7 +56,7 @@
                                                                                        "ScenarioName",
                                                                                        random.Next(),
                                                                                        "Scope",
-                                                                                       false,
+                                                                                       random.NextBoolean(),
                                                                                        "SeaLevel",
                                                                                        "RiverDischarge",
                                                                                        "LakeLevel",
@@ -73,6 +73,7 @@
 
             HydraulicLocationConfigurationSettings settings = hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings;
             TestHelper.AssertAreEqualButNotSame(settings.FilePath, entity.HydraulicLocationConfigurationSettingsFilePath);
+            Assert.AreEqual(Convert.ToByte(settings.UsePreprocessorClosure), entity.HydraulicLocationConfigurationSettingsUsePreprocessorClosure);
             TestHelper.AssertAreEqualButNotSame(settings.ScenarioName, entity.HydraulicLocationConfigurationSettingsScenarioName);
             TestHelper.AssertAreEqualButNotSame(settings.Year, entity.HydraulicLocationConfigurationSettingsYear);
             TestHelper.AssertAreEqualButNotSame(settings.Scope, entity.HydraulicLocationConfigurationSettingsScope);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HydraulicBoundaryDatabaseEntityReadExtensionsTest.cs
===================================================================
diff -u -r56523c0a7ce1c083093e745596681050ac23d18d -r4cb9b5c812d68586b26b39b4c973e635dd2aa1c8
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HydraulicBoundaryDatabaseEntityReadExtensionsTest.cs	(.../HydraulicBoundaryDatabaseEntityReadExtensionsTest.cs)	(revision 56523c0a7ce1c083093e745596681050ac23d18d)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HydraulicBoundaryDatabaseEntityReadExtensionsTest.cs	(.../HydraulicBoundaryDatabaseEntityReadExtensionsTest.cs)	(revision 4cb9b5c812d68586b26b39b4c973e635dd2aa1c8)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Storage.Core.DbContext;
@@ -65,6 +66,7 @@
                 FilePath = "hydraulicBoundaryDatabaseFilePath",
                 Version = "hydraulicBoundaryDatabaseVersion",
                 HydraulicLocationConfigurationSettingsFilePath = "hlcdFilePath",
+                HydraulicLocationConfigurationSettingsUsePreprocessorClosure = Convert.ToByte(random.NextBoolean()),
                 HydraulicLocationConfigurationSettingsScenarioName = "ScenarioName",
                 HydraulicLocationConfigurationSettingsYear = random.Next(),
                 HydraulicLocationConfigurationSettingsScope = "Scope",
@@ -90,7 +92,7 @@
             Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsScenarioName, settings.ScenarioName);
             Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsYear, settings.Year);
             Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsScope, settings.Scope);
-            Assert.IsFalse(settings.UsePreprocessorClosure);
+            Assert.AreEqual(Convert.ToBoolean(entity.HydraulicLocationConfigurationSettingsUsePreprocessorClosure), settings.UsePreprocessorClosure);
             Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsSeaLevel, settings.SeaLevel);
             Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsRiverDischarge, settings.RiverDischarge);
             Assert.AreEqual(entity.HydraulicLocationConfigurationSettingsLakeLevel, settings.LakeLevel);