Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs
===================================================================
diff -u -r36d4b4090a4169cc8d25ede0029a3244df8fe74d -r2f82ce7b8dbc9f0c6b3f34898a97f0a3d7a05baa
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs	(.../AssessmentSectionCreateExtensions.cs)	(revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs	(.../AssessmentSectionCreateExtensions.cs)	(revision 2f82ce7b8dbc9f0c6b3f34898a97f0a3d7a05baa)
@@ -81,8 +81,9 @@
             };
 
             AddEntityForHydraulicDatabase(section.HydraulicBoundaryDatabase, entity, registry);
+            AddHydraulicLocationCalculationEntities(section, entity, registry);
             AddEntityForReferenceLine(section, entity);
-
+            
             entity.BackgroundDataEntities.Add(section.BackgroundData.Create());
 
             entity.FailureMechanismEntities.Add(section.Piping.Create(registry));
@@ -138,5 +139,18 @@
                 }
             }
         }
+
+        private static void AddHydraulicLocationCalculationEntities(AssessmentSection assessmentSection, AssessmentSectionEntity entity, PersistenceRegistry registry)
+        {
+            // TODO: WIT-1606 Finalize the ordering of where to map which calculation
+            entity.HydraulicLocationCalculationCollectionEntity = assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.Create(registry);
+            entity.HydraulicLocationCalculationCollectionEntity1 = assessmentSection.WaterLevelCalculationsForSignalingNorm.Create(registry);
+            entity.HydraulicLocationCalculationCollectionEntity2 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Create(registry);
+            entity.HydraulicLocationCalculationCollectionEntity3 = assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.Create(registry);
+            entity.HydraulicLocationCalculationCollectionEntity4 = assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm.Create(registry);
+            entity.HydraulicLocationCalculationCollectionEntity5 = assessmentSection.WaveHeightCalculationsForSignalingNorm.Create(registry);
+            entity.HydraulicLocationCalculationCollectionEntity6 = assessmentSection.WaveHeightCalculationsForLowerLimitNorm.Create(registry);
+            entity.HydraulicLocationCalculationCollectionEntity7 = assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm.Create(registry);
+        }
     }
 }
\ No newline at end of file