Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresScenariosView.cs
===================================================================
diff -u -rf88343c0590cb04c7135ce141872940e59325927 -r964f8948f0ec59095ea9cc58fdabd706c4b17d22
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresScenariosView.cs	(.../ClosingStructuresScenariosView.cs)	(revision f88343c0590cb04c7135ce141872940e59325927)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresScenariosView.cs	(.../ClosingStructuresScenariosView.cs)	(revision 964f8948f0ec59095ea9cc58fdabd706c4b17d22)
@@ -128,7 +128,7 @@
             {
                 ICalculation[] calculations = data.GetCalculations().ToArray();
 
-                Dictionary<string, IList<ICalculation>> calculationsPerSegment =
+                IDictionary<string, List<ICalculation>> calculationsPerSegment =
                     StructuresHelper.CollectCalculationsPerSection(failureMechanism.Sections,
                                                                    calculations.Cast<StructuresCalculation<ClosingStructuresInput>>());
 
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -r9e6869de553715aefe4752478334c3a6a3f83340 -r964f8948f0ec59095ea9cc58fdabd706c4b17d22
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 9e6869de553715aefe4752478334c3a6a3f83340)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 964f8948f0ec59095ea9cc58fdabd706c4b17d22)
@@ -368,7 +368,7 @@
             };
         }
 
