Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/HydraulicBoundaryDatabaseProperties.cs
===================================================================
diff -u -r0d42b32c8be5ac21c68998e449063b8de53e50f5 -r32ca5f573842f4f6f72b2c88222fdf6521e39a8b
--- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/HydraulicBoundaryDatabaseProperties.cs	(.../HydraulicBoundaryDatabaseProperties.cs)	(revision 0d42b32c8be5ac21c68998e449063b8de53e50f5)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/HydraulicBoundaryDatabaseProperties.cs	(.../HydraulicBoundaryDatabaseProperties.cs)	(revision 32ca5f573842f4f6f72b2c88222fdf6521e39a8b)
@@ -257,11 +257,11 @@
         {
             get
             {
-                return data.UsePreprocessor;
+                return data.HydraulicLocationConfigurationSettings.UsePreprocessor;
             }
             set
             {
-                data.UsePreprocessor = value;
+                data.HydraulicLocationConfigurationSettings.UsePreprocessor = value;
                 data.NotifyObservers();
             }
         }
@@ -276,11 +276,11 @@
         {
             get
             {
-                return data.PreprocessorDirectory;
+                return data.HydraulicLocationConfigurationSettings.PreprocessorDirectory;
             }
             set
             {
-                data.PreprocessorDirectory = value;
+                data.HydraulicLocationConfigurationSettings.PreprocessorDirectory = value;
             }
         }
 
@@ -293,14 +293,14 @@
         {
             get
             {
-                return data.PreprocessorDirectory;
+                return data.HydraulicLocationConfigurationSettings.PreprocessorDirectory;
             }
         }
 
         [DynamicVisibleValidationMethod]
         public bool DynamicVisibleValidationMethod(string propertyName)
         {
-            bool canUsePreprocessor = data.CanUsePreprocessor;
+            bool canUsePreprocessor = data.HydraulicLocationConfigurationSettings.CanUsePreprocessor;
 
             if (propertyName.Equals(nameof(UsePreprocessor)) && !canUsePreprocessor)
             {
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs
===================================================================
diff -u -re76f72b814404c52014511e6e2ff299eb7fb1164 -r32ca5f573842f4f6f72b2c88222fdf6521e39a8b
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs	(.../HydraulicBoundaryDatabasePropertiesTest.cs)	(revision e76f72b814404c52014511e6e2ff299eb7fb1164)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs	(.../HydraulicBoundaryDatabasePropertiesTest.cs)	(revision 32ca5f573842f4f6f72b2c88222fdf6521e39a8b)
@@ -114,9 +114,12 @@
 
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
-                CanUsePreprocessor = true,
-                UsePreprocessor = usePreprocessor,
-                PreprocessorDirectory = preprocessorDirectory
+                HydraulicLocationConfigurationSettings =
+                {
+                    CanUsePreprocessor = true,
+                    UsePreprocessor = usePreprocessor,
+                    PreprocessorDirectory = preprocessorDirectory
+                }
             };
 
             // Call
@@ -209,9 +212,12 @@
 
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
-                CanUsePreprocessor = true,
-                UsePreprocessor = usePreprocessor,
-                PreprocessorDirectory = "Preprocessor"
+                HydraulicLocationConfigurationSettings =
+                {
+                    CanUsePreprocessor = true,
+                    UsePreprocessor = usePreprocessor,
+                    PreprocessorDirectory = "Preprocessor"
+                }
             };
 
             // Call
@@ -551,9 +557,12 @@
 
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
-                CanUsePreprocessor = true,
-                UsePreprocessor = !usePreprocessor,
-                PreprocessorDirectory = "Preprocessor"
+                HydraulicLocationConfigurationSettings =
+                {
+                    CanUsePreprocessor = true,
+                    UsePreprocessor = !usePreprocessor,
+                    PreprocessorDirectory = "Preprocessor"
+                }
             };
 
             var properties = new HydraulicBoundaryDatabaseProperties(hydraulicBoundaryDatabase, importHandler);
@@ -564,7 +573,7 @@
             properties.UsePreprocessor = usePreprocessor;
 
             // Assert
-            Assert.AreEqual(usePreprocessor, hydraulicBoundaryDatabase.UsePreprocessor);
+            Assert.AreEqual(usePreprocessor, hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessor);
             mocks.VerifyAll();
         }
 
@@ -579,9 +588,12 @@
             const string newPreprocessorDirectory = @"C:/path";
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
-                CanUsePreprocessor = true,
-                UsePreprocessor = true,
-                PreprocessorDirectory = "Preprocessor"
+                HydraulicLocationConfigurationSettings =
+                {
+                    CanUsePreprocessor = true,
+                    UsePreprocessor = true,
+                    PreprocessorDirectory = "Preprocessor"
+                }
             };
 
             var properties = new HydraulicBoundaryDatabaseProperties(hydraulicBoundaryDatabase, importHandler);
@@ -590,7 +602,7 @@
             properties.PreprocessorDirectory = newPreprocessorDirectory;
 
             // Assert
-            Assert.AreEqual(newPreprocessorDirectory, hydraulicBoundaryDatabase.PreprocessorDirectory);
+            Assert.AreEqual(newPreprocessorDirectory, hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.PreprocessorDirectory);
             mocks.VerifyAll();
         }
 
@@ -631,9 +643,9 @@
 
             if (canUsePreprocessor)
             {
-                hydraulicBoundaryDatabase.CanUsePreprocessor = true;
-                hydraulicBoundaryDatabase.UsePreprocessor = usePreprocessor;
-                hydraulicBoundaryDatabase.PreprocessorDirectory = "Preprocessor";
+                hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true;
+                hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessor = usePreprocessor;
+                hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.PreprocessorDirectory = "Preprocessor";
             }
 
             // Call