Index: Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicBoundaryDatabase.cs
===================================================================
diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -r1ecb4f15d48505a923e5ae6224119373499b0515
--- Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicBoundaryDatabase.cs	(.../HydraulicBoundaryDatabase.cs)	(revision 247659d91db1609d27f3d565203f62bd5b70abcc)
+++ Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicBoundaryDatabase.cs	(.../HydraulicBoundaryDatabase.cs)	(revision 1ecb4f15d48505a923e5ae6224119373499b0515)
@@ -30,17 +30,11 @@
     /// </summary>
     public class HydraulicBoundaryDatabase : Observable
     {
-        private bool canUsePreprocessor;
-        private bool usePreprocessor;
-        private string preprocessorDirectory;
-
         /// <summary>
         /// Creates a new instance of <see cref="HydraulicBoundaryDatabase"/>.
         /// </summary>
-        /// <remarks><see cref="CanUsePreprocessor"/> is set to <c>false</c>.</remarks>
         public HydraulicBoundaryDatabase()
         {
-            CanUsePreprocessor = false;
             Locations = new ObservableList<HydraulicBoundaryLocation>();
             HydraulicLocationConfigurationSettings = new HydraulicLocationConfigurationSettings();
         }
@@ -61,77 +55,6 @@
         public ObservableList<HydraulicBoundaryLocation> Locations { get; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether the Hydra-Ring preprocessor can be used.
-        /// </summary>
-        /// <remarks>When setting this property to <c>false</c>, both <see cref="UsePreprocessor"/>
-        /// and <see cref="PreprocessorDirectory"/> are reset.</remarks>
-        public bool CanUsePreprocessor
-        {
-            get
-            {
-                return canUsePreprocessor;
-            }
-            set
-            {
-                canUsePreprocessor = value;
-
-                if (!canUsePreprocessor)
-                {
-                    usePreprocessor = false;
-                    preprocessorDirectory = null;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the Hydra-Ring preprocessor must be used.
-        /// </summary>
-        /// <exception cref="InvalidOperationException">Thrown when set while <see cref="CanUsePreprocessor"/> is <c>false</c>.</exception>
-        public bool UsePreprocessor
-        {
-            get
-            {
-                return usePreprocessor;
-            }
-            set
-            {
-                if (!CanUsePreprocessor)
-                {
-                    throw new InvalidOperationException($"{nameof(CanUsePreprocessor)} is false.");
-                }
-
-                usePreprocessor = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Hydra-Ring preprocessor directory.
-        /// </summary>
-        /// <exception cref="InvalidOperationException">Thrown when set while <see cref="CanUsePreprocessor"/> is <c>false</c>.</exception>
-        /// <exception cref="ArgumentException">Thrown when setting a value that matches <see cref="string.IsNullOrWhiteSpace"/>.</exception>
-        public string PreprocessorDirectory
-        {
-            get
-            {
-                return preprocessorDirectory;
-            }
-            set
-            {
-                if (!CanUsePreprocessor)
-                {
-                    throw new InvalidOperationException($"{nameof(CanUsePreprocessor)} is false.");
-                }
-
-                if (string.IsNullOrWhiteSpace(value))
-                {
-                    throw new ArgumentException(Resources.HydraulicBoundaryDatabase_PreprocessorDirectory_Path_must_have_a_value);
-                }
-
-                preprocessorDirectory = value;
-            }
-        }
-
-        /// <summary>
         /// Gets the <see cref="Hydraulics.HydraulicLocationConfigurationSettings"/>.
         /// </summary>
         public HydraulicLocationConfigurationSettings HydraulicLocationConfigurationSettings { get; }
Index: Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicLocationConfigurationSettings.cs
===================================================================
diff -u -r56523c0a7ce1c083093e745596681050ac23d18d -r1ecb4f15d48505a923e5ae6224119373499b0515
--- Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicLocationConfigurationSettings.cs	(.../HydraulicLocationConfigurationSettings.cs)	(revision 56523c0a7ce1c083093e745596681050ac23d18d)
+++ Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicLocationConfigurationSettings.cs	(.../HydraulicLocationConfigurationSettings.cs)	(revision 1ecb4f15d48505a923e5ae6224119373499b0515)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using Riskeer.Common.Data.Properties;
 
 namespace Riskeer.Common.Data.Hydraulics
 {
@@ -29,7 +30,20 @@
     /// </summary>
     public class HydraulicLocationConfigurationSettings
     {
+        private bool canUsePreprocessor;
+        private bool usePreprocessor;
+        private string preprocessorDirectory;
+
         /// <summary>
+        /// Creates a new instance of <see cref="HydraulicLocationConfigurationSettings"/>.
+        /// </summary>
+        /// <remarks><see cref="CanUsePreprocessor"/> is set to <c>false</c>.</remarks>
+        public HydraulicLocationConfigurationSettings()
+        {
+            CanUsePreprocessor = false;
+        }
+
+        /// <summary>
         /// Gets the file path.
         /// </summary>
         public string FilePath { get; private set; }
@@ -84,7 +98,79 @@
         /// </summary>
         public bool UsePreprocessorClosure { get; private set; }
 
+
         /// <summary>
+        /// Gets or sets a value indicating whether the Hydra-Ring preprocessor can be used.
+        /// </summary>
+        /// <remarks>When setting this property to <c>false</c>, both <see cref="UsePreprocessor"/>
+        /// and <see cref="PreprocessorDirectory"/> are reset.</remarks>
+        public bool CanUsePreprocessor
+        {
+            get
+            {
+                return canUsePreprocessor;
+            }
+            set
+            {
+                canUsePreprocessor = value;
+
+                if (!canUsePreprocessor)
+                {
+                    usePreprocessor = false;
+                    preprocessorDirectory = null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the Hydra-Ring preprocessor must be used.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">Thrown when set while <see cref="CanUsePreprocessor"/> is <c>false</c>.</exception>
+        public bool UsePreprocessor
+        {
+            get
+            {
+                return usePreprocessor;
+            }
+            set
+            {
+                if (!CanUsePreprocessor)
+                {
+                    throw new InvalidOperationException($"{nameof(CanUsePreprocessor)} is false.");
+                }
+
+                usePreprocessor = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Hydra-Ring preprocessor directory.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">Thrown when set while <see cref="CanUsePreprocessor"/> is <c>false</c>.</exception>
+        /// <exception cref="ArgumentException">Thrown when setting a value that matches <see cref="string.IsNullOrWhiteSpace"/>.</exception>
+        public string PreprocessorDirectory
+        {
+            get
+            {
+                return preprocessorDirectory;
+            }
+            set
+            {
+                if (!CanUsePreprocessor)
+                {
+                    throw new InvalidOperationException($"{nameof(CanUsePreprocessor)} is false.");
+                }
+
+                if (string.IsNullOrWhiteSpace(value))
+                {
+                    throw new ArgumentException(Resources.HydraulicBoundaryDatabase_PreprocessorDirectory_Path_must_have_a_value);
+                }
+
+                preprocessorDirectory = value;
+            }
+        }
+
+        /// <summary>
         /// Sets values to the <see cref="HydraulicLocationConfigurationSettings"/>.
         /// </summary>
         /// <param name="filePath">The file path.</param>