Index: Riskeer/Common/test/Riskeer.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs
===================================================================
diff -u -rafed834b8b1a55b3ea3ea17c83927326ad1edfad -r060ddf9b17ac6c1be7368113c5544531983e6c02
--- Riskeer/Common/test/Riskeer.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision afed834b8b1a55b3ea3ea17c83927326ad1edfad)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision 060ddf9b17ac6c1be7368113c5544531983e6c02)
@@ -45,6 +45,7 @@
     {
         private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.Service, "HydraRingCalculation");
         private static readonly string validHrdFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
+        private static readonly string validHrdFileVersion = "Dutch coast South19-11-2015 12:0013";
         private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "Hlcd.sqlite");
 
         private static IEnumerable<TestCaseData> HydraulicBoundaryLocationCalculationsToPerform
@@ -106,7 +107,7 @@
             const string locationName = "locationName";
             const string calculationIdentifier = "1/100";
 
-            var settings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, invalidHrdFilePath, false);
+            var settings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, invalidHrdFilePath, validHrdFileVersion, false);
             var activity = new DesignWaterLevelCalculationActivity(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation(locationName)),
                                                                    settings,
                                                                    0.01,
@@ -143,7 +144,8 @@
                 Converged = true
             };
 
-            var calculationSettings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, usePreprocessorClosure);
+            var calculationSettings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath,
+                                                                               validHrdFileVersion, usePreprocessorClosure);
 
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
@@ -436,7 +438,7 @@
 
         private static HydraulicBoundaryCalculationSettings CreateCalculationSettings()
         {
-            return new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, false);
+            return new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, validHrdFileVersion, false);
         }
 
         private class TestDesignWaterLevelCalculationActivity : DesignWaterLevelCalculationActivity
Index: Riskeer/Common/test/Riskeer.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs
===================================================================
diff -u -rafed834b8b1a55b3ea3ea17c83927326ad1edfad -r060ddf9b17ac6c1be7368113c5544531983e6c02
--- Riskeer/Common/test/Riskeer.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision afed834b8b1a55b3ea3ea17c83927326ad1edfad)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision 060ddf9b17ac6c1be7368113c5544531983e6c02)
@@ -46,6 +46,7 @@
     {
         private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.Service, "HydraRingCalculation");
         private static readonly string validHrdFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
+        private static readonly string validHrdFileVersion = "Dutch coast South19-11-2015 12:0013";
         private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "Hlcd.sqlite");
 
         [Test]
@@ -125,7 +126,8 @@
                 Converged = true
             };
 
-            var calculationSettings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, usePreprocessorClosure);
+            var calculationSettings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath,
+                                                                               validHrdFileVersion, usePreprocessorClosure);
 
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
@@ -655,7 +657,7 @@
 
         private static HydraulicBoundaryCalculationSettings CreateCalculationSettings()
         {
-            return new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, false);
+            return new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, validHrdFileVersion, false);
         }
 
         private static void AssertInput(AssessmentLevelCalculationInput expectedInput, HydraRingCalculationInput hydraRingCalculationInput)
