Index: Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicBoundaryDatabaseExtensions.cs
===================================================================
diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -r37282637dd0944890e17991cb87644835ec135b8
--- Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicBoundaryDatabaseExtensions.cs	(.../HydraulicBoundaryDatabaseExtensions.cs)	(revision 247659d91db1609d27f3d565203f62bd5b70abcc)
+++ Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicBoundaryDatabaseExtensions.cs	(.../HydraulicBoundaryDatabaseExtensions.cs)	(revision 37282637dd0944890e17991cb87644835ec135b8)
@@ -53,8 +53,8 @@
         /// <param name="hydraulicBoundaryDatabase">The hydraulic boundary database to get the
         /// effective preprocessor directory from.</param>
         /// <returns>A preprocessor directory, which is <see cref="string.Empty"/> when
-        /// <see cref="HydraulicBoundaryDatabase.CanUsePreprocessor"/> or
-        /// <see cref="HydraulicBoundaryDatabase.UsePreprocessor"/> is <c>false</c>.</returns>
+        /// <see cref="HydraulicLocationConfigurationSettings.CanUsePreprocessor"/> or
+        /// <see cref="HydraulicLocationConfigurationSettings.UsePreprocessor"/> is <c>false</c>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when
         /// <paramref name="hydraulicBoundaryDatabase"/> is <c>null</c>.</exception>
         public static string EffectivePreprocessorDirectory(this HydraulicBoundaryDatabase hydraulicBoundaryDatabase)
@@ -64,8 +64,9 @@
                 throw new ArgumentNullException(nameof(hydraulicBoundaryDatabase));
             }
 
-            return hydraulicBoundaryDatabase.CanUsePreprocessor && hydraulicBoundaryDatabase.UsePreprocessor
-                       ? hydraulicBoundaryDatabase.PreprocessorDirectory
+            return hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.CanUsePreprocessor
+                   && hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessor
+                       ? hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.PreprocessorDirectory
                        : string.Empty;
         }
     }
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicBoundaryDatabaseExtensionsTest.cs
===================================================================
diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r37282637dd0944890e17991cb87644835ec135b8
--- Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicBoundaryDatabaseExtensionsTest.cs	(.../HydraulicBoundaryDatabaseExtensionsTest.cs)	(revision c4311504aa83ba59c5a7e80c0e9bc26650986c05)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicBoundaryDatabaseExtensionsTest.cs	(.../HydraulicBoundaryDatabaseExtensionsTest.cs)	(revision 37282637dd0944890e17991cb87644835ec135b8)
@@ -90,9 +90,12 @@
             // Setup
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
-                CanUsePreprocessor = true,
-                UsePreprocessor = usePreprocessor,
-                PreprocessorDirectory = preprocessorDirectory
+                HydraulicLocationConfigurationSettings =
+                {
+                    CanUsePreprocessor = true,
+                    UsePreprocessor = usePreprocessor,
+                    PreprocessorDirectory = preprocessorDirectory
+                }
             };
 
             // Call