Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/CalculationGroupEntityReadExtentions.cs
===================================================================
diff -u -r3fa8664290181eedfdcefbe87f32aa7539d748e3 -rbba617101367a21a38bf41ad520662058b9012af
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/CalculationGroupEntityReadExtentions.cs	(.../CalculationGroupEntityReadExtentions.cs)	(revision 3fa8664290181eedfdcefbe87f32aa7539d748e3)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/CalculationGroupEntityReadExtentions.cs	(.../CalculationGroupEntityReadExtentions.cs)	(revision bba617101367a21a38bf41ad520662058b9012af)
@@ -25,6 +25,7 @@
 using Application.Ringtoets.Storage.DbContext;
 
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Piping.Data;
 
 namespace Application.Ringtoets.Storage.Read
 {
@@ -41,14 +42,20 @@
         /// <param name="entity">The <see cref="CalculationGroupEntity"/> to create 
         /// <see cref="CalculationGroup"/> for.</param>
         /// <param name="collector">The object keeping track of read operations.</param>
+        /// <param name="generalPipingInput">The calculation input parameters for piping.</param>
         /// <returns>A new <see cref="CalculationGroup"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="collector"/> is <c>null</c>.</exception>
-        internal static CalculationGroup Read(this CalculationGroupEntity entity, ReadConversionCollector collector)
+        internal static CalculationGroup ReadPipingCalculationGroup(this CalculationGroupEntity entity, ReadConversionCollector collector,
+                                                                    GeneralPipingInput generalPipingInput)
         {
             if (collector == null)
             {
                 throw new ArgumentNullException("collector");
             }
+            if (generalPipingInput == null)
+            {
+                throw new ArgumentNullException("generalPipingInput");
+            }
             var group = new CalculationGroup(entity.Name, Convert.ToBoolean(entity.IsEditable))
             {
                 StorageId = entity.CalculationGroupEntityId
@@ -58,8 +65,13 @@
                 var childCalculationGroupEntity = childEntity as CalculationGroupEntity;
                 if (childCalculationGroupEntity != null)
                 {
-                    group.Children.Add(childCalculationGroupEntity.Read(collector));
+                    group.Children.Add(childCalculationGroupEntity.ReadPipingCalculationGroup(collector, generalPipingInput));
                 }
+                var childPipingCalculationEntity = childEntity as PipingCalculationEntity;
+                if (childPipingCalculationEntity != null)
+                {
+                    group.Children.Add(childPipingCalculationEntity.Read(collector, generalPipingInput));
+                }
             }
 
             return group;
@@ -72,6 +84,10 @@
             {
                 sortedList.Add(groupEntity.Order, groupEntity);
             }
+            foreach (PipingCalculationEntity pipingCalculationEntity in entity.PipingCalculationEntities)
+            {
+                sortedList.Add(pipingCalculationEntity.Order, pipingCalculationEntity);
+            }
             return sortedList.Values;
         }
     }