-        private static IList GetInputs(ClosingStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
+        private static IEnumerable GetInputs(ClosingStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
         {
             return new ArrayList
             {
@@ -379,7 +379,7 @@
             };
         }
 
-        private static IList GetOutputs(ClosingStructuresFailureMechanism failureMechanism)
+        private static IEnumerable GetOutputs(ClosingStructuresFailureMechanism failureMechanism)
         {
             return new ArrayList
             {
@@ -595,7 +595,7 @@
             };
         }
 
-        private void UpdateStructureDependentDataOfCalculations(IList<StructuresCalculation<ClosingStructuresInput>> calculations)
+        private void UpdateStructureDependentDataOfCalculations(IEnumerable<StructuresCalculation<ClosingStructuresInput>> calculations)
         {
             string message = RingtoetsCommonFormsResources.VerifyUpdate_Confirm_calculation_outputs_cleared;
             if (StructureDependentDataShouldUpdate(calculations, message))
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs
===================================================================
diff -u -ref881721312166028ed88eaa21dfd1ee8a5cbba4 -r964f8948f0ec59095ea9cc58fdabd706c4b17d22
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs	(.../ClosingStructuresCalculationConfigurationReaderTest.cs)	(revision ef881721312166028ed88eaa21dfd1ee8a5cbba4)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs	(.../ClosingStructuresCalculationConfigurationReaderTest.cs)	(revision 964f8948f0ec59095ea9cc58fdabd706c4b17d22)
@@ -305,7 +305,7 @@
             var reader = new ClosingStructuresCalculationConfigurationReader(filePath);
 
             // Call
-            IList<IConfigurationItem> readConfigurationItems = reader.Read().ToList();
+            List<IConfigurationItem> readConfigurationItems = reader.Read().ToList();
 
             // Assert
             Assert.AreEqual(1, readConfigurationItems.Count);
@@ -339,7 +339,7 @@
             var reader = new ClosingStructuresCalculationConfigurationReader(filePath);
 
             // Call
-            IList<IConfigurationItem> readConfigurationItems = reader.Read().ToList();
+            List<IConfigurationItem> readConfigurationItems = reader.Read().ToList();
 
             // Assert
             Assert.AreEqual(1, readConfigurationItems.Count);
@@ -397,7 +397,7 @@
             var reader = new ClosingStructuresCalculationConfigurationReader(filePath);
 
             // Call
-            IList<IConfigurationItem> readConfigurationItems = reader.Read().ToList();
+            List<IConfigurationItem> readConfigurationItems = reader.Read().ToList();
 
             // Assert
             Assert.AreEqual(1, readConfigurationItems.Count);
@@ -453,7 +453,7 @@
             var reader = new ClosingStructuresCalculationConfigurationReader(filePath);
 
             // Call
-            IList<IConfigurationItem> readConfigurationItems = reader.Read().ToList();
+            List<IConfigurationItem> readConfigurationItems = reader.Read().ToList();
 
             // Assert
             Assert.AreEqual(1, readConfigurationItems.Count);
@@ -509,7 +509,7 @@
             var reader = new ClosingStructuresCalculationConfigurationReader(filePath);
 
             // Call
-            IList<IConfigurationItem> readConfigurationItems = reader.Read().ToList();
+            List<IConfigurationItem> readConfigurationItems = reader.Read().ToList();
 
             // Assert
             Assert.AreEqual(1, readConfigurationItems.Count);
@@ -560,7 +560,7 @@
             var reader = new ClosingStructuresCalculationConfigurationReader(filePath);
 
             // Call
-            IList<IConfigurationItem> readConfigurationItems = reader.Read().ToList();
+            List<IConfigurationItem> readConfigurationItems = reader.Read().ToList();
 
             // Assert
             Assert.AreEqual(1, readConfigurationItems.Count);
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/CategoryTreeFolder.cs
===================================================================
diff -u -r6ef5e439a6d9f40ebd9926251945e0935fbbc314 -r964f8948f0ec59095ea9cc58fdabd706c4b17d22
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/CategoryTreeFolder.cs	(.../CategoryTreeFolder.cs)	(revision 6ef5e439a6d9f40ebd9926251945e0935fbbc314)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/CategoryTreeFolder.cs	(.../CategoryTreeFolder.cs)	(revision 964f8948f0ec59095ea9cc58fdabd706c4b17d22)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 
@@ -36,10 +37,10 @@
         /// <param name="name">The name of the category folder.</param>
         /// <param name="contents">The contents of the folder.</param>
         /// <param name="category">Optional: The category descriptor of the folder. Default: <see cref="TreeFolderCategory.General"/>.</param>
-        public CategoryTreeFolder(string name, IList contents, TreeFolderCategory category = TreeFolderCategory.General)
+        public CategoryTreeFolder(string name, IEnumerable contents, TreeFolderCategory category = TreeFolderCategory.General)
         {
             Name = name;
-            Contents = contents.OfType<object>().ToArray();
+            Contents = contents.OfType<object>().ToList();
             Category = category;
         }
 
@@ -51,7 +52,7 @@
         /// <summary>
         /// Gets the contents of the folder.
         /// </summary>
-        public IList Contents { get; }
+        public List<object> Contents { get; }
 
         /// <summary>
         /// Gets the category of the folder.
@@ -80,7 +81,7 @@
 
         public override int GetHashCode()
         {
-            return Contents.Cast<object>().Aggregate(Name?.GetHashCode() ?? 0, (current, content) => current ^ content.GetHashCode());
+            return Contents.Aggregate(Name?.GetHashCode() ?? 0, (current, content) => current ^ content.GetHashCode());
         }
 
         private bool Equals(CategoryTreeFolder other)
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/ScenarioSelectionControl.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r964f8948f0ec59095ea9cc58fdabd706c4b17d22
--- Ringtoets/Common/src/Ringtoets.Common.Forms/ScenarioSelectionControl.cs	(.../ScenarioSelectionControl.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/ScenarioSelectionControl.cs	(.../ScenarioSelectionControl.cs)	(revision 964f8948f0ec59095ea9cc58fdabd706c4b17d22)
@@ -56,7 +56,7 @@
         /// <param name="calculationsPerSection">The allowed calculations grouped by the name of the failure mechanism sections.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
         public void UpdateDataGridViewDataSource<T>(
-            IEnumerable<ICalculation> calculations, IEnumerable<T> scenarioRows, Dictionary<string, IList<ICalculation>> calculationsPerSection)
+            IEnumerable<ICalculation> calculations, IEnumerable<T> scenarioRows, IDictionary<string, List<ICalculation>> calculationsPerSection)
             where T : IScenarioRow<ICalculation>
         {
             if (calculations == null)
@@ -100,7 +100,7 @@
             dataGridViewControl.EndEdit();
         }
 
-        private void UpdateDataGridViewDataComboBoxesContent(Dictionary<string, IList<ICalculation>> calculationsPerSegmentName)
+        private void UpdateDataGridViewDataComboBoxesContent(IDictionary<string, List<ICalculation>> calculationsPerSegmentName)
         {
             foreach (DataGridViewRow dataGridViewRow in dataGridViewControl.Rows)
             {
@@ -122,7 +122,7 @@
                 nameof(DataGridViewComboBoxItemWrapper<ICalculation>.DisplayName));
         }
 
-        private void FillAvailableCalculationsList(DataGridViewRow dataGridViewRow, Dictionary<string, IList<ICalculation>> calculationsPerSegmentName)
+        private static void FillAvailableCalculationsList(DataGridViewRow dataGridViewRow, IDictionary<string, List<ICalculation>> calculationsPerSegmentName)
         {
             var rowData = (IScenarioRow<ICalculation>) dataGridViewRow.DataBoundItem;
             string sectionName = rowData.Name;
Index: Ringtoets/Common/src/Ringtoets.Common.Utils/AssignUnassignCalculations.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r964f8948f0ec59095ea9cc58fdabd706c4b17d22
--- Ringtoets/Common/src/Ringtoets.Common.Utils/AssignUnassignCalculations.cs	(.../AssignUnassignCalculations.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.Utils/AssignUnassignCalculations.cs	(.../AssignUnassignCalculations.cs)	(revision 964f8948f0ec59095ea9cc58fdabd706c4b17d22)
@@ -54,7 +54,7 @@
 
             SectionResultWithCalculationAssignment[] sectionResultsArray = sectionResults.ToArray();
 
-            Dictionary<string, IList<ICalculation>> calculationsPerSegmentName =
+            IDictionary<string, List<ICalculation>> calculationsPerSegmentName =
                 CollectCalculationsPerSection(sectionResultsArray.Select(sr => sr.Result.Section), calculations);
 
             return UnassignCalculationInAllSectionResultsAndAssignSingleRemainingCalculation(
@@ -68,13 +68,13 @@
         /// </summary>
         /// <param name="sections">The <see cref="FailureMechanismSection"/> objects.</param>
         /// <param name="calculations">The <see cref="CalculationWithLocation"/> objects.</param>
-        /// <returns>A <see cref="Dictionary{K, V}"/> containing a <see cref="IList{T}"/> 
+        /// <returns>A <see cref="Dictionary{K, V}"/> containing a <see cref="List{T}"/> 
         /// of <see cref="FailureMechanismSectionResult"/> objects 
         /// for each section name which has calculations.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when <paramref name="sections"/> or <paramref name="calculations"/>
         /// contains a <c>null</c> element.</exception>
-        public static Dictionary<string, IList<ICalculation>> CollectCalculationsPerSection(
+        public static IDictionary<string, List<ICalculation>> CollectCalculationsPerSection(
             IEnumerable<FailureMechanismSection> sections,
             IEnumerable<CalculationWithLocation> calculations)
         {
@@ -83,7 +83,7 @@
 
             SectionSegments[] sectionSegments = SectionSegmentsHelper.MakeSectionSegments(sections);
 
-            var calculationsPerSegment = new Dictionary<string, IList<ICalculation>>();
+            var calculationsPerSegment = new Dictionary<string, List<ICalculation>>();
 
             foreach (CalculationWithLocation calculationWithLocation in calculations)
             {
@@ -122,7 +122,7 @@
 
         private static IEnumerable<FailureMechanismSectionResult> UnassignCalculationInAllSectionResultsAndAssignSingleRemainingCalculation(
             IEnumerable<SectionResultWithCalculationAssignment> sectionResults,
-            Dictionary<string, IList<ICalculation>> calculationsPerSegmentName)
+            IDictionary<string, List<ICalculation>> calculationsPerSegmentName)
         {
             var affectedObjects = new Collection<FailureMechanismSectionResult>();
             foreach (SectionResultWithCalculationAssignment sectionResult in sectionResults)
@@ -162,7 +162,7 @@
             return SectionSegmentsHelper.GetSectionForPoint(sectionSegmentsCollection, location);
         }
 
-        private static void UpdateCalculationsOfSegment(Dictionary<string, IList<ICalculation>> calculationsPerSegment,
+        private static void UpdateCalculationsOfSegment(IDictionary<string, List<ICalculation>> calculationsPerSegment,
                                                         string sectionName, ICalculation calculation)
         {
             if (!calculationsPerSegment.ContainsKey(sectionName))
Index: Ringtoets/Common/src/Ringtoets.Common.Utils/StructuresHelper.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r964f8948f0ec59095ea9cc58fdabd706c4b17d22
--- Ringtoets/Common/src/Ringtoets.Common.Utils/StructuresHelper.cs	(.../StructuresHelper.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.Utils/StructuresHelper.cs	(.../StructuresHelper.cs)	(revision 964f8948f0ec59095ea9cc58fdabd706c4b17d22)
@@ -41,14 +41,14 @@
         /// </summary>
         /// <param name="sections">The <see cref="FailureMechanismSection"/> objects.</param>
         /// <param name="calculations">The <see cref="CalculationWithLocation"/> objects.</param>
-        /// <returns>A <see cref="Dictionary{K, V}"/> containing a <see cref="IList{T}"/> 
+        /// <returns>A <see cref="Dictionary{K, V}"/> containing a <see cref="List{T}"/> 
         /// of <see cref="FailureMechanismSectionResult"/> objects 
         /// for each section which has calculations.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>
         /// or when an element in <paramref name="calculations"/> is <c>null</c></exception>
         /// <exception cref="ArgumentException">Thrown when an element in <paramref name="sections"/> is 
         /// <c>null</c>.</exception>
-        public static Dictionary<string, IList<ICalculation>> CollectCalculationsPerSection<T>(IEnumerable<FailureMechanismSection> sections,
+        public static IDictionary<string, List<ICalculation>> CollectCalculationsPerSection<T>(IEnumerable<FailureMechanismSection> sections,
                                                                                                IEnumerable<StructuresCalculation<T>> calculations)
             where T : IStructuresCalculationInput<StructureBase>, new()
         {
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ScenarioSelectionControlTest.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r964f8948f0ec59095ea9cc58fdabd706c4b17d22
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ScenarioSelectionControlTest.cs	(.../ScenarioSelectionControlTest.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ScenarioSelectionControlTest.cs	(.../ScenarioSelectionControlTest.cs)	(revision 964f8948f0ec59095ea9cc58fdabd706c4b17d22)
@@ -157,16 +157,16 @@
                 {
                     rowA,
                     rowB
-                }, new Dictionary<string, IList<ICalculation>>
+                }, new Dictionary<string, List<ICalculation>>
                 {
                     {
-                        sectionNameA, new[]
+                        sectionNameA, new List<ICalculation>
                         {
                             calculationA
                         }
                     },
                     {
-                        sectionNameB, new[]
+                        sectionNameB, new List<ICalculation>
                         {
                             calculationB
                         }
@@ -220,10 +220,10 @@
                 }, new[]
                 {
                     row
-                }, new Dictionary<string, IList<ICalculation>>
+                }, new Dictionary<string, List<ICalculation>>
                 {
                     {
-                        sectionName, new[]
+                        sectionName, new List<ICalculation>
                         {
                             calculation
                         }
@@ -265,10 +265,10 @@
                 }, new[]
                 {
                     row
-                }, new Dictionary<string, IList<ICalculation>>
+                }, new Dictionary<string, List<ICalculation>>
                 {
                     {
-                        sectionName, new[]
+                        sectionName, new List<ICalculation>
                         {
                             calculation
                         }
Index: Ringtoets/Common/test/Ringtoets.Common.Utils.Test/AssignUnassignCalculationsTest.cs
===================================================================
diff -u -r6ef5e439a6d9f40ebd9926251945e0935fbbc314 -r964f8948f0ec59095ea9cc58fdabd706c4b17d22
--- Ringtoets/Common/test/Ringtoets.Common.Utils.Test/AssignUnassignCalculationsTest.cs	(.../AssignUnassignCalculationsTest.cs)	(revision 6ef5e439a6d9f40ebd9926251945e0935fbbc314)
+++ Ringtoets/Common/test/Ringtoets.Common.Utils.Test/AssignUnassignCalculationsTest.cs	(.../AssignUnassignCalculationsTest.cs)	(revision 964f8948f0ec59095ea9cc58fdabd706c4b17d22)
@@ -268,7 +268,7 @@
             mockRepository.ReplayAll();
 
             // Call
-            Dictionary<string, IList<ICalculation>> collectCalculationsPerSegment =
+            IDictionary<string, List<ICalculation>> collectCalculationsPerSegment =
                 AssignUnassignCalculations.CollectCalculationsPerSection(Enumerable.Empty<FailureMechanismSection>(), twoCalculationsInFirstSection);
 
             // Assert
@@ -280,7 +280,7 @@
         public void CollectCalculationsPerSegment_ValidEmptyCalculations_EmptyDictionary()
         {
             // Call
-            Dictionary<string, IList<ICalculation>> collectCalculationsPerSegment =
+            IDictionary<string, List<ICalculation>> collectCalculationsPerSegment =
                 AssignUnassignCalculations.CollectCalculationsPerSection(oneSection, Enumerable.Empty<CalculationWithLocation>());
 
             // Assert
@@ -296,7 +296,7 @@
             mockRepository.ReplayAll();
 
             // Call
-            Dictionary<string, IList<ICalculation>> collectCalculationsPerSegment =
+            IDictionary<string, List<ICalculation>> collectCalculationsPerSegment =
                 AssignUnassignCalculations.CollectCalculationsPerSection(twoSections, twoCalculationsInFirstSection);
 
             // Assert
@@ -314,7 +314,7 @@
             mockRepository.ReplayAll();
 
             // Call
-            Dictionary<string, IList<ICalculation>> collectCalculationsPerSegment =
+            IDictionary<string, List<ICalculation>> collectCalculationsPerSegment =
                 AssignUnassignCalculations.CollectCalculationsPerSection(twoSections, oneCalculationInEachSection);
 
             // Assert
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsScenariosView.cs
===================================================================
diff -u -raeb6e1a439617630e7613b9ed5af152c345fa2c6 -r964f8948f0ec59095ea9cc58fdabd706c4b17d22
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsScenariosView.cs	(.../GrassCoverErosionInwardsScenariosView.cs)	(revision aeb6e1a439617630e7613b9ed5af152c345fa2c6)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsScenariosView.cs	(.../GrassCoverErosionInwardsScenariosView.cs)	(revision 964f8948f0ec59095ea9cc58fdabd706c4b17d22)
@@ -127,7 +127,7 @@
             {
                 ICalculation[] calculations = data.GetCalculations().ToArray();
 
-                Dictionary<string, IList<ICalculation>> calculationsPerSegment =
+                IDictionary<string, List<ICalculation>> calculationsPerSegment =
                     GrassCoverErosionInwardsHelper.CollectCalculationsPerSection(failureMechanism.Sections, calculations.Cast<GrassCoverErosionInwardsCalculation>());
 
                 List<GrassCoverErosionInwardsScenarioRow> scenarioRows =
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs
===================================================================
diff -u -r7947681ebba776d55c4f78782360256800fa5d1f -r964f8948f0ec59095ea9cc58fdabd706c4b17d22
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision 7947681ebba776d55c4f78782360256800fa5d1f)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision 964f8948f0ec59095ea9cc58fdabd706c4b17d22)
@@ -539,7 +539,7 @@
             };
         }
 
-        private static IList GetInputs(GrassCoverErosionInwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
+        private static IEnumerable GetInputs(GrassCoverErosionInwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
         {
             return new ArrayList
             {
@@ -549,7 +549,7 @@
             };
         }
 
-        private static IList GetOutputs(GrassCoverErosionInwardsFailureMechanism failureMechanism)
+        private static IEnumerable GetOutputs(GrassCoverErosionInwardsFailureMechanism failureMechanism)
         {
             return new ArrayList
             {
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Utils/GrassCoverErosionInwardsHelper.cs
===================================================================
diff -u -rd337718251f4330d447d555eb1c70df226dd9823 -r964f8948f0ec59095ea9cc58fdabd706c4b17d22
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Utils/GrassCoverErosionInwardsHelper.cs	(.../GrassCoverErosionInwardsHelper.cs)	(revision d337718251f4330d447d555eb1c70df226dd9823)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Utils/GrassCoverErosionInwardsHelper.cs	(.../GrassCoverErosionInwardsHelper.cs)	(revision 964f8948f0ec59095ea9cc58fdabd706c4b17d22)
@@ -41,14 +41,14 @@
         /// </summary>
         /// <param name="sections">The <see cref="FailureMechanismSection"/> objects.</param>
         /// <param name="calculations">The <see cref="CalculationWithLocation"/> objects.</param>
-        /// <returns>A <see cref="Dictionary{K, V}"/> containing a <see cref="IList{T}"/> 
+        /// <returns>A <see cref="Dictionary{K, V}"/> containing a <see cref="List{T}"/> 
         /// of <see cref="GrassCoverErosionInwardsCalculation"/> objects 
         /// for each section which has calculations.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>
         /// or when an element in <paramref name="calculations"/> is <c>null</c></exception>
         /// <exception cref="ArgumentException">Thrown when an element in <paramref name="sections"/> is 
         /// <c>null</c>.</exception>
-        public static Dictionary<string, IList<ICalculation>> CollectCalculationsPerSection(IEnumerable<FailureMechanismSection> sections,
+        public static IDictionary<string, List<ICalculation>> CollectCalculationsPerSection(IEnumerable<FailureMechanismSection> sections,
                                                                                             IEnumerable<GrassCoverErosionInwardsCalculation> calculations)
         {
             return AssignUnassignCalculations.CollectCalculationsPerSection(sections, CalculationsToCalculationsWithLocations(calculations));
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresScenariosView.cs
===================================================================
diff -u -r4bf59bb3506b840b284efe0c0f4431b7876e0e5b -r964f8948f0ec59095ea9cc58fdabd706c4b17d22
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresScenariosView.cs	(.../HeightStructuresScenariosView.cs)	(revision 4bf59bb3506b840b284efe0c0f4431b7876e0e5b)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresScenariosView.cs	(.../HeightStructuresScenariosView.cs)	(revision 964f8948f0ec59095ea9cc58fdabd706c4b17d22)
@@ -128,7 +128,7 @@
             {
                 ICalculation[] calculations = data.GetCalculations().ToArray();
 
-                Dictionary<string, IList<ICalculation>> calculationsPerSegment =
+                IDictionary<string, List<ICalculation>> calculationsPerSegment =
                     StructuresHelper.CollectCalculationsPerSection(failureMechanism.Sections, calculations.Cast<StructuresCalculation<HeightStructuresInput>>());
 
                 List<HeightStructuresScenarioRow> scenarioRows =
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -r9e6869de553715aefe4752478334c3a6a3f83340 -r964f8948f0ec59095ea9cc58fdabd706c4b17d22
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 9e6869de553715aefe4752478334c3a6a3f83340)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 964f8948f0ec59095ea9cc58fdabd706c4b17d22)
@@ -381,7 +381,7 @@
             };
         }
 
-        private static IList GetInputs(HeightStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
+        private static IEnumerable GetInputs(HeightStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
         {
             return new ArrayList
             {
@@ -392,7 +392,7 @@
             };
         }
 
-        private static IList GetOutputs(HeightStructuresFailureMechanism failureMechanism)
+        private static IEnumerable GetOutputs(HeightStructuresFailureMechanism failureMechanism)
         {
             return new ArrayList
             {
@@ -607,7 +607,7 @@
             };
         }
 
-        private void UpdateStructureDependentDataOfCalculations(IList<StructuresCalculation<HeightStructuresInput>> calculations)
+        private void UpdateStructureDependentDataOfCalculations(IEnumerable<StructuresCalculation<HeightStructuresInput>> calculations)
         {
             string message = RingtoetsCommonFormsResources.VerifyUpdate_Confirm_calculation_outputs_cleared;
             if (StructureDependentDataShouldUpdate(calculations, message))
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresScenariosView.cs
===================================================================
diff -u -rf765cbda8002f3db4b7855ba9933899f7ebcf820 -r964f8948f0ec59095ea9cc58fdabd706c4b17d22
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresScenariosView.cs	(.../StabilityPointStructuresScenariosView.cs)	(revision f765cbda8002f3db4b7855ba9933899f7ebcf820)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresScenariosView.cs	(.../StabilityPointStructuresScenariosView.cs)	(revision 964f8948f0ec59095ea9cc58fdabd706c4b17d22)
@@ -128,7 +128,7 @@
             {
                 ICalculation[] calculations = data.GetCalculations().ToArray();
 
-                Dictionary<string, IList<ICalculation>> calculationsPerSegment =
+                IDictionary<string, List<ICalculation>> calculationsPerSegment =
                     StructuresHelper.CollectCalculationsPerSection(failureMechanism.Sections,
                                                                    calculations.Cast<StructuresCalculation<StabilityPointStructuresInput>>());
 
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -r9e6869de553715aefe4752478334c3a6a3f83340 -r964f8948f0ec59095ea9cc58fdabd706c4b17d22
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 9e6869de553715aefe4752478334c3a6a3f83340)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 964f8948f0ec59095ea9cc58fdabd706c4b17d22)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
@@ -386,10 +387,10 @@
             };
         }
 
-        private static object[] GetInputs(StabilityPointStructuresFailureMechanism failureMechanism,
+        private static IEnumerable GetInputs(StabilityPointStructuresFailureMechanism failureMechanism,
                                           IAssessmentSection assessmentSection)
         {
-            return new object[]
+            return new ArrayList
             {
                 new FailureMechanismSectionsContext(failureMechanism, assessmentSection),
                 new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection),
@@ -398,9 +399,9 @@
             };
         }
 
-        private static object[] GetOutputs(StabilityPointStructuresFailureMechanism failureMechanism)
+        private static IEnumerable GetOutputs(StabilityPointStructuresFailureMechanism failureMechanism)
         {
-            return new object[]
+            return new ArrayList
             {
                 new StabilityPointStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
                 new FailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>(