Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs
===================================================================
diff -u -r25b4c6adf1c80f2e25a69a172679362938dc8efb -r0b299af3d5f6cc45062d17b78316c8e73a306344
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs	(.../ClosingStructuresInput.cs)	(revision 25b4c6adf1c80f2e25a69a172679362938dc8efb)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs	(.../ClosingStructuresInput.cs)	(revision 0b299af3d5f6cc45062d17b78316c8e73a306344)
@@ -42,6 +42,7 @@
         private static readonly Range<int> identicalAperturesValidityRange = new Range<int>(1, int.MaxValue);
 
         private NormalDistribution thresholdHeightOpenWeir;
+        private NormalDistribution modelFactorSuperCriticalFlow;
         private NormalDistribution drainCoefficient;
         private LogNormalDistribution areaFlowApertures;
         private NormalDistribution levelCrestStructureNotClosing;
@@ -67,6 +68,12 @@
                 StandardDeviation = (RoundedDouble) 0.2
             };
 
+            modelFactorSuperCriticalFlow = new NormalDistribution(2)
+            {
+                Mean = (RoundedDouble) 1.1,
+                StandardDeviation = (RoundedDouble) 0.05
+            };
+
             thresholdHeightOpenWeir = new NormalDistribution(2);
             areaFlowApertures = new LogNormalDistribution(2);
             levelCrestStructureNotClosing = new NormalDistribution(2);
@@ -226,6 +233,22 @@
         #region Model factors
 
         /// <summary>
+        /// Gets or sets the model factor for the super critical flow.
+        /// </summary>
+        /// <remarks>Only sets the mean.</remarks>
+        public NormalDistribution ModelFactorSuperCriticalFlow
+        {
+            get
+            {
+                return modelFactorSuperCriticalFlow;
+            }
+            set
+            {
+                modelFactorSuperCriticalFlow.Mean = value.Mean;
+            }
+        }
+
+        /// <summary>
         /// Gets or sets the drain coefficient.
         /// </summary>
         /// <remarks>Only sets the mean.</remarks>
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresInputBase.cs
===================================================================
diff -u -r3257a53186739aa9e83990a4581d957879df4692 -r0b299af3d5f6cc45062d17b78316c8e73a306344
--- Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresInputBase.cs	(.../StructuresInputBase.cs)	(revision 3257a53186739aa9e83990a4581d957879df4692)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresInputBase.cs	(.../StructuresInputBase.cs)	(revision 0b299af3d5f6cc45062d17b78316c8e73a306344)
@@ -44,7 +44,6 @@
         private static readonly Range<RoundedDouble> structureNormalOrientationValidityRange = new Range<RoundedDouble>(new RoundedDouble(structureNormalOrientationNumberOfDecimals),
                                                                                                                         new RoundedDouble(structureNormalOrientationNumberOfDecimals, 360));
 
-        private NormalDistribution modelFactorSuperCriticalFlow;
         private LogNormalDistribution allowedLevelIncreaseStorage;
         private VariationCoefficientLogNormalDistribution storageStructureArea;
         private LogNormalDistribution flowWidthAtBottomProtection;
@@ -63,12 +62,6 @@
         /// </summary>
         protected StructuresInputBase()
         {
-            modelFactorSuperCriticalFlow = new NormalDistribution(2)
-            {
-                Mean = (RoundedDouble) 1.1,
-                StandardDeviation = (RoundedDouble) 0.05
-            };
-
             stormDuration = new VariationCoefficientLogNormalDistribution(2)
             {
                 Mean = (RoundedDouble) 6.0,
@@ -87,27 +80,7 @@
             SynchronizeForeshoreProfileInput();
         }
 
-        #region Model factors
-
         /// <summary>
-        /// Gets or sets the model factor for the super critical flow.
-        /// </summary>
-        /// <remarks>Only sets the mean.</remarks>
-        public NormalDistribution ModelFactorSuperCriticalFlow
-        {
-            get
-            {
-                return modelFactorSuperCriticalFlow;
-            }
-            set
-            {
-                modelFactorSuperCriticalFlow.Mean = value.Mean;
-            }
-        }
-
-        #endregion
-
-        /// <summary>
         /// Gets the value <c>true</c> if the parameters of the instance of
         /// <see cref="StructuresInputBase{T}"/> that are derived from
         /// <see cref="Structure"/> match the properties of <see cref="Structure"/>;
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs
===================================================================
diff -u -r8036936a18ebe45fafa40d67a016424a32668391 -r0b299af3d5f6cc45062d17b78316c8e73a306344
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs	(.../HeightStructuresInput.cs)	(revision 8036936a18ebe45fafa40d67a016424a32668391)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs	(.../HeightStructuresInput.cs)	(revision 0b299af3d5f6cc45062d17b78316c8e73a306344)
@@ -37,17 +37,25 @@
         private static readonly Range<RoundedDouble> deviationWaveDirectionValidityRange = new Range<RoundedDouble>(new RoundedDouble(deviationWaveDirectionNumberOfDecimals, -360),
                                                                                                                     new RoundedDouble(deviationWaveDirectionNumberOfDecimals, 360));
 
-        private NormalDistribution levelCrestStructure;
         private RoundedDouble deviationWaveDirection;
+        private NormalDistribution modelFactorSuperCriticalFlow;
+        private NormalDistribution levelCrestStructure;
 
         /// <summary>
         /// Creates a new instance of the <see cref="HeightStructuresInput"/> class.
         /// </summary>
         public HeightStructuresInput()
         {
-            levelCrestStructure = new NormalDistribution(2);
             deviationWaveDirection = new RoundedDouble(deviationWaveDirectionNumberOfDecimals);
 
+            modelFactorSuperCriticalFlow = new NormalDistribution(2)
+            {
+                Mean = (RoundedDouble) 1.1,
+                StandardDeviation = (RoundedDouble) 0.05
+            };
+
+            levelCrestStructure = new NormalDistribution(2);
+
             SetDefaultSchematizationProperties();
         }
 
@@ -93,6 +101,26 @@
 
         #endregion
 
+        #region Model factors
+
+        /// <summary>
+        /// Gets or sets the model factor for the super critical flow.
+        /// </summary>
+        /// <remarks>Only sets the mean.</remarks>
+        public NormalDistribution ModelFactorSuperCriticalFlow
+        {
+            get
+            {
+                return modelFactorSuperCriticalFlow;
+            }
+            set
+            {
+                modelFactorSuperCriticalFlow.Mean = value.Mean;
+            }
+        }
+
+        #endregion
+
         #region Schematization
 
         /// <summary>