Index: Riskeer/Common/test/Riskeer.Common.Service.Test/HydraRingCalculationSettingsFactoryTest.cs
===================================================================
diff -u -rafed834b8b1a55b3ea3ea17c83927326ad1edfad -r060ddf9b17ac6c1be7368113c5544531983e6c02
--- Riskeer/Common/test/Riskeer.Common.Service.Test/HydraRingCalculationSettingsFactoryTest.cs	(.../HydraRingCalculationSettingsFactoryTest.cs)	(revision afed834b8b1a55b3ea3ea17c83927326ad1edfad)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/HydraRingCalculationSettingsFactoryTest.cs	(.../HydraRingCalculationSettingsFactoryTest.cs)	(revision 060ddf9b17ac6c1be7368113c5544531983e6c02)
@@ -44,7 +44,7 @@
         public void CreateSettings_WithHydraulicBoundaryCalculationSettings_ReturnsExpectedSettings()
         {
             // Setup
-            var hydraulicBoundaryCalculationSettings = new HydraulicBoundaryCalculationSettings("hlcdFilePath", "hrdFilePath", false);
+            var hydraulicBoundaryCalculationSettings = new HydraulicBoundaryCalculationSettings("hlcdFilePath", "hrdFilePath", "version", false);
 
             // Call
             HydraRingCalculationSettings hydraRingCalculationSettings = HydraRingCalculationSettingsFactory.CreateSettings(hydraulicBoundaryCalculationSettings);
Index: Riskeer/Common/test/Riskeer.Common.Service.Test/Structures/StructuresCalculationServiceBaseTest.cs
===================================================================
diff -u -r170e5a87e289a41df0fa4d2aea2bdb1da510d5d9 -r060ddf9b17ac6c1be7368113c5544531983e6c02
--- Riskeer/Common/test/Riskeer.Common.Service.Test/Structures/StructuresCalculationServiceBaseTest.cs	(.../StructuresCalculationServiceBaseTest.cs)	(revision 170e5a87e289a41df0fa4d2aea2bdb1da510d5d9)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/Structures/StructuresCalculationServiceBaseTest.cs	(.../StructuresCalculationServiceBaseTest.cs)	(revision 060ddf9b17ac6c1be7368113c5544531983e6c02)
@@ -48,6 +48,7 @@
     {
         private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.Service, "HydraRingCalculation");
         private static readonly string validHrdFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
+        private static readonly string validHrdFileVersion = "Dutch coast South19-11-2015 12:0013";
         private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "Hlcd.sqlite");
 
         [Test]
@@ -339,7 +340,8 @@
         public void Calculate_ValidInput_InputPropertiesCorrectlySentToCalculator(bool usePreprocessorClosure)
         {
             // Setup
-            var calculationSettings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, usePreprocessorClosure);
+            var calculationSettings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath,
+                                                                               validHrdFileVersion, usePreprocessorClosure);
 
             var mocks = new MockRepository();
             var calculator = new TestStructuresCalculator<ExceedanceProbabilityCalculationInput>
@@ -801,7 +803,7 @@
 
         private static HydraulicBoundaryCalculationSettings CreateCalculationSettings()
         {
-            return new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, false);
+            return new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, validHrdFileVersion, false);
         }
 
         private class TestStructuresCalculationService : StructuresCalculationServiceBase<TestStructureValidationRulesRegistry,
Index: Riskeer/Common/test/Riskeer.Common.Service.Test/TargetProbabilityCalculationServiceTest.cs
===================================================================
diff -u -rafed834b8b1a55b3ea3ea17c83927326ad1edfad -r060ddf9b17ac6c1be7368113c5544531983e6c02
--- Riskeer/Common/test/Riskeer.Common.Service.Test/TargetProbabilityCalculationServiceTest.cs	(.../TargetProbabilityCalculationServiceTest.cs)	(revision afed834b8b1a55b3ea3ea17c83927326ad1edfad)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/TargetProbabilityCalculationServiceTest.cs	(.../TargetProbabilityCalculationServiceTest.cs)	(revision 060ddf9b17ac6c1be7368113c5544531983e6c02)
@@ -34,6 +34,7 @@
     {
         private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.Service, "HydraRingCalculation");
         private static readonly string validHrdFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
+        private static readonly string validHrdFileVersion = "Dutch coast South19-11-2015 12:0013";
         private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "Hlcd.sqlite");
         private static readonly TargetProbabilityCalculationService calculationService = new TestTargetProbabilityCalculationService();
 
@@ -73,7 +74,7 @@
         {
             // Setup
             string invalidHrdFilePath = Path.Combine(testDataPath, "notexisting.sqlite");
-            var calculationSettings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, invalidHrdFilePath, false);
+            var calculationSettings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, invalidHrdFilePath, validHrdFileVersion, false);
             var valid = true;
 
             // Call
@@ -97,7 +98,7 @@
             // Setup
             string invalidHrdFilePath = Path.Combine(testDataPath, "HRD nosettings.sqlite");
             var valid = false;
-            var calculationSettings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, invalidHrdFilePath, false);
+            var calculationSettings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, invalidHrdFilePath, validHrdFileVersion, false);
 
             // Call
             void Call() => valid = calculationService.Validate(calculationSettings);
