Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -r99f5c8f535c01eb9882a703e09572ab4b5fe3d97 -r9e6869de553715aefe4752478334c3a6a3f83340
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 99f5c8f535c01eb9882a703e09572ab4b5fe3d97)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 9e6869de553715aefe4752478334c3a6a3f83340)
@@ -384,7 +384,7 @@
             AssessmentSection section = entity.Read(collector);
 
             // Assert
-            IList<ICalculationBase> childCalculationGroups = section.PipingFailureMechanism.CalculationsGroup.Children;
+            List<ICalculationBase> childCalculationGroups = section.PipingFailureMechanism.CalculationsGroup.Children;
             Assert.AreEqual(2, childCalculationGroups.Count);
         }
 
@@ -511,7 +511,7 @@
             AssessmentSection section = entity.Read(collector);
 
             // Assert
-            IList<ICalculationBase> childCalculationGroups = section.GrassCoverErosionInwards.CalculationsGroup.Children;
+            List<ICalculationBase> childCalculationGroups = section.GrassCoverErosionInwards.CalculationsGroup.Children;
             Assert.AreEqual(2, childCalculationGroups.Count);
         }
 
@@ -631,7 +631,7 @@
             AssessmentSection section = entity.Read(collector);
 
             // Assert
-            IList<ICalculationBase> childCalculationGroups = section.GrassCoverErosionOutwards.WaveConditionsCalculationGroup.Children;
+            List<ICalculationBase> childCalculationGroups = section.GrassCoverErosionOutwards.WaveConditionsCalculationGroup.Children;
             Assert.AreEqual(2, childCalculationGroups.Count);
         }
 
@@ -766,7 +766,7 @@
             AssessmentSection section = entity.Read(collector);
 
             // Assert
-            IList<ICalculationBase> childCalculationGroups = section.StabilityStoneCover.WaveConditionsCalculationGroup.Children;
+            List<ICalculationBase> childCalculationGroups = section.StabilityStoneCover.WaveConditionsCalculationGroup.Children;
             Assert.AreEqual(2, childCalculationGroups.Count);
         }
 
@@ -959,7 +959,7 @@
             AssessmentSection section = entity.Read(collector);
 
             // Assert
-            IList<ICalculationBase> childCalculationGroups = section.WaveImpactAsphaltCover.WaveConditionsCalculationGroup.Children;
+            List<ICalculationBase> childCalculationGroups = section.WaveImpactAsphaltCover.WaveConditionsCalculationGroup.Children;
             Assert.AreEqual(2, childCalculationGroups.Count);
         }
 
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -r7947681ebba776d55c4f78782360256800fa5d1f -r9e6869de553715aefe4752478334c3a6a3f83340
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 7947681ebba776d55c4f78782360256800fa5d1f)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 9e6869de553715aefe4752478334c3a6a3f83340)
@@ -641,7 +641,7 @@
             }
         }
 
