Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/HydraulicBoundaryDataEntityReadExtensions.cs
===================================================================
diff -u -r55425ae50fd653030dccf7a91425fae8beb08707 -r69b7d831391bae9ff3c6c0ceb4cc8863b90ed126
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/HydraulicBoundaryDataEntityReadExtensions.cs	(.../HydraulicBoundaryDataEntityReadExtensions.cs)	(revision 55425ae50fd653030dccf7a91425fae8beb08707)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/HydraulicBoundaryDataEntityReadExtensions.cs	(.../HydraulicBoundaryDataEntityReadExtensions.cs)	(revision 69b7d831391bae9ff3c6c0ceb4cc8863b90ed126)
@@ -53,17 +53,19 @@
             hydraulicBoundaryData.FilePath = entity.FilePath;
             hydraulicBoundaryData.Version = entity.Version;
 
-            hydraulicBoundaryData.HydraulicLocationConfigurationSettings.FilePath = entity.HydraulicLocationConfigurationSettingsFilePath;
-            hydraulicBoundaryData.HydraulicLocationConfigurationSettings.ScenarioName = entity.HydraulicLocationConfigurationSettingsScenarioName;
-            hydraulicBoundaryData.HydraulicLocationConfigurationSettings.Year = entity.HydraulicLocationConfigurationSettingsYear;
-            hydraulicBoundaryData.HydraulicLocationConfigurationSettings.Scope = entity.HydraulicLocationConfigurationSettingsScope;
-            hydraulicBoundaryData.HydraulicLocationConfigurationSettings.SeaLevel = entity.HydraulicLocationConfigurationSettingsSeaLevel;
-            hydraulicBoundaryData.HydraulicLocationConfigurationSettings.RiverDischarge = entity.HydraulicLocationConfigurationSettingsRiverDischarge;
-            hydraulicBoundaryData.HydraulicLocationConfigurationSettings.LakeLevel = entity.HydraulicLocationConfigurationSettingsLakeLevel;
-            hydraulicBoundaryData.HydraulicLocationConfigurationSettings.WindDirection = entity.HydraulicLocationConfigurationSettingsWindDirection;
-            hydraulicBoundaryData.HydraulicLocationConfigurationSettings.WindSpeed = entity.HydraulicLocationConfigurationSettingsWindSpeed;
-            hydraulicBoundaryData.HydraulicLocationConfigurationSettings.Comment = entity.HydraulicLocationConfigurationSettingsComment;
-            hydraulicBoundaryData.HydraulicLocationConfigurationSettings.UsePreprocessorClosure = Convert.ToBoolean(entity.HydraulicLocationConfigurationSettingsUsePreprocessorClosure);
+            HydraulicLocationConfigurationSettings hydraulicLocationConfigurationSettings = hydraulicBoundaryData.HydraulicLocationConfigurationSettings;
+
+            hydraulicLocationConfigurationSettings.FilePath = entity.HydraulicLocationConfigurationSettingsFilePath;
+            hydraulicLocationConfigurationSettings.ScenarioName = entity.HydraulicLocationConfigurationSettingsScenarioName;
+            hydraulicLocationConfigurationSettings.Year = entity.HydraulicLocationConfigurationSettingsYear;
+            hydraulicLocationConfigurationSettings.Scope = entity.HydraulicLocationConfigurationSettingsScope;
+            hydraulicLocationConfigurationSettings.SeaLevel = entity.HydraulicLocationConfigurationSettingsSeaLevel;
+            hydraulicLocationConfigurationSettings.RiverDischarge = entity.HydraulicLocationConfigurationSettingsRiverDischarge;
+            hydraulicLocationConfigurationSettings.LakeLevel = entity.HydraulicLocationConfigurationSettingsLakeLevel;
+            hydraulicLocationConfigurationSettings.WindDirection = entity.HydraulicLocationConfigurationSettingsWindDirection;
+            hydraulicLocationConfigurationSettings.WindSpeed = entity.HydraulicLocationConfigurationSettingsWindSpeed;
+            hydraulicLocationConfigurationSettings.Comment = entity.HydraulicLocationConfigurationSettingsComment;
+            hydraulicLocationConfigurationSettings.UsePreprocessorClosure = Convert.ToBoolean(entity.HydraulicLocationConfigurationSettingsUsePreprocessorClosure);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -r5ea1b7294f5562d4bb5aff3ec0cdff23b485bc69 -r69b7d831391bae9ff3c6c0ceb4cc8863b90ed126
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision 5ea1b7294f5562d4bb5aff3ec0cdff23b485bc69)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision 69b7d831391bae9ff3c6c0ceb4cc8863b90ed126)
@@ -96,8 +96,9 @@
                     NormativeProbabilityType = NormativeProbabilityType.SignalFloodingProbability
                 }
             };
-            SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryData);
 
+            SetHydraulicLocationConfigurationSettings(assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings);
+
             assessmentSection.ReferenceLine.SetGeometry(new[]
             {
                 new Point2D(2, 3),
@@ -235,19 +236,19 @@
             failureMechanism.GeneralInput.N = random.NextRoundedDouble(1, 20);
         }
 
-        private static void SetHydraulicLocationConfigurationSettings(HydraulicBoundaryData hydraulicBoundaryData)
+        private static void SetHydraulicLocationConfigurationSettings(HydraulicLocationConfigurationSettings hydraulicLocationConfigurationSettings)
         {
-            hydraulicBoundaryData.HydraulicLocationConfigurationSettings.SetValues("some\\Path\\ToHlcd",
-                                                                                   "ScenarioName",
-                                                                                   1337,
-                                                                                   "Scope",
-                                                                                   false,
-                                                                                   "SeaLevel",
-                                                                                   "RiverDischarge",
-                                                                                   "LakeLevel",
-                                                                                   "WindDirection",
-                                                                                   "WindSpeed",
-                                                                                   "Comment");
+            hydraulicLocationConfigurationSettings.FilePath = "some\\Path\\ToHlcd";
+            hydraulicLocationConfigurationSettings.ScenarioName = "ScenarioName";
+            hydraulicLocationConfigurationSettings.Year = 1337;
+            hydraulicLocationConfigurationSettings.Scope = "Scope";
+            hydraulicLocationConfigurationSettings.SeaLevel = "SeaLevel";
+            hydraulicLocationConfigurationSettings.RiverDischarge = "RiverDischarge";
+            hydraulicLocationConfigurationSettings.LakeLevel = "LakeLevel";
+            hydraulicLocationConfigurationSettings.WindDirection = "WindDirection";
+            hydraulicLocationConfigurationSettings.WindSpeed = "WindSpeed";
+            hydraulicLocationConfigurationSettings.Comment = "Comment";
+            hydraulicLocationConfigurationSettings.UsePreprocessorClosure = false;
         }
 
         private static void SetSections(IFailureMechanism failureMechanism)