@@ -123,6 +124,7 @@
                                                                            "withoutPreprocessorClosure");
             var calculationSettings = new HydraulicBoundaryCalculationSettings(Path.Combine(folderWithoutPreprocessorClosureDatabase, "hlcd.sqlite"),
                                                                                Path.Combine(folderWithoutPreprocessorClosureDatabase, "complete.sqlite"),
+                                                                               validHrdFileVersion,
                                                                                true);
 
             // Call
@@ -146,7 +148,7 @@
 
         private static HydraulicBoundaryCalculationSettings CreateValidCalculationSettings()
         {
-            return new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, false);
+            return new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, validHrdFileVersion, false);
         }
 
         private class TestTargetProbabilityCalculationService : TargetProbabilityCalculationService {}
Index: Riskeer/Common/test/Riskeer.Common.Service.Test/WaveHeightCalculationActivityTest.cs
===================================================================
diff -u -rafed834b8b1a55b3ea3ea17c83927326ad1edfad -r060ddf9b17ac6c1be7368113c5544531983e6c02
--- Riskeer/Common/test/Riskeer.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision afed834b8b1a55b3ea3ea17c83927326ad1edfad)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision 060ddf9b17ac6c1be7368113c5544531983e6c02)
@@ -45,6 +45,7 @@
     {
         private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.Service, "HydraRingCalculation");
         private static readonly string validHrdFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
+        private static readonly string validHrdFileVersion = "Dutch coast South19-11-2015 12:0013";
         private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "Hlcd.sqlite");
 
         private static IEnumerable<TestCaseData> HydraulicBoundaryLocationCalculationsToPerform
@@ -106,7 +107,7 @@
             const string locationName = "locationName";
             const string calculationIdentifier = "1/100";
 
-            var settings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, invalidHrdFilePath, false);
+            var settings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, invalidHrdFilePath, validHrdFileVersion, false);
             var activity = new WaveHeightCalculationActivity(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation(locationName)),
                                                              settings,
                                                              0.01,
@@ -143,7 +144,8 @@
                 Converged = true
             };
 
-            var calculationSettings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, usePreprocessorClosure);
+            var calculationSettings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath,
+                                                                               validHrdFileVersion, usePreprocessorClosure);
 
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
@@ -435,7 +437,7 @@
 
         private static HydraulicBoundaryCalculationSettings CreateCalculationSettings()
         {
-            return new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, false);
+            return new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, validHrdFileVersion, false);
         }
 
         private class TestWaveHeightCalculationActivity : WaveHeightCalculationActivity
Index: Riskeer/Common/test/Riskeer.Common.Service.Test/WaveHeightCalculationServiceTest.cs
===================================================================
diff -u -rafed834b8b1a55b3ea3ea17c83927326ad1edfad -r060ddf9b17ac6c1be7368113c5544531983e6c02
--- Riskeer/Common/test/Riskeer.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision afed834b8b1a55b3ea3ea17c83927326ad1edfad)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision 060ddf9b17ac6c1be7368113c5544531983e6c02)
@@ -46,6 +46,7 @@
     {
         private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.Service, "HydraRingCalculation");
         private static readonly string validHrdFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
+        private static readonly string validHrdFileVersion = "Dutch coast South19-11-2015 12:0013";
         private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "Hlcd.sqlite");
 
         [Test]
@@ -126,7 +127,8 @@
                 Converged = true
             };
 
-            var calculationSettings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, usePreprocessorClosure);
+            var calculationSettings = new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath,
+                                                                               validHrdFileVersion, usePreprocessorClosure);
 
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
@@ -657,7 +659,7 @@
 
         private static HydraulicBoundaryCalculationSettings CreateCalculationSettings()
         {
-            return new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, false);
+            return new HydraulicBoundaryCalculationSettings(validHlcdFilePath, validHrdFilePath, validHrdFileVersion, false);
         }
 
         private static void AssertInput(AssessmentLevelCalculationInput expectedInput, HydraRingCalculationInput hydraRingCalculationInput)