Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/ClosingStructuresImporter.cs
===================================================================
diff -u -r5922f9469ac666ad571ef634219d7450fba03951 -r07ae03e7286102b1ba1d1e19cc6aa684f7d47144
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/ClosingStructuresImporter.cs	(.../ClosingStructuresImporter.cs)	(revision 5922f9469ac666ad571ef634219d7450fba03951)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/ClosingStructuresImporter.cs	(.../ClosingStructuresImporter.cs)	(revision 07ae03e7286102b1ba1d1e19cc6aa684f7d47144)
@@ -93,10 +93,11 @@
                 row => row.ParameterId, row => row, StringComparer.OrdinalIgnoreCase);
 
             string structureName = structureLocation.Name;
+            string structureId = structureLocation.Id;
             var constructionProperties = new ClosingStructure.ConstructionProperties
             {
                 Name = structureName,
-                Id = structureLocation.Id,
+                Id = structureId,
                 Location = structureLocation.Point
             };
 
@@ -106,95 +107,125 @@
                                            constructionProperties.StorageStructureArea.CoefficientOfVariation = GetCoefficientOfVariation(rows[key], structureName);
                                        },
                                        rowData,
-                                       StructureFilesKeywords.ClosingStructureParameterKeyword1);
+                                       StructureFilesKeywords.ClosingStructureParameterKeyword1,
+                                       structureName,
+                                       structureId);
 
             TrySetConstructionProperty((rows, key) =>
                                        {
                                            constructionProperties.AllowedLevelIncreaseStorage.Mean = (RoundedDouble) rows[key].NumericalValue;
                                            constructionProperties.AllowedLevelIncreaseStorage.StandardDeviation = GetStandardDeviation(rows[key], structureName);
                                        },
                                        rowData,
-                                       StructureFilesKeywords.ClosingStructureParameterKeyword2);
+                                       StructureFilesKeywords.ClosingStructureParameterKeyword2,
+                                       structureName,
+                                       structureId);
 
             TrySetConstructionProperty((rows, key) => constructionProperties.StructureNormalOrientation = (RoundedDouble) rows[key].NumericalValue,
                                        rowData,
-                                       StructureFilesKeywords.ClosingStructureParameterKeyword3);
+                                       StructureFilesKeywords.ClosingStructureParameterKeyword3,
+                                       structureName,
+                                       structureId);
 
             TrySetConstructionProperty((rows, key) =>
                                        {
                                            constructionProperties.WidthFlowApertures.Mean = (RoundedDouble) rows[key].NumericalValue;
                                            constructionProperties.WidthFlowApertures.StandardDeviation = GetStandardDeviation(rows[key], structureName);
                                        },
                                        rowData,
-                                       StructureFilesKeywords.ClosingStructureParameterKeyword4);
+                                       StructureFilesKeywords.ClosingStructureParameterKeyword4,
+                                       structureName,
+                                       structureId);
 
             TrySetConstructionProperty((rows, key) =>
                                        {
                                            constructionProperties.LevelCrestStructureNotClosing.Mean = (RoundedDouble) rows[key].NumericalValue;
                                            constructionProperties.LevelCrestStructureNotClosing.StandardDeviation = GetStandardDeviation(rows[key], structureName);
                                        },
                                        rowData,
-                                       StructureFilesKeywords.ClosingStructureParameterKeyword5);
+                                       StructureFilesKeywords.ClosingStructureParameterKeyword5,
+                                       structureName,
+                                       structureId);
 
             TrySetConstructionProperty((rows, key) =>
                                        {
                                            constructionProperties.InsideWaterLevel.Mean = (RoundedDouble) rows[key].NumericalValue;
                                            constructionProperties.InsideWaterLevel.StandardDeviation = GetStandardDeviation(rows[key], structureName);
                                        },
                                        rowData,
-                                       StructureFilesKeywords.ClosingStructureParameterKeyword6);
+                                       StructureFilesKeywords.ClosingStructureParameterKeyword6,
+                                       structureName,
+                                       structureId);
 
             TrySetConstructionProperty((rows, key) =>
                                        {
                                            constructionProperties.ThresholdHeightOpenWeir.Mean = (RoundedDouble) rows[key].NumericalValue;
                                            constructionProperties.ThresholdHeightOpenWeir.StandardDeviation = GetStandardDeviation(rows[key], structureName);
                                        },
                                        rowData,
-                                       StructureFilesKeywords.ClosingStructureParameterKeyword7);
+                                       StructureFilesKeywords.ClosingStructureParameterKeyword7,
+                                       structureName,
+                                       structureId);
 
             TrySetConstructionProperty((rows, key) =>
                                        {
                                            constructionProperties.AreaFlowApertures.Mean = (RoundedDouble) rows[key].NumericalValue;
                                            constructionProperties.AreaFlowApertures.StandardDeviation = GetStandardDeviation(rows[key], structureName);
                                        },
                                        rowData,
-                                       StructureFilesKeywords.ClosingStructureParameterKeyword8);
+                                       StructureFilesKeywords.ClosingStructureParameterKeyword8,
+                                       structureName,
+                                       structureId);
 
             TrySetConstructionProperty((rows, key) =>
                                        {
                                            constructionProperties.CriticalOvertoppingDischarge.Mean = (RoundedDouble) rows[key].NumericalValue;
                                            constructionProperties.CriticalOvertoppingDischarge.CoefficientOfVariation = GetCoefficientOfVariation(rows[key], structureName);
                                        },
                                        rowData,
-                                       StructureFilesKeywords.ClosingStructureParameterKeyword9);
+                                       StructureFilesKeywords.ClosingStructureParameterKeyword9,
+                                       structureName,
+                                       structureId);
 
             TrySetConstructionProperty((rows, key) =>
                                        {
                                            constructionProperties.FlowWidthAtBottomProtection.Mean = (RoundedDouble) rows[key].NumericalValue;
                                            constructionProperties.FlowWidthAtBottomProtection.StandardDeviation = GetStandardDeviation(rows[key], structureName);
                                        },
                                        rowData,
-                                       StructureFilesKeywords.ClosingStructureParameterKeyword10);
+                                       StructureFilesKeywords.ClosingStructureParameterKeyword10,
+                                       structureName,
+                                       structureId);
 
             TrySetConstructionProperty((rows, key) => constructionProperties.ProbabilityOrFrequencyOpenStructureBeforeFlooding = rows[key].NumericalValue,
                                        rowData,
-                                       StructureFilesKeywords.ClosingStructureParameterKeyword11);
+                                       StructureFilesKeywords.ClosingStructureParameterKeyword11,
+                                       structureName,
+                                       structureId);
 
             TrySetConstructionProperty((rows, key) => constructionProperties.FailureProbabilityOpenStructure = rows[key].NumericalValue,
                                        rowData,
-                                       StructureFilesKeywords.ClosingStructureParameterKeyword12);
+                                       StructureFilesKeywords.ClosingStructureParameterKeyword12,
+                                       structureName,
+                                       structureId);
 
             TrySetConstructionProperty((rows, key) => constructionProperties.IdenticalApertures = (int) rows[key].NumericalValue,
                                        rowData,
-                                       StructureFilesKeywords.ClosingStructureParameterKeyword13);
+                                       StructureFilesKeywords.ClosingStructureParameterKeyword13,
+                                       structureName,
+                                       structureId);
 
             TrySetConstructionProperty((rows, key) => constructionProperties.FailureProbabilityReparation = rows[key].NumericalValue,
                                        rowData,
-                                       StructureFilesKeywords.ClosingStructureParameterKeyword14);
+                                       StructureFilesKeywords.ClosingStructureParameterKeyword14,
+                                       structureName,
+                                       structureId);
 
             TrySetConstructionProperty((rows, key) => constructionProperties.InflowModelType = GetClosingStructureInflowModelType(rows[key]),
                                        rowData,
-                                       StructureFilesKeywords.ClosingStructureParameterKeyword15);
+                                       StructureFilesKeywords.ClosingStructureParameterKeyword15,
+                                       structureName,
+                                       structureId);
 
             return new ClosingStructure(constructionProperties);
         }