-        private static void GenerateClosingStructuresCalculations(ClosingStructuresFailureMechanism failureMechanism, IEnumerable<ClosingStructure> structures, IList<ICalculationBase> calculations)
+        private static void GenerateClosingStructuresCalculations(ClosingStructuresFailureMechanism failureMechanism, IEnumerable<ClosingStructure> structures, List<ICalculationBase> calculations)
         {
             foreach (ClosingStructure structure in structures)
             {
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/CalculationGroup.cs
===================================================================
diff -u -rfb83f35cff901948b621ab14c2064590b33f17a0 -r9e6869de553715aefe4752478334c3a6a3f83340
--- Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/CalculationGroup.cs	(.../CalculationGroup.cs)	(revision fb83f35cff901948b621ab14c2064590b33f17a0)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/CalculationGroup.cs	(.../CalculationGroup.cs)	(revision 9e6869de553715aefe4752478334c3a6a3f83340)
@@ -60,7 +60,7 @@
         /// <summary>
         /// Gets the children that define this group.
         /// </summary>
-        public IList<ICalculationBase> Children { get; private set; }
+        public List<ICalculationBase> Children { get; private set; }
 
         public string Name
         {
@@ -82,7 +82,7 @@
         {
             var clone = (CalculationGroup) MemberwiseClone();
 
-            clone.Children = Children.Select(c => (ICalculationBase) c.Clone()).ToArray();
+            clone.Children = Children.Select(c => (ICalculationBase) c.Clone()).ToList();
 
             return clone;
         }
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs
===================================================================
diff -u -red4051ed5a4979fcc002c2d2100ac1c80007dd1b -r9e6869de553715aefe4752478334c3a6a3f83340
--- Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs	(.../RingtoetsContextMenuItemFactory.cs)	(revision ed4051ed5a4979fcc002c2d2100ac1c80007dd1b)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs	(.../RingtoetsContextMenuItemFactory.cs)	(revision 9e6869de553715aefe4752478334c3a6a3f83340)
@@ -21,7 +21,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
@@ -202,7 +201,7 @@
                 (o, args) =>
                 {
                     CalculationGroup parent = calculationItemContext.Parent;
-                    IList<ICalculationBase> currentChildren = parent.Children;
+                    List<ICalculationBase> currentChildren = parent.Children;
                     int calculationItemIndex = currentChildren.IndexOf(calculationItem);
 
                     var copy = (TCalculationItem) calculationItem.Clone();
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/GrassCoverErosionOutwardsWaveConditionsCalculationHelper.cs
===================================================================
diff -u -rf765cbda8002f3db4b7855ba9933899f7ebcf820 -r9e6869de553715aefe4752478334c3a6a3f83340
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/GrassCoverErosionOutwardsWaveConditionsCalculationHelper.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationHelper.cs)	(revision f765cbda8002f3db4b7855ba9933899f7ebcf820)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/GrassCoverErosionOutwardsWaveConditionsCalculationHelper.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationHelper.cs)	(revision 9e6869de553715aefe4752478334c3a6a3f83340)
@@ -42,7 +42,7 @@
         /// <param name="calculations">The list to update.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
         public static void AddCalculationsFromLocations(IEnumerable<HydraulicBoundaryLocation> locations,
-                                                        IList<ICalculationBase> calculations)
+                                                        List<ICalculationBase> calculations)
         {
             if (locations == null)
             {
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r8b60c9e846480f3ffeeb263bfea5d3367bf6bee3 -r9e6869de553715aefe4752478334c3a6a3f83340
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 8b60c9e846480f3ffeeb263bfea5d3367bf6bee3)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 9e6869de553715aefe4752478334c3a6a3f83340)
@@ -748,7 +748,7 @@
         }
 
         private static void GenerateGrassCoverErosionOutwardsWaveConditionsCalculations(IEnumerable<HydraulicBoundaryLocation> hydraulicBoundaryLocations,
-                                                                                        IList<ICalculationBase> calculationCollection)
+                                                                                        List<ICalculationBase> calculationCollection)
         {
             GrassCoverErosionOutwardsWaveConditionsCalculationHelper.AddCalculationsFromLocations(
                 hydraulicBoundaryLocations,
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -r7947681ebba776d55c4f78782360256800fa5d1f -r9e6869de553715aefe4752478334c3a6a3f83340
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 7947681ebba776d55c4f78782360256800fa5d1f)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 9e6869de553715aefe4752478334c3a6a3f83340)
@@ -654,7 +654,7 @@
             }
         }
 
-        private static void GenerateHeightStructuresCalculations(HeightStructuresFailureMechanism failureMechanism, IEnumerable<HeightStructure> structures, IList<ICalculationBase> calculations)
+        private static void GenerateHeightStructuresCalculations(HeightStructuresFailureMechanism failureMechanism, IEnumerable<HeightStructure> structures, List<ICalculationBase> calculations)
         {
             foreach (HeightStructure structure in structures)
             {
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -r7947681ebba776d55c4f78782360256800fa5d1f -r9e6869de553715aefe4752478334c3a6a3f83340
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 7947681ebba776d55c4f78782360256800fa5d1f)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 9e6869de553715aefe4752478334c3a6a3f83340)
@@ -652,7 +652,7 @@
             }
         }
 
