Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/HeightStructuresImporter.cs
===================================================================
diff -u -r5922f9469ac666ad571ef634219d7450fba03951 -r07ae03e7286102b1ba1d1e19cc6aa684f7d47144
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/HeightStructuresImporter.cs	(.../HeightStructuresImporter.cs)	(revision 5922f9469ac666ad571ef634219d7450fba03951)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/HeightStructuresImporter.cs	(.../HeightStructuresImporter.cs)	(revision 07ae03e7286102b1ba1d1e19cc6aa684f7d47144)
@@ -96,68 +96,85 @@
                 row => row.ParameterId, row => row, StringComparer.OrdinalIgnoreCase);
 
             string structureName = structureLocation.Name;
+            string structureId = structureLocation.Id;
             var constructionProperties = new HeightStructure.ConstructionProperties
             {
                 Name = structureName,
-                Id = structureLocation.Id,
+                Id = structureId,
                 Location = structureLocation.Point
             };
 
             TrySetConstructionProperty((rows, key) => constructionProperties.StructureNormalOrientation = (RoundedDouble) rows[key].NumericalValue,
                                        rowData,
-                                       StructureFilesKeywords.HeightStructureParameterKeyword1);
+                                       StructureFilesKeywords.HeightStructureParameterKeyword1,
+                                       structureName,
+                                       structureId);
 
             TrySetConstructionProperty((rows, key) =>
                                        {
                                            constructionProperties.LevelCrestStructure.Mean = (RoundedDouble) rows[key].NumericalValue;
                                            constructionProperties.LevelCrestStructure.StandardDeviation = GetStandardDeviation(rows[key], structureName);
                                        },
                                        rowData,
-                                       StructureFilesKeywords.HeightStructureParameterKeyword2);
+                                       StructureFilesKeywords.HeightStructureParameterKeyword2,
+                                       structureName,
+                                       structureId);
 
             TrySetConstructionProperty((rows, key) =>
                                        {
                                            constructionProperties.FlowWidthAtBottomProtection.Mean = (RoundedDouble) rows[key].NumericalValue;
                                            constructionProperties.FlowWidthAtBottomProtection.StandardDeviation = GetStandardDeviation(rows[key], structureName);
                                        },
                                        rowData,
-                                       StructureFilesKeywords.HeightStructureParameterKeyword3);
+                                       StructureFilesKeywords.HeightStructureParameterKeyword3,
+                                       structureName,
+                                       structureId);
 
             TrySetConstructionProperty((rows, key) =>
                                        {
                                            constructionProperties.CriticalOvertoppingDischarge.Mean = (RoundedDouble) rows[key].NumericalValue;
                                            constructionProperties.CriticalOvertoppingDischarge.CoefficientOfVariation = GetCoefficientOfVariation(rows[key], structureName);
                                        },
                                        rowData,
-                                       StructureFilesKeywords.HeightStructureParameterKeyword4);
+                                       StructureFilesKeywords.HeightStructureParameterKeyword4,
+                                       structureName,
+                                       structureId);
 
             TrySetConstructionProperty((rows, key) =>
                                        {
                                            constructionProperties.WidthFlowApertures.Mean = (RoundedDouble) rows[key].NumericalValue;
                                            constructionProperties.WidthFlowApertures.StandardDeviation = GetStandardDeviation(rows[key], structureName);
                                        },
                                        rowData,
-                                       StructureFilesKeywords.HeightStructureParameterKeyword5);
+                                       StructureFilesKeywords.HeightStructureParameterKeyword5,
+                                       structureName,
+                                       structureId);
 
             TrySetConstructionProperty((rows, key) => constructionProperties.FailureProbabilityStructureWithErosion = rows[key].NumericalValue,
                                        rowData,
-                                       StructureFilesKeywords.HeightStructureParameterKeyword6);
+                                       StructureFilesKeywords.HeightStructureParameterKeyword6,
+                                       structureName,
+                                       structureId);
 
             TrySetConstructionProperty((rows, key) =>
                                        {
                                            constructionProperties.StorageStructureArea.Mean = (RoundedDouble) rows[key].NumericalValue;
                                            constructionProperties.StorageStructureArea.CoefficientOfVariation = GetCoefficientOfVariation(rows[key], structureName);
                                        },
                                        rowData,
-                                       StructureFilesKeywords.HeightStructureParameterKeyword7);
+                                       StructureFilesKeywords.HeightStructureParameterKeyword7,
+                                       structureName,
+                                       structureId);
 
             TrySetConstructionProperty((rows, key) =>
                                        {
                                            constructionProperties.AllowedLevelIncreaseStorage.Mean = (RoundedDouble) rows[key].NumericalValue;
                                            constructionProperties.AllowedLevelIncreaseStorage.StandardDeviation = GetStandardDeviation(rows[key], structureName);
                                        },
                                        rowData,
-                                       StructureFilesKeywords.HeightStructureParameterKeyword8);
+                                       StructureFilesKeywords.HeightStructureParameterKeyword8,
+                                       structureName,
+                                       structureId);
 
             return new HeightStructure(constructionProperties);
         }