Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs
===================================================================
diff -u -r28fdb5a8b71dab69858da9302c651679adaa556c -rf0e1aedb3765d444abd5501aa43166130e419701
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs	(.../AssemblyCategoriesCalculator.cs)	(revision 28fdb5a8b71dab69858da9302c651679adaa556c)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs	(.../AssemblyCategoriesCalculator.cs)	(revision f0e1aedb3765d444abd5501aa43166130e419701)
@@ -78,7 +78,7 @@
             try
             {
                 ICategoryLimitsCalculator kernel = factory.CreateAssemblyCategoriesKernel();
-                IEnumerable<FailureMechanismCategoryLimits> output = kernel.CalculateFailureMechanismCategoryLimitsWbi11(
+                CategoriesList<FailureMechanismCategory> output = kernel.CalculateFailureMechanismCategoryLimitsWbi11(
                     new AssessmentSection(1, assemblyCategoriesInput.SignalingNorm, assemblyCategoriesInput.LowerLimitNorm),
                     new FailureMechanism(assemblyCategoriesInput.N, assemblyCategoriesInput.FailureMechanismContribution));
 
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs
===================================================================
diff -u -r28fdb5a8b71dab69858da9302c651679adaa556c -rf0e1aedb3765d444abd5501aa43166130e419701
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs	(.../AssemblyCategoryCreator.cs)	(revision 28fdb5a8b71dab69858da9302c651679adaa556c)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs	(.../AssemblyCategoryCreator.cs)	(revision f0e1aedb3765d444abd5501aa43166130e419701)
@@ -66,8 +66,8 @@
         /// Creates a collection of <see cref="FailureMechanismAssemblyCategory"/>
         /// based on the information given in the <paramref name="categoryLimits"/>.
         /// </summary>
-        /// <param name="categoryLimits">The collection of <see cref="FailureMechanismCategoryLimits"/> to
-        /// create the result for.</param>
+        /// <param name="categoryLimits">The <see cref="CategoriesList{TCategory}"/>
+        /// with <see cref="FailureMechanismCategory"/> to create the result for.</param>
         /// <returns>A collection of <see cref="FailureMechanismAssemblyCategory"/>
         /// with information taken from the <paramref name="categoryLimits"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="categoryLimits"/> is <c>null</c>.</exception>
@@ -76,14 +76,14 @@
         /// <exception cref="NotSupportedException">Thrown when <paramref name="categoryLimits"/>
         /// contains a valid value, but unsupported.</exception>
         public static IEnumerable<FailureMechanismAssemblyCategory> CreateFailureMechanismAssemblyCategories(
-            IEnumerable<FailureMechanismCategoryLimits> categoryLimits)
+            CategoriesList<FailureMechanismCategory> categoryLimits)
         {
             if (categoryLimits == null)
             {
                 throw new ArgumentNullException(nameof(categoryLimits));
             }
 
-            return categoryLimits.Select(
+            return categoryLimits.Categories.Select(
                 categoriesOutput => new FailureMechanismAssemblyCategory(
                     categoriesOutput.LowerLimit,
                     categoriesOutput.UpperLimit,
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs
===================================================================
diff -u -r28fdb5a8b71dab69858da9302c651679adaa556c -rf0e1aedb3765d444abd5501aa43166130e419701
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs	(.../AssemblyCategoryCreatorTest.cs)	(revision 28fdb5a8b71dab69858da9302c651679adaa556c)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs	(.../AssemblyCategoryCreatorTest.cs)	(revision f0e1aedb3765d444abd5501aa43166130e419701)
@@ -146,13 +146,13 @@
             // Setup
             var random = new Random(11);
 
-            var categoryLimits = new[]
+            var categoryLimits = new CategoriesList<FailureMechanismCategory>(new[]
             {
-                new FailureMechanismCategoryLimits(random.NextEnumValue<EFailureMechanismCategory>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
-                new FailureMechanismCategoryLimits(random.NextEnumValue<EFailureMechanismCategory>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
-                new FailureMechanismCategoryLimits(random.NextEnumValue<EFailureMechanismCategory>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
-                new FailureMechanismCategoryLimits(random.NextEnumValue<EFailureMechanismCategory>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1))
-            };
+                new FailureMechanismCategory(random.NextEnumValue<EFailureMechanismCategory>(), 0.75, 1.00),
+                new FailureMechanismCategory(random.NextEnumValue<EFailureMechanismCategory>(), 0.5, 0.75),
+                new FailureMechanismCategory(random.NextEnumValue<EFailureMechanismCategory>(), 0.25, 0.5),
+                new FailureMechanismCategory(random.NextEnumValue<EFailureMechanismCategory>(), 0, 0.25)
+            });
 
             // Call
             IEnumerable<FailureMechanismAssemblyCategory> result = AssemblyCategoryCreator.CreateFailureMechanismAssemblyCategories(categoryLimits);
@@ -165,10 +165,10 @@
         public void CreateFailureMechanismAssemblyCategories_CategoryWithInvalidFailureMechanismCategory_ThrowsInvalidEnumArgumentException()
         {
             // Setup
-            var categoryLimit = new[]
+            var categoryLimit = new CategoriesList<FailureMechanismCategory>(new[]
             {
-                new FailureMechanismCategoryLimits((EFailureMechanismCategory) 99, 0, 0)
-            };
+                new FailureMechanismCategory((EFailureMechanismCategory) 99, 0, 0)
+            });
 
             // Call
             TestDelegate test = () => AssemblyCategoryCreator.CreateFailureMechanismAssemblyCategories(categoryLimit);
@@ -193,10 +193,10 @@
             FailureMechanismAssemblyCategoryGroup expectedCategoryGroup)
         {
             // Setup
-            var categoryLimits = new[]
+            var categoryLimits = new CategoriesList<FailureMechanismCategory>(new[]
             {
-                new FailureMechanismCategoryLimits(categoryGroup, 0, 0)
-            };
+                new FailureMechanismCategory(categoryGroup, 0, 0)
+            });
 
             // Call
             IEnumerable<FailureMechanismAssemblyCategory> result = AssemblyCategoryCreator.CreateFailureMechanismAssemblyCategories(categoryLimits);