Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs
===================================================================
diff -u -r2797cef80ee8fe17fe77116367e9b3d926945c7b -r678685141f0211ca24ce5c03fc5eb05cc99f0f48
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs	(.../PersistenceRegistry.cs)	(revision 2797cef80ee8fe17fe77116367e9b3d926945c7b)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs	(.../PersistenceRegistry.cs)	(revision 678685141f0211ca24ce5c03fc5eb05cc99f0f48)
@@ -53,6 +53,7 @@
         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<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>());
@@ -114,6 +115,22 @@
         /// Registers a create or update operation for <paramref name="model"/> and the
         /// <paramref name="entity"/> that was constructed with the information.
         /// </summary>
+        /// <param name="entity">The <see cref="PipingCalculationOutputEntity"/> that was registered.</param>
+        /// <param name="model">The <see cref="PipingOutput"/> which needed to registered.</param>
+        /// <exception cref="ArgumentNullException">Thrown when either:
+        /// <list type="bullet">
+        /// <item><paramref name="entity"/> is <c>null</c></item>
+        /// <item><paramref name="model"/> is <c>null</c></item>
+        /// </list></exception>
+        public void Register(PipingCalculationOutputEntity entity, PipingOutput model)
+        {
+            Register(pipingOutputs, entity, model);
+        }
+
+        /// <summary>
+        /// Registers a create or update operation for <paramref name="model"/> and the
+        /// <paramref name="entity"/> that was constructed with the information.
+        /// </summary>
         /// <param name="entity">The <see cref="ProjectEntity"/> that was registered.</param>
         /// <param name="model">The <see cref="Project"/> which needed to be registered.</param>
         /// <exception cref="ArgumentNullException">Thrown when either:
@@ -447,6 +464,17 @@
             Register(characteristicPoints, entity, model);
         }
 
+        /// <summary>
+        /// Registers a create or update operation for <paramref name="model"/> and the
+        /// <paramref name="entity"/> that was constructed with the information.
+        /// </summary>
+        /// <param name="entity">The <see cref="PipingFailureMechanismMetaEntity"/> that is being registered.</param>
+        /// <param name="model">The <see cref="PipingProbabilityAssessmentInput"/> that it being registered.</param>
+        /// <exception cref="ArgumentNullException">Thrown when either:
+        /// <list type="bullet">
+        /// <item><paramref name="entity"/> is <c>null</c></item>
+        /// <item><paramref name="model"/> is <c>null</c></item>
+        /// </list></exception>
         internal void Register(PipingFailureMechanismMetaEntity entity, PipingProbabilityAssessmentInput model)
         {
             Register(pipingProbabilityAssessmentInputs, entity, model);
@@ -492,6 +520,11 @@
                 pipingCalculations[entity].StorageId = entity.PipingCalculationEntityId;
             }
 
+            foreach (var entity in pipingOutputs.Keys)
+            {
+                pipingOutputs[entity].StorageId = entity.PipingCalculationOutputEntityId;
+            }
+
             foreach (var entity in stochasticSoilModels.Keys)
             {
                 stochasticSoilModels[entity].StorageId = entity.StochasticSoilModelEntityId;
@@ -614,6 +647,17 @@
             }
             dbContext.PipingCalculationEntities.RemoveRange(orphanedPipingCalculationEntities);
 
+            IList<PipingCalculationOutputEntity> orphanedPipingCalculationOutputEntities = new List<PipingCalculationOutputEntity>();
+            foreach (PipingCalculationOutputEntity pipingCalculationOutputEntity in dbContext.PipingCalculationOutputEntities
+                                                                                 .Where(e => e.PipingCalculationOutputEntityId > 0))
+            {
+                if (!pipingOutputs.ContainsKey(pipingCalculationOutputEntity))
+                {
+                    orphanedPipingCalculationOutputEntities.Add(pipingCalculationOutputEntity);
+                }
+            }
+            dbContext.PipingCalculationOutputEntities.RemoveRange(orphanedPipingCalculationOutputEntities);
+
             IList<StochasticSoilModelEntity> orphanedStochasticSoilModelEntities = new List<StochasticSoilModelEntity>();
             foreach (StochasticSoilModelEntity stochasticSoilModelEntity in dbContext.StochasticSoilModelEntities
                                                                                      .Where(e => e.StochasticSoilModelEntityId > 0))