-        private static void GenerateStabilityPointStructuresCalculations(StabilityPointStructuresFailureMechanism failureMechanism, IEnumerable<StabilityPointStructure> structures, IList<ICalculationBase> calculations)
+        private static void GenerateStabilityPointStructuresCalculations(StabilityPointStructuresFailureMechanism failureMechanism, IEnumerable<StabilityPointStructure> structures, List<ICalculationBase> calculations)
         {
             foreach (StabilityPointStructure structure in structures)
             {
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/StabilityStoneCoverCalculationConfigurationHelper.cs
===================================================================
diff -u -r94f2ec1496623ae488b567f883e66b4d26243441 -r9e6869de553715aefe4752478334c3a6a3f83340
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/StabilityStoneCoverCalculationConfigurationHelper.cs	(.../StabilityStoneCoverCalculationConfigurationHelper.cs)	(revision 94f2ec1496623ae488b567f883e66b4d26243441)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/StabilityStoneCoverCalculationConfigurationHelper.cs	(.../StabilityStoneCoverCalculationConfigurationHelper.cs)	(revision 9e6869de553715aefe4752478334c3a6a3f83340)
@@ -43,7 +43,7 @@
         /// <exception cref="ArgumentNullException">Throw when any input parameter is <c>null</c>.</exception>
         public static void AddCalculationsFromLocations(
             IEnumerable<HydraulicBoundaryLocation> locations,
-            IList<ICalculationBase> calculations
+            List<ICalculationBase> calculations
         )
         {
             if (locations == null)
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -r8b60c9e846480f3ffeeb263bfea5d3367bf6bee3 -r9e6869de553715aefe4752478334c3a6a3f83340
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 8b60c9e846480f3ffeeb263bfea5d3367bf6bee3)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 9e6869de553715aefe4752478334c3a6a3f83340)
@@ -468,7 +468,7 @@
         }
 
         private static void GenerateStabilityStoneCoverCalculations(IEnumerable<HydraulicBoundaryLocation> hydraulicBoundaryLocations,
-                                                                    IList<ICalculationBase> calculationCollection)
+                                                                    List<ICalculationBase> calculationCollection)
         {
             StabilityStoneCoverCalculationConfigurationHelper.AddCalculationsFromLocations(
                 hydraulicBoundaryLocations,
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.cs
===================================================================
diff -u -rf765cbda8002f3db4b7855ba9933899f7ebcf820 -r9e6869de553715aefe4752478334c3a6a3f83340
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.cs)	(revision f765cbda8002f3db4b7855ba9933899f7ebcf820)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.cs)	(revision 9e6869de553715aefe4752478334c3a6a3f83340)
@@ -42,7 +42,7 @@
         /// <param name="calculations">The list to update.</param>
         /// <exception cref="ArgumentNullException">Throw when any input parameter is <c>null</c>.</exception>
         public static void AddCalculationsFromLocations(IEnumerable<HydraulicBoundaryLocation> locations,
-                                                        IList<ICalculationBase> calculations)
+                                                        List<ICalculationBase> calculations)
         {
             if (locations == null)
             {
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -r8b60c9e846480f3ffeeb263bfea5d3367bf6bee3 -r9e6869de553715aefe4752478334c3a6a3f83340
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 8b60c9e846480f3ffeeb263bfea5d3367bf6bee3)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 9e6869de553715aefe4752478334c3a6a3f83340)
@@ -472,7 +472,7 @@
         }
 
         private static void GenerateWaveImpactAsphaltCoverWaveConditionsCalculations(IEnumerable<HydraulicBoundaryLocation> hydraulicBoundaryLocations,
-                                                                                     IList<ICalculationBase> calculationCollection)
+                                                                                     List<ICalculationBase> calculationCollection)
         {
             WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.AddCalculationsFromLocations(
                 hydraulicBoundaryLocations,