Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs
===================================================================
diff -u -rf0e1aedb3765d444abd5501aa43166130e419701 -ra7ec640bfdd52b246a211fa2310933285fd40cb4
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs	(.../AssemblyCategoriesCalculator.cs)	(revision f0e1aedb3765d444abd5501aa43166130e419701)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs	(.../AssemblyCategoriesCalculator.cs)	(revision a7ec640bfdd52b246a211fa2310933285fd40cb4)
@@ -100,7 +100,7 @@
             try
             {
                 ICategoryLimitsCalculator kernel = factory.CreateAssemblyCategoriesKernel();
-                IEnumerable<FmSectionCategoryLimits> output = kernel.CalculateFmSectionCategoryLimitsWbi01(
+                CategoriesList<FmSectionCategory> output = kernel.CalculateFmSectionCategoryLimitsWbi01(
                     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 -rf0e1aedb3765d444abd5501aa43166130e419701 -ra7ec640bfdd52b246a211fa2310933285fd40cb4
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs	(.../AssemblyCategoryCreator.cs)	(revision f0e1aedb3765d444abd5501aa43166130e419701)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs	(.../AssemblyCategoryCreator.cs)	(revision a7ec640bfdd52b246a211fa2310933285fd40cb4)
@@ -94,8 +94,8 @@
         /// Creates a collection of <see cref="FailureMechanismSectionAssemblyCategory"/>
         /// based on the information given in the <paramref name="categoryLimits"/>.
         /// </summary>
-        /// <param name="categoryLimits">The collection of <see cref="FmSectionCategoryLimits"/> to
-        /// create the result for.</param>
+        /// <param name="categoryLimits">The <see cref="CategoriesList{TCategory}"/> with
+        /// <see cref="FmSectionCategory"/> to create the result for.</param>
         /// <returns>A collection of <see cref="FailureMechanismSectionAssemblyCategory"/>
         /// with information taken from the <paramref name="categoryLimits"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="categoryLimits"/> is <c>null</c>.</exception>
@@ -104,14 +104,14 @@
         /// <exception cref="NotSupportedException">Thrown when <paramref name="categoryLimits"/>
         /// contains a valid value, but unsupported.</exception>
         public static IEnumerable<FailureMechanismSectionAssemblyCategory> CreateFailureMechanismSectionAssemblyCategories(
-            IEnumerable<FmSectionCategoryLimits> categoryLimits)
+            CategoriesList<FmSectionCategory> categoryLimits)
         {
             if (categoryLimits == null)
             {
                 throw new ArgumentNullException(nameof(categoryLimits));
             }
 
-            return categoryLimits.Select(
+            return categoryLimits.Categories.Select(
                 categoriesOutput => new FailureMechanismSectionAssemblyCategory(
                     categoriesOutput.LowerLimit,
                     categoriesOutput.UpperLimit,
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs
===================================================================
diff -u -rf0e1aedb3765d444abd5501aa43166130e419701 -ra7ec640bfdd52b246a211fa2310933285fd40cb4
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs	(.../AssemblyCategoryCreatorTest.cs)	(revision f0e1aedb3765d444abd5501aa43166130e419701)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs	(.../AssemblyCategoryCreatorTest.cs)	(revision a7ec640bfdd52b246a211fa2310933285fd40cb4)
@@ -222,13 +222,13 @@
             // Setup
             var random = new Random(11);
 
-            var categoryLimits = new[]
+            var categoryLimits = new CategoriesList<FmSectionCategory>(new[]
             {
-                new FmSectionCategoryLimits(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
-                new FmSectionCategoryLimits(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
-                new FmSectionCategoryLimits(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1)),
-                new FmSectionCategoryLimits(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1))
-            };
+                new FmSectionCategory(random.NextEnumValue<EFmSectionCategory>(), 0.75, 1.00),
+                new FmSectionCategory(random.NextEnumValue<EFmSectionCategory>(), 0.5, 0.75),
+                new FmSectionCategory(random.NextEnumValue<EFmSectionCategory>(), 0.25, 0.5),
+                new FmSectionCategory(random.NextEnumValue<EFmSectionCategory>(), 0, 0.25)
+            });
 
             // Call
             IEnumerable<FailureMechanismSectionAssemblyCategory> result = AssemblyCategoryCreator.CreateFailureMechanismSectionAssemblyCategories(categoryLimits);
@@ -241,10 +241,10 @@
         public void CreateFailureMechanismSectionAssemblyCategories_CategoryWithInvalidFailureMechanismSectionCategory_ThrowsInvalidEnumArgumentException()
         {
             // Setup
-            var categoryLimit = new[]
+            var categoryLimit = new CategoriesList<FmSectionCategory>(new[]
             {
-                new FmSectionCategoryLimits((EFmSectionCategory) 99, 0, 0)
-            };
+                new FmSectionCategory((EFmSectionCategory) 99, 0, 0)
+            });
 
             // Call
             TestDelegate test = () => AssemblyCategoryCreator.CreateFailureMechanismSectionAssemblyCategories(categoryLimit);
@@ -269,10 +269,10 @@
             FailureMechanismSectionAssemblyCategoryGroup expectedCategoryGroup)
         {
             // Setup
-            var categoryLimits = new[]
+            var categoryLimits = new CategoriesList<FmSectionCategory>(new[]
             {
-                new FmSectionCategoryLimits(categoryGroup, 0, 0)
-            };
+                new FmSectionCategory(categoryGroup, 0, 1)
+            });
 
             // Call
             IEnumerable<FailureMechanismSectionAssemblyCategory> result = AssemblyCategoryCreator.CreateFailureMechanismSectionAssemblyCategories(categoryLimits);