Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/StructuresCalculationCreateExtensions.cs
===================================================================
diff -u -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c -r10c9619be8a796911d7c22c9a762c05cc4c30546
--- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/StructuresCalculationCreateExtensions.cs	(.../StructuresCalculationCreateExtensions.cs)	(revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c)
+++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/StructuresCalculationCreateExtensions.cs	(.../StructuresCalculationCreateExtensions.cs)	(revision 10c9619be8a796911d7c22c9a762c05cc4c30546)
@@ -82,8 +82,6 @@
             entityToUpdate.CriticalOvertoppingDischargeMean = input.CriticalOvertoppingDischarge.Mean.ToNaNAsNull();
             entityToUpdate.CriticalOvertoppingDischargeCoefficientOfVariation = input.CriticalOvertoppingDischarge.CoefficientOfVariation.ToNaNAsNull();
 
-            entityToUpdate.ModelFactorSuperCriticalFlowMean = input.ModelFactorSuperCriticalFlow.Mean.ToNaNAsNull();
-
             entityToUpdate.WidthFlowAperturesMean = input.WidthFlowApertures.Mean.ToNaNAsNull();
             entityToUpdate.WidthFlowAperturesStandardDeviation = input.WidthFlowApertures.StandardDeviation.ToNaNAsNull();
 
@@ -141,6 +139,8 @@
 
             entity.DeviationWaveDirection = input.DeviationWaveDirection.ToNaNAsNull();
 
+            entity.ModelFactorSuperCriticalFlowMean = input.ModelFactorSuperCriticalFlow.Mean.ToNaNAsNull();
+
             entity.DrainCoefficientMean = input.DrainCoefficient.Mean.ToNaNAsNull();
 
             entity.FactorStormDurationOpenStructure = input.FactorStormDurationOpenStructure.ToNaNAsNull();
@@ -220,10 +220,12 @@
                 entity.HeightStructureEntity = registry.Get(input.Structure);
             }
 
+            entity.DeviationWaveDirection = input.DeviationWaveDirection.ToNaNAsNull();
+
+            entity.ModelFactorSuperCriticalFlowMean = input.ModelFactorSuperCriticalFlow.Mean.ToNaNAsNull();
+
             entity.LevelCrestStructureMean = input.LevelCrestStructure.Mean.ToNaNAsNull();
             entity.LevelCrestStructureStandardDeviation = input.LevelCrestStructure.StandardDeviation.ToNaNAsNull();
-
-            entity.DeviationWaveDirection = input.DeviationWaveDirection.ToNaNAsNull();
         }
 
         private static void SetOutputEntity(StructuresCalculation<HeightStructuresInput> calculation,
Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensions.cs
===================================================================
diff -u -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c -r10c9619be8a796911d7c22c9a762c05cc4c30546
--- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensions.cs	(.../ClosingStructuresCalculationEntityReadExtensions.cs)	(revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c)
+++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensions.cs	(.../ClosingStructuresCalculationEntityReadExtensions.cs)	(revision 10c9619be8a796911d7c22c9a762c05cc4c30546)
@@ -88,6 +88,7 @@
             inputParameters.InsideWaterLevel.Mean = (RoundedDouble) entity.InsideWaterLevelMean.ToNullAsNaN();
             inputParameters.InsideWaterLevel.StandardDeviation = (RoundedDouble) entity.InsideWaterLevelStandardDeviation.ToNullAsNaN();
             inputParameters.DeviationWaveDirection = (RoundedDouble) entity.DeviationWaveDirection.ToNullAsNaN();
+            inputParameters.ModelFactorSuperCriticalFlow.Mean = (RoundedDouble) entity.ModelFactorSuperCriticalFlowMean.ToNullAsNaN();
             inputParameters.DrainCoefficient.Mean = (RoundedDouble) entity.DrainCoefficientMean.ToNullAsNaN();
             inputParameters.FactorStormDurationOpenStructure = (RoundedDouble) entity.FactorStormDurationOpenStructure.ToNullAsNaN();
             inputParameters.ThresholdHeightOpenWeir.Mean = (RoundedDouble) entity.ThresholdHeightOpenWeirMean.ToNullAsNaN();
Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensions.cs
===================================================================
diff -u -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 -r10c9619be8a796911d7c22c9a762c05cc4c30546
--- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensions.cs	(.../HeightStructuresCalculationEntityReadExtensions.cs)	(revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554)
+++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensions.cs	(.../HeightStructuresCalculationEntityReadExtensions.cs)	(revision 10c9619be8a796911d7c22c9a762c05cc4c30546)
@@ -84,9 +84,10 @@
 
             entity.Read(inputParameters, collector);
 
+            inputParameters.DeviationWaveDirection = (RoundedDouble) entity.DeviationWaveDirection.ToNullAsNaN();
+            inputParameters.ModelFactorSuperCriticalFlow.Mean = (RoundedDouble) entity.ModelFactorSuperCriticalFlowMean.ToNullAsNaN();
             inputParameters.LevelCrestStructure.Mean = (RoundedDouble) entity.LevelCrestStructureMean.ToNullAsNaN();
             inputParameters.LevelCrestStructure.StandardDeviation = (RoundedDouble) entity.LevelCrestStructureStandardDeviation.ToNullAsNaN();
-            inputParameters.DeviationWaveDirection = (RoundedDouble) entity.DeviationWaveDirection.ToNullAsNaN();
         }
 
         private static void ReadOutput(StructuresCalculation<HeightStructuresInput> calculation,
Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/StructureCalculationEntityReadExtensions.cs
===================================================================
diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -r10c9619be8a796911d7c22c9a762c05cc4c30546
--- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/StructureCalculationEntityReadExtensions.cs	(.../StructureCalculationEntityReadExtensions.cs)	(revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622)
+++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/StructureCalculationEntityReadExtensions.cs	(.../StructureCalculationEntityReadExtensions.cs)	(revision 10c9619be8a796911d7c22c9a762c05cc4c30546)
@@ -69,7 +69,6 @@
             }
 
             inputToUpdate.StructureNormalOrientation = (RoundedDouble) entity.StructureNormalOrientation.ToNullAsNaN();
-            inputToUpdate.ModelFactorSuperCriticalFlow.Mean = (RoundedDouble) entity.ModelFactorSuperCriticalFlowMean.ToNullAsNaN();
             inputToUpdate.AllowedLevelIncreaseStorage.Mean = (RoundedDouble) entity.AllowedLevelIncreaseStorageMean.ToNullAsNaN();
             inputToUpdate.AllowedLevelIncreaseStorage.StandardDeviation = (RoundedDouble) entity.AllowedLevelIncreaseStorageStandardDeviation.ToNullAsNaN();
             inputToUpdate.StorageStructureArea.Mean = (RoundedDouble) entity.StorageStructureAreaMean.ToNullAsNaN();