Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs
===================================================================
diff -u -rbc7cd9cbf90d04580e6b3542c56edc590867c43a -ra20794746c723f3d02434953861bd3dc57800b73
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs	(.../PersistenceRegistry.cs)	(revision bc7cd9cbf90d04580e6b3542c56edc590867c43a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs	(.../PersistenceRegistry.cs)	(revision a20794746c723f3d02434953861bd3dc57800b73)
@@ -46,47 +46,52 @@
     /// </summary>
     internal class PersistenceRegistry
     {
-        private readonly Dictionary<ProjectEntity, RingtoetsProject> projects = new Dictionary<ProjectEntity, RingtoetsProject>(new ReferenceEqualityComparer<ProjectEntity>());
-        private readonly Dictionary<AssessmentSectionEntity, AssessmentSection> assessmentSections = new Dictionary<AssessmentSectionEntity, AssessmentSection>(new ReferenceEqualityComparer<AssessmentSectionEntity>());
-        private readonly Dictionary<FailureMechanismEntity, IFailureMechanism> failureMechanisms = new Dictionary<FailureMechanismEntity, IFailureMechanism>(new ReferenceEqualityComparer<FailureMechanismEntity>());
-        private readonly Dictionary<FailureMechanismSectionEntity, FailureMechanismSection> failureMechanismSections = new Dictionary<FailureMechanismSectionEntity, FailureMechanismSection>();
-        private readonly Dictionary<PipingSectionResultEntity, PipingFailureMechanismSectionResult> pipingFailureMechanismSectionResults = new Dictionary<PipingSectionResultEntity, PipingFailureMechanismSectionResult>();
-        private readonly Dictionary<GrassCoverErosionInwardsFailureMechanismMetaEntity, GeneralGrassCoverErosionInwardsInput> generalGrassCoverErosionInwardsInputs = new Dictionary<GrassCoverErosionInwardsFailureMechanismMetaEntity, GeneralGrassCoverErosionInwardsInput>();
-        private readonly Dictionary<DikeProfileEntity, DikeProfile> dikeProfiles = new Dictionary<DikeProfileEntity, DikeProfile>();
-        private readonly Dictionary<GrassCoverErosionInwardsCalculationEntity, GrassCoverErosionInwardsCalculation> grassCoverErosionInwardsCalculations = new Dictionary<GrassCoverErosionInwardsCalculationEntity, GrassCoverErosionInwardsCalculation>();
-        private readonly Dictionary<GrassCoverErosionInwardsOutputEntity, GrassCoverErosionInwardsOutput> grassCoverErosionInwardsOutputs = new Dictionary<GrassCoverErosionInwardsOutputEntity, GrassCoverErosionInwardsOutput>();
-        private readonly Dictionary<GrassCoverErosionInwardsSectionResultEntity, GrassCoverErosionInwardsFailureMechanismSectionResult> grassCoverErosionInwardsFailureMechanismSectionResults = new Dictionary<GrassCoverErosionInwardsSectionResultEntity, GrassCoverErosionInwardsFailureMechanismSectionResult>();
-        private readonly Dictionary<HeightStructuresSectionResultEntity, HeightStructuresFailureMechanismSectionResult> heightStructuresFailureMechanismSectionResults = new Dictionary<HeightStructuresSectionResultEntity, HeightStructuresFailureMechanismSectionResult>();
-        private readonly Dictionary<StrengthStabilityLengthwiseConstructionSectionResultEntity, StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult> strengthStabilityLengthwiseConstructionFailureMechanismSectionResults = new Dictionary<StrengthStabilityLengthwiseConstructionSectionResultEntity, StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult>();
-        private readonly Dictionary<TechnicalInnovationSectionResultEntity, TechnicalInnovationFailureMechanismSectionResult> technicalInnovationFailureMechanismSectionResults = new Dictionary<TechnicalInnovationSectionResultEntity, TechnicalInnovationFailureMechanismSectionResult>();
-        private readonly Dictionary<WaterPressureAsphaltCoverSectionResultEntity, WaterPressureAsphaltCoverFailureMechanismSectionResult> waterPressureAsphaltCoverFailureMechanismSectionResults = new Dictionary<WaterPressureAsphaltCoverSectionResultEntity, WaterPressureAsphaltCoverFailureMechanismSectionResult>();
-        private readonly Dictionary<ClosingStructureSectionResultEntity, ClosingStructureFailureMechanismSectionResult> closingStructureFailureMechanismSectionResults = new Dictionary<ClosingStructureSectionResultEntity, ClosingStructureFailureMechanismSectionResult>();
-        private readonly Dictionary<MacrostabilityInwardsSectionResultEntity, MacrostabilityInwardsFailureMechanismSectionResult> macrostabilityInwardsFailureMechanismSectionResults = new Dictionary<MacrostabilityInwardsSectionResultEntity, MacrostabilityInwardsFailureMechanismSectionResult>();
-        private readonly Dictionary<MacrostabilityOutwardsSectionResultEntity, MacrostabilityOutwardsFailureMechanismSectionResult> macrostabilityOutwardsFailureMechanismSectionResults = new Dictionary<MacrostabilityOutwardsSectionResultEntity, MacrostabilityOutwardsFailureMechanismSectionResult>();
-        private readonly Dictionary<WaveImpactAsphaltCoverSectionResultEntity, WaveImpactAsphaltCoverFailureMechanismSectionResult> waveImpactAsphaltCoverFailureMechanismSectionResults = new Dictionary<WaveImpactAsphaltCoverSectionResultEntity, WaveImpactAsphaltCoverFailureMechanismSectionResult>();
-        private readonly Dictionary<GrassCoverErosionOutwardsSectionResultEntity, GrassCoverErosionOutwardsFailureMechanismSectionResult> grassCoverErosionOutwardsFailureMechanismSectionResults = new Dictionary<GrassCoverErosionOutwardsSectionResultEntity, GrassCoverErosionOutwardsFailureMechanismSectionResult>();
-        private readonly Dictionary<GrassCoverSlipOffInwardsSectionResultEntity, GrassCoverSlipOffInwardsFailureMechanismSectionResult> grassCoverSlipOffInwardsFailureMechanismSectionResults = new Dictionary<GrassCoverSlipOffInwardsSectionResultEntity, GrassCoverSlipOffInwardsFailureMechanismSectionResult>();
-        private readonly Dictionary<GrassCoverSlipOffOutwardsSectionResultEntity, GrassCoverSlipOffOutwardsFailureMechanismSectionResult> grassCoverSlipOffOutwardsFailureMechanismSectionResults = new Dictionary<GrassCoverSlipOffOutwardsSectionResultEntity, GrassCoverSlipOffOutwardsFailureMechanismSectionResult>();
-        private readonly Dictionary<MicrostabilitySectionResultEntity, MicrostabilityFailureMechanismSectionResult> microstabilityFailureMechanismSectionResults = new Dictionary<MicrostabilitySectionResultEntity, MicrostabilityFailureMechanismSectionResult>();
-        private readonly Dictionary<PipingStructureSectionResultEntity, PipingStructureFailureMechanismSectionResult> pipingStructureFailureMechanismSectionResults = new Dictionary<PipingStructureSectionResultEntity, PipingStructureFailureMechanismSectionResult>();
-        private readonly Dictionary<DuneErosionSectionResultEntity, DuneErosionFailureMechanismSectionResult> duneErosionFailureMechanismSectionResults = new Dictionary<DuneErosionSectionResultEntity, DuneErosionFailureMechanismSectionResult>();
-        private readonly Dictionary<StabilityStoneCoverSectionResultEntity, StabilityStoneCoverFailureMechanismSectionResult> stabilityStoneCoverFailureMechanismSectionResults = new Dictionary<StabilityStoneCoverSectionResultEntity, StabilityStoneCoverFailureMechanismSectionResult>();
-        private readonly Dictionary<StrengthStabilityPointConstructionSectionResultEntity, StrengthStabilityPointConstructionFailureMechanismSectionResult> strengthStabilityPointConstructionFailureMechanismSectionResults = new Dictionary<StrengthStabilityPointConstructionSectionResultEntity, StrengthStabilityPointConstructionFailureMechanismSectionResult>();
-        private readonly Dictionary<HydraulicLocationEntity, HydraulicBoundaryLocation> hydraulicLocations = new Dictionary<HydraulicLocationEntity, HydraulicBoundaryLocation>(new ReferenceEqualityComparer<HydraulicLocationEntity>());
-        private readonly Dictionary<CalculationGroupEntity, CalculationGroup> calculationGroups = new Dictionary<CalculationGroupEntity, CalculationGroup>(new ReferenceEqualityComparer<CalculationGroupEntity>());
-        private readonly Dictionary<PipingCalculationEntity, PipingCalculationScenario> pipingCalculations = new Dictionary<PipingCalculationEntity, PipingCalculationScenario>(new ReferenceEqualityComparer<PipingCalculationEntity>());
-        private readonly Dictionary<PipingCalculationOutputEntity, PipingOutput> pipingOutputs = new Dictionary<PipingCalculationOutputEntity, PipingOutput>(new ReferenceEqualityComparer<PipingCalculationOutputEntity>());
-        private readonly Dictionary<PipingSemiProbabilisticOutputEntity, PipingSemiProbabilisticOutput> pipingSemiProbabilisticOutputs = new Dictionary<PipingSemiProbabilisticOutputEntity, PipingSemiProbabilisticOutput>(new ReferenceEqualityComparer<PipingSemiProbabilisticOutputEntity>());
-        private readonly Dictionary<StochasticSoilModelEntity, StochasticSoilModel> stochasticSoilModels = new Dictionary<StochasticSoilModelEntity, StochasticSoilModel>(new ReferenceEqualityComparer<StochasticSoilModelEntity>());
-        private readonly Dictionary<StochasticSoilProfileEntity, StochasticSoilProfile> stochasticSoilProfiles = new Dictionary<StochasticSoilProfileEntity, StochasticSoilProfile>(new ReferenceEqualityComparer<StochasticSoilProfileEntity>());
-        private readonly Dictionary<SoilProfileEntity, PipingSoilProfile> soilProfiles = new Dictionary<SoilProfileEntity, PipingSoilProfile>(new ReferenceEqualityComparer<SoilProfileEntity>());
-        private readonly Dictionary<SoilLayerEntity, PipingSoilLayer> soilLayers = new Dictionary<SoilLayerEntity, PipingSoilLayer>(new ReferenceEqualityComparer<SoilLayerEntity>());
-        private readonly Dictionary<SurfaceLineEntity, RingtoetsPipingSurfaceLine> surfaceLines = new Dictionary<SurfaceLineEntity, RingtoetsPipingSurfaceLine>(new ReferenceEqualityComparer<SurfaceLineEntity>());
-        private readonly Dictionary<SurfaceLinePointEntity, Point3D> surfaceLinePoints = new Dictionary<SurfaceLinePointEntity, Point3D>(new ReferenceEqualityComparer<SurfaceLinePointEntity>());
-        private readonly Dictionary<CharacteristicPointEntity, Point3D> characteristicPoints = new Dictionary<CharacteristicPointEntity, Point3D>(new ReferenceEqualityComparer<CharacteristicPointEntity>());
-        private readonly Dictionary<PipingFailureMechanismMetaEntity, PipingProbabilityAssessmentInput> pipingProbabilityAssessmentInputs = new Dictionary<PipingFailureMechanismMetaEntity, PipingProbabilityAssessmentInput>(new ReferenceEqualityComparer<PipingFailureMechanismMetaEntity>());
-        private readonly Dictionary<ProbabilisticOutputEntity, ProbabilityAssessmentOutput> probabilisticAssessmentOutputs = new Dictionary<ProbabilisticOutputEntity, ProbabilityAssessmentOutput>(new ReferenceEqualityComparer<ProbabilisticOutputEntity>());
+        private readonly Dictionary<ProjectEntity, RingtoetsProject> projects = CreateDictionary<ProjectEntity, RingtoetsProject>();
+        private readonly Dictionary<AssessmentSectionEntity, AssessmentSection> assessmentSections = CreateDictionary<AssessmentSectionEntity, AssessmentSection>();
+        private readonly Dictionary<FailureMechanismEntity, IFailureMechanism> failureMechanisms = CreateDictionary<FailureMechanismEntity, IFailureMechanism>();
+        private readonly Dictionary<FailureMechanismSectionEntity, FailureMechanismSection> failureMechanismSections = CreateDictionary<FailureMechanismSectionEntity, FailureMechanismSection>();
+        private readonly Dictionary<PipingSectionResultEntity, PipingFailureMechanismSectionResult> pipingFailureMechanismSectionResults = CreateDictionary<PipingSectionResultEntity, PipingFailureMechanismSectionResult>();
+        private readonly Dictionary<GrassCoverErosionInwardsFailureMechanismMetaEntity, GeneralGrassCoverErosionInwardsInput> generalGrassCoverErosionInwardsInputs = CreateDictionary<GrassCoverErosionInwardsFailureMechanismMetaEntity, GeneralGrassCoverErosionInwardsInput>();
+        private readonly Dictionary<DikeProfileEntity, DikeProfile> dikeProfiles = CreateDictionary<DikeProfileEntity, DikeProfile>();
+        private readonly Dictionary<GrassCoverErosionInwardsCalculationEntity, GrassCoverErosionInwardsCalculation> grassCoverErosionInwardsCalculations = CreateDictionary<GrassCoverErosionInwardsCalculationEntity, GrassCoverErosionInwardsCalculation>();
+        private readonly Dictionary<GrassCoverErosionInwardsOutputEntity, GrassCoverErosionInwardsOutput> grassCoverErosionInwardsOutputs = CreateDictionary<GrassCoverErosionInwardsOutputEntity, GrassCoverErosionInwardsOutput>();
+        private readonly Dictionary<GrassCoverErosionInwardsSectionResultEntity, GrassCoverErosionInwardsFailureMechanismSectionResult> grassCoverErosionInwardsFailureMechanismSectionResults = CreateDictionary<GrassCoverErosionInwardsSectionResultEntity, GrassCoverErosionInwardsFailureMechanismSectionResult>();
+        private readonly Dictionary<HeightStructuresSectionResultEntity, HeightStructuresFailureMechanismSectionResult> heightStructuresFailureMechanismSectionResults = CreateDictionary<HeightStructuresSectionResultEntity, HeightStructuresFailureMechanismSectionResult>();
+        private readonly Dictionary<StrengthStabilityLengthwiseConstructionSectionResultEntity, StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult> strengthStabilityLengthwiseConstructionFailureMechanismSectionResults = CreateDictionary<StrengthStabilityLengthwiseConstructionSectionResultEntity, StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult>();
+        private readonly Dictionary<TechnicalInnovationSectionResultEntity, TechnicalInnovationFailureMechanismSectionResult> technicalInnovationFailureMechanismSectionResults = CreateDictionary<TechnicalInnovationSectionResultEntity, TechnicalInnovationFailureMechanismSectionResult>();
+        private readonly Dictionary<WaterPressureAsphaltCoverSectionResultEntity, WaterPressureAsphaltCoverFailureMechanismSectionResult> waterPressureAsphaltCoverFailureMechanismSectionResults = CreateDictionary<WaterPressureAsphaltCoverSectionResultEntity, WaterPressureAsphaltCoverFailureMechanismSectionResult>();
+        private readonly Dictionary<ClosingStructureSectionResultEntity, ClosingStructureFailureMechanismSectionResult> closingStructureFailureMechanismSectionResults = CreateDictionary<ClosingStructureSectionResultEntity, ClosingStructureFailureMechanismSectionResult>();
+        private readonly Dictionary<MacrostabilityInwardsSectionResultEntity, MacrostabilityInwardsFailureMechanismSectionResult> macrostabilityInwardsFailureMechanismSectionResults = CreateDictionary<MacrostabilityInwardsSectionResultEntity, MacrostabilityInwardsFailureMechanismSectionResult>();
+        private readonly Dictionary<MacrostabilityOutwardsSectionResultEntity, MacrostabilityOutwardsFailureMechanismSectionResult> macrostabilityOutwardsFailureMechanismSectionResults = CreateDictionary<MacrostabilityOutwardsSectionResultEntity, MacrostabilityOutwardsFailureMechanismSectionResult>();
+        private readonly Dictionary<WaveImpactAsphaltCoverSectionResultEntity, WaveImpactAsphaltCoverFailureMechanismSectionResult> waveImpactAsphaltCoverFailureMechanismSectionResults = CreateDictionary<WaveImpactAsphaltCoverSectionResultEntity, WaveImpactAsphaltCoverFailureMechanismSectionResult>();
+        private readonly Dictionary<GrassCoverErosionOutwardsSectionResultEntity, GrassCoverErosionOutwardsFailureMechanismSectionResult> grassCoverErosionOutwardsFailureMechanismSectionResults = CreateDictionary<GrassCoverErosionOutwardsSectionResultEntity, GrassCoverErosionOutwardsFailureMechanismSectionResult>();
+        private readonly Dictionary<GrassCoverSlipOffInwardsSectionResultEntity, GrassCoverSlipOffInwardsFailureMechanismSectionResult> grassCoverSlipOffInwardsFailureMechanismSectionResults = CreateDictionary<GrassCoverSlipOffInwardsSectionResultEntity, GrassCoverSlipOffInwardsFailureMechanismSectionResult>();
+        private readonly Dictionary<GrassCoverSlipOffOutwardsSectionResultEntity, GrassCoverSlipOffOutwardsFailureMechanismSectionResult> grassCoverSlipOffOutwardsFailureMechanismSectionResults = CreateDictionary<GrassCoverSlipOffOutwardsSectionResultEntity, GrassCoverSlipOffOutwardsFailureMechanismSectionResult>();
+        private readonly Dictionary<MicrostabilitySectionResultEntity, MicrostabilityFailureMechanismSectionResult> microstabilityFailureMechanismSectionResults = CreateDictionary<MicrostabilitySectionResultEntity, MicrostabilityFailureMechanismSectionResult>();
+        private readonly Dictionary<PipingStructureSectionResultEntity, PipingStructureFailureMechanismSectionResult> pipingStructureFailureMechanismSectionResults = CreateDictionary<PipingStructureSectionResultEntity, PipingStructureFailureMechanismSectionResult>();
+        private readonly Dictionary<DuneErosionSectionResultEntity, DuneErosionFailureMechanismSectionResult> duneErosionFailureMechanismSectionResults = CreateDictionary<DuneErosionSectionResultEntity, DuneErosionFailureMechanismSectionResult>();
+        private readonly Dictionary<StabilityStoneCoverSectionResultEntity, StabilityStoneCoverFailureMechanismSectionResult> stabilityStoneCoverFailureMechanismSectionResults = CreateDictionary<StabilityStoneCoverSectionResultEntity, StabilityStoneCoverFailureMechanismSectionResult>();
+        private readonly Dictionary<StrengthStabilityPointConstructionSectionResultEntity, StrengthStabilityPointConstructionFailureMechanismSectionResult> strengthStabilityPointConstructionFailureMechanismSectionResults = CreateDictionary<StrengthStabilityPointConstructionSectionResultEntity, StrengthStabilityPointConstructionFailureMechanismSectionResult>();
+        private readonly Dictionary<HydraulicLocationEntity, HydraulicBoundaryLocation> hydraulicLocations = CreateDictionary<HydraulicLocationEntity, HydraulicBoundaryLocation>();
+        private readonly Dictionary<CalculationGroupEntity, CalculationGroup> calculationGroups = CreateDictionary<CalculationGroupEntity, CalculationGroup>();
+        private readonly Dictionary<PipingCalculationEntity, PipingCalculationScenario> pipingCalculations = CreateDictionary<PipingCalculationEntity, PipingCalculationScenario>();
+        private readonly Dictionary<PipingCalculationOutputEntity, PipingOutput> pipingOutputs = CreateDictionary<PipingCalculationOutputEntity, PipingOutput>();
+        private readonly Dictionary<PipingSemiProbabilisticOutputEntity, PipingSemiProbabilisticOutput> pipingSemiProbabilisticOutputs = CreateDictionary<PipingSemiProbabilisticOutputEntity, PipingSemiProbabilisticOutput>();
+        private readonly Dictionary<StochasticSoilModelEntity, StochasticSoilModel> stochasticSoilModels = CreateDictionary<StochasticSoilModelEntity, StochasticSoilModel>();
+        private readonly Dictionary<StochasticSoilProfileEntity, StochasticSoilProfile> stochasticSoilProfiles = CreateDictionary<StochasticSoilProfileEntity, StochasticSoilProfile>();
+        private readonly Dictionary<SoilProfileEntity, PipingSoilProfile> soilProfiles = CreateDictionary<SoilProfileEntity, PipingSoilProfile>();
+        private readonly Dictionary<SoilLayerEntity, PipingSoilLayer> soilLayers = CreateDictionary<SoilLayerEntity, PipingSoilLayer>();
+        private readonly Dictionary<SurfaceLineEntity, RingtoetsPipingSurfaceLine> surfaceLines = CreateDictionary<SurfaceLineEntity, RingtoetsPipingSurfaceLine>();
+        private readonly Dictionary<SurfaceLinePointEntity, Point3D> surfaceLinePoints = CreateDictionary<SurfaceLinePointEntity, Point3D>();
+        private readonly Dictionary<CharacteristicPointEntity, Point3D> characteristicPoints = CreateDictionary<CharacteristicPointEntity, Point3D>();
+        private readonly Dictionary<PipingFailureMechanismMetaEntity, PipingProbabilityAssessmentInput> pipingProbabilityAssessmentInputs = CreateDictionary<PipingFailureMechanismMetaEntity, PipingProbabilityAssessmentInput>();
+        private readonly Dictionary<ProbabilisticOutputEntity, ProbabilityAssessmentOutput> probabilisticAssessmentOutputs = CreateDictionary<ProbabilisticOutputEntity, ProbabilityAssessmentOutput>();
 
+        private static Dictionary<TEntity, TModel> CreateDictionary<TEntity, TModel>()
+        {
+            return new Dictionary<TEntity, TModel>(new ReferenceEqualityComparer<TEntity>());
+        }
+
         /// <summary>
         /// Registers a create or update operation for <paramref name="model"/> and the
         /// <paramref name="entity"/> that was constructed with the information.