Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs
===================================================================
diff -u -r37a53b1ca9a4cdfc6e6df7f065cd540c627f2622 -r26359a31a29af21b6690cacd9b810b1565af9e4b
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs	(.../HeightStructuresInputContextProperties.cs)	(revision 37a53b1ca9a4cdfc6e6df7f065cd540c627f2622)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs	(.../HeightStructuresInputContextProperties.cs)	(revision 26359a31a29af21b6690cacd9b810b1565af9e4b)
@@ -55,14 +55,15 @@
         #region Model settings
 
         [PropertyOrder(modelFactorOvertoppingSuperCriticalFlowPropertyIndex)]
+        [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(Resources), "Categories_ModelSettings")]
         [ResourcesDisplayName(typeof(Resources), "ModelFactorOvertoppingSuperCriticalFlow_DisplayName")]
         [ResourcesDescription(typeof(Resources), "ModelFactorOvertoppingSuperCriticalFlow_Description")]
         public NormalDistributionProperties ModelFactorOvertoppingSuperCriticalFlow
         {
             get
             {
-                return new NormalDistributionProperties(data.WrappedData)
+                return new NormalDistributionProperties(data.WrappedData, DistributionPropertiesReadOnly.StandardDeviation)
                 {
                     Data = data.WrappedData.ModelFactorOvertoppingSuperCriticalFlow
                 };
@@ -111,89 +112,95 @@
         }
 
         [PropertyOrder(levelOfCrestOfStructurePropertyIndex)]
+        [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
         [ResourcesDisplayName(typeof(Resources), "LevelOfCrestOfStructure_DisplayName")]
         [ResourcesDescription(typeof(Resources), "LevelOfCrestOfStructure_Description")]
         public NormalDistributionProperties LevelOfCrestOfStructure
         {
             get
             {
-                return new NormalDistributionProperties(data.WrappedData)
+                return new NormalDistributionProperties(data.WrappedData, DistributionPropertiesReadOnly.None)
                 {
                     Data = data.WrappedData.LevelOfCrestOfStructure
                 };
             }
         }
 
         [PropertyOrder(allowableIncreaseOfLevelForStoragePropertyIndex)]
+        [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
         [ResourcesDisplayName(typeof(Resources), "AllowableIncreaseOfLevelForStorage_DisplayName")]
         [ResourcesDescription(typeof(Resources), "AllowableIncreaseOfLevelForStorage_Description")]
         public LogNormalDistributionProperties AllowableIncreaseOfLevelForStorage
         {
             get
             {
-                return new LogNormalDistributionProperties(data.WrappedData)
+                return new LogNormalDistributionProperties(data.WrappedData, DistributionPropertiesReadOnly.None)
                 {
                     Data = data.WrappedData.AllowableIncreaseOfLevelForStorage
                 };
             }
         }
 
         [PropertyOrder(storageStructureAreaPropertyIndex)]
+        [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
         [ResourcesDisplayName(typeof(Resources), "StorageStructureArea_DisplayName")]
         [ResourcesDescription(typeof(Resources), "StorageStructureArea_Description")]
         public LogNormalDistributionProperties StorageStructureArea
         {
             get
             {
-                return new LogNormalDistributionProperties(data.WrappedData)
+                return new LogNormalDistributionProperties(data.WrappedData, DistributionPropertiesReadOnly.None)
                 {
                     Data = data.WrappedData.StorageStructureArea
                 };
             }
         }
 
         [PropertyOrder(flowWidthAtBottomProtectionPropertyIndex)]
+        [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
         [ResourcesDisplayName(typeof(Resources), "FlowWidthAtBottomProtection_DisplayName")]
         [ResourcesDescription(typeof(Resources), "FlowWidthAtBottomProtection_Description")]
         public LogNormalDistributionProperties FlowWidthAtBottomProtection
         {
             get
             {
-                return new LogNormalDistributionProperties(data.WrappedData)
+                return new LogNormalDistributionProperties(data.WrappedData, DistributionPropertiesReadOnly.None)
                 {
                     Data = data.WrappedData.FlowWidthAtBottomProtection
                 };
             }
         }
 
         [PropertyOrder(widthOfFlowAperturesPropertyIndex)]
+        [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
         [ResourcesDisplayName(typeof(Resources), "WidthOfFlowApertures_DisplayName")]
         [ResourcesDescription(typeof(Resources), "WidthOfFlowApertures_Description")]
         public NormalDistributionProperties WidthOfFlowApertures
         {
             get
             {
-                return new NormalDistributionProperties(data.WrappedData)
+                return new NormalDistributionProperties(data.WrappedData, DistributionPropertiesReadOnly.None)
                 {
                     Data = data.WrappedData.WidthOfFlowApertures
                 };
             }
         }
 
         [PropertyOrder(criticalOvertoppingDischargePropertyIndex)]
+        [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
         [ResourcesDisplayName(typeof(Resources), "CriticalOvertoppingDischarge_DisplayName")]
         [ResourcesDescription(typeof(Resources), "CriticalOvertoppingDischarge_Description")]
         public LogNormalDistributionProperties CriticalOvertoppingDischarge
         {
             get
             {
-                return new LogNormalDistributionProperties(data.WrappedData)
+                return new LogNormalDistributionProperties(data.WrappedData, DistributionPropertiesReadOnly.None)
                 {
                     Data = data.WrappedData.CriticalOvertoppingDischarge
                 };
@@ -239,15 +246,15 @@
         }
 
         [PropertyOrder(stormDurationPropertyIndex)]
+        [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(Resources), "Categories_HydraulicData")]
         [ResourcesDisplayName(typeof(Resources), "StormDuration_DisplayName")]
         [ResourcesDescription(typeof(Resources), "StormDuration_Description")]
         public LogNormalDistributionProperties StormDuration
         {
             get
             {
-                // TODO make standard deviation read-only
-                return new LogNormalDistributionProperties(data.WrappedData)
+                return new LogNormalDistributionProperties(data.WrappedData, DistributionPropertiesReadOnly.StandardDeviation)
                 {
                     Data = data.WrappedData.StormDuration
                 };