Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableAssembly.cs
===================================================================
diff -u -r89fbfe6eb9c1a0778dfc25531b2bf139aa454fe3 -rf610fd08d6d26cb5fc5db3da3c7267e66cf208b9
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableAssembly.cs	(.../SerializableAssembly.cs)	(revision 89fbfe6eb9c1a0778dfc25531b2bf139aa454fe3)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableAssembly.cs	(.../SerializableAssembly.cs)	(revision f610fd08d6d26cb5fc5db3da3c7267e66cf208b9)
@@ -45,12 +45,9 @@
         /// <param name="id">The unique ID of the assembly.</param>
         /// <param name="lowerCorner">The lower corner of the assembly map boundary.</param>
         /// <param name="upperCorner">The upper corner of the assembly map boundary.</param>
-        /// <param name="assessmentSections">The collection of <see cref="SerializableAssessmentSection"/> that
-        /// belong to the assembly.</param>
-        /// <param name="assessmentProcesses">The collection of <see cref="SerializableAssessmentProcess"/> that
-        /// belong to the assembly.</param>
-        /// <param name="totalAssemblyResults">The collection of <see cref="SerializableTotalAssemblyResult"/> that
-        /// belong to the assembly.</param>
+        /// <param name="assessmentSection">The <see cref="SerializableAssessmentSection"/> that belongs to the assembly.</param>
+        /// <param name="assessmentProcess">The <see cref="SerializableAssessmentProcess"/> that belongs to the assembly.</param>
+        /// <param name="totalAssemblyResult">The <see cref="SerializableTotalAssemblyResult"/> that belongs to the assembly.</param>
         /// <param name="failureMechanisms">The collection of <see cref="SerializableFailureMechanism"/> that
         /// belong to the assembly.</param>
         /// <param name="failureMechanismSectionAssemblies">The collection of <see cref="SerializableFailureMechanismSectionAssembly"/> that
@@ -65,9 +62,9 @@
         public SerializableAssembly(string id,
                                     Point2D lowerCorner,
                                     Point2D upperCorner,
-                                    IEnumerable<SerializableAssessmentSection> assessmentSections,
-                                    IEnumerable<SerializableAssessmentProcess> assessmentProcesses,
-                                    IEnumerable<SerializableTotalAssemblyResult> totalAssemblyResults,
+                                    SerializableAssessmentSection assessmentSection,
+                                    SerializableAssessmentProcess assessmentProcess,
+                                    SerializableTotalAssemblyResult totalAssemblyResult,
                                     IEnumerable<SerializableFailureMechanism> failureMechanisms,
                                     IEnumerable<SerializableFailureMechanismSectionAssembly> failureMechanismSectionAssemblies,
                                     IEnumerable<SerializableCombinedFailureMechanismSectionAssembly> combinedFailureMechanismSectionAssemblies,
@@ -89,19 +86,19 @@
                 throw new ArgumentNullException(nameof(upperCorner));
             }
 
-            if (assessmentSections == null)
+            if (assessmentSection == null)
             {
-                throw new ArgumentNullException(nameof(assessmentSections));
+                throw new ArgumentNullException(nameof(assessmentSection));
             }
 
-            if (assessmentProcesses == null)
+            if (assessmentProcess == null)
             {
-                throw new ArgumentNullException(nameof(assessmentProcesses));
+                throw new ArgumentNullException(nameof(assessmentProcess));
             }
 
-            if (totalAssemblyResults == null)
+            if (totalAssemblyResult == null)
             {
-                throw new ArgumentNullException(nameof(totalAssemblyResults));
+                throw new ArgumentNullException(nameof(totalAssemblyResult));
             }
 
             if (failureMechanisms == null)
@@ -133,9 +130,9 @@
             Boundary = new SerializableBoundary(lowerCorner, upperCorner);
 
             var featureMembers = new List<SerializableFeatureMember>();
-            featureMembers.AddRange(assessmentSections);
-            featureMembers.AddRange(assessmentProcesses);
-            featureMembers.AddRange(totalAssemblyResults);
+            featureMembers.Add(assessmentSection);
+            featureMembers.Add(assessmentProcess);
+            featureMembers.Add(totalAssemblyResult);
             featureMembers.AddRange(failureMechanisms);
             featureMembers.AddRange(failureMechanismSectionAssemblies);
             featureMembers.AddRange(combinedFailureMechanismSectionAssemblies);
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssemblyTest.cs
===================================================================
diff -u -r73d88f2715565f646c8f1d6d8f4f828f808a8751 -rf610fd08d6d26cb5fc5db3da3c7267e66cf208b9
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssemblyTest.cs	(.../SerializableAssemblyTest.cs)	(revision 73d88f2715565f646c8f1d6d8f4f828f808a8751)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssemblyTest.cs	(.../SerializableAssemblyTest.cs)	(revision f610fd08d6d26cb5fc5db3da3c7267e66cf208b9)
@@ -84,9 +84,9 @@
             TestDelegate call = () => new SerializableAssembly(null,
                                                                new Point2D(random.NextDouble(), random.NextDouble()),
                                                                new Point2D(random.NextDouble(), random.NextDouble()),
-                                                               Enumerable.Empty<SerializableAssessmentSection>(),
-                                                               Enumerable.Empty<SerializableAssessmentProcess>(),
-                                                               Enumerable.Empty<SerializableTotalAssemblyResult>(),
+                                                               new SerializableAssessmentSection(),
+                                                               new SerializableAssessmentProcess(),
+                                                               new SerializableTotalAssemblyResult(),
                                                                Enumerable.Empty<SerializableFailureMechanism>(),
                                                                Enumerable.Empty<SerializableFailureMechanismSectionAssembly>(),
                                                                Enumerable.Empty<SerializableCombinedFailureMechanismSectionAssembly>(),
@@ -108,9 +108,9 @@
             TestDelegate call = () => new SerializableAssembly(string.Empty,
                                                                null,
                                                                new Point2D(random.NextDouble(), random.NextDouble()),
-                                                               Enumerable.Empty<SerializableAssessmentSection>(),
-                                                               Enumerable.Empty<SerializableAssessmentProcess>(),
-                                                               Enumerable.Empty<SerializableTotalAssemblyResult>(),
+                                                               new SerializableAssessmentSection(),
+                                                               new SerializableAssessmentProcess(),
+                                                               new SerializableTotalAssemblyResult(),
                                                                Enumerable.Empty<SerializableFailureMechanism>(),
                                                                Enumerable.Empty<SerializableFailureMechanismSectionAssembly>(),
                                                                Enumerable.Empty<SerializableCombinedFailureMechanismSectionAssembly>(),
@@ -132,9 +132,9 @@
             TestDelegate call = () => new SerializableAssembly(string.Empty,
                                                                new Point2D(random.NextDouble(), random.NextDouble()),
                                                                null,
-                                                               Enumerable.Empty<SerializableAssessmentSection>(),
-                                                               Enumerable.Empty<SerializableAssessmentProcess>(),
-                                                               Enumerable.Empty<SerializableTotalAssemblyResult>(),
+                                                               new SerializableAssessmentSection(),
+                                                               new SerializableAssessmentProcess(),
+                                                               new SerializableTotalAssemblyResult(),
                                                                Enumerable.Empty<SerializableFailureMechanism>(),
                                                                Enumerable.Empty<SerializableFailureMechanismSectionAssembly>(),
                                                                Enumerable.Empty<SerializableCombinedFailureMechanismSectionAssembly>(),
@@ -156,8 +156,8 @@
                                                                new Point2D(random.NextDouble(), random.NextDouble()),
                                                                new Point2D(random.NextDouble(), random.NextDouble()),
                                                                null,
-                                                               Enumerable.Empty<SerializableAssessmentProcess>(),
-                                                               Enumerable.Empty<SerializableTotalAssemblyResult>(),
+                                                               new SerializableAssessmentProcess(),
+                                                               new SerializableTotalAssemblyResult(),
                                                                Enumerable.Empty<SerializableFailureMechanism>(),
                                                                Enumerable.Empty<SerializableFailureMechanismSectionAssembly>(),
                                                                Enumerable.Empty<SerializableCombinedFailureMechanismSectionAssembly>(),
@@ -178,9 +178,9 @@
             TestDelegate call = () => new SerializableAssembly(string.Empty,
                                                                new Point2D(random.NextDouble(), random.NextDouble()),
                                                                new Point2D(random.NextDouble(), random.NextDouble()),
-                                                               Enumerable.Empty<SerializableAssessmentSection>(),
+                                                               new SerializableAssessmentSection(),
                                                                null,
-                                                               Enumerable.Empty<SerializableTotalAssemblyResult>(),
+                                                               new SerializableTotalAssemblyResult(),
                                                                Enumerable.Empty<SerializableFailureMechanism>(),
                                                                Enumerable.Empty<SerializableFailureMechanismSectionAssembly>(),
                                                                Enumerable.Empty<SerializableCombinedFailureMechanismSectionAssembly>(),
@@ -201,8 +201,8 @@
             TestDelegate call = () => new SerializableAssembly(string.Empty,
                                                                new Point2D(random.NextDouble(), random.NextDouble()),
                                                                new Point2D(random.NextDouble(), random.NextDouble()),
-                                                               Enumerable.Empty<SerializableAssessmentSection>(),
-                                                               Enumerable.Empty<SerializableAssessmentProcess>(),
+                                                               new SerializableAssessmentSection(),
+                                                               new SerializableAssessmentProcess(),
                                                                null,
                                                                Enumerable.Empty<SerializableFailureMechanism>(),
                                                                Enumerable.Empty<SerializableFailureMechanismSectionAssembly>(),
@@ -224,9 +224,9 @@
             TestDelegate call = () => new SerializableAssembly(string.Empty,
                                                                new Point2D(random.NextDouble(), random.NextDouble()),
                                                                new Point2D(random.NextDouble(), random.NextDouble()),
-                                                               Enumerable.Empty<SerializableAssessmentSection>(),
-                                                               Enumerable.Empty<SerializableAssessmentProcess>(),
-                                                               Enumerable.Empty<SerializableTotalAssemblyResult>(),
+                                                               new SerializableAssessmentSection(),
+                                                               new SerializableAssessmentProcess(),
+                                                               new SerializableTotalAssemblyResult(),
                                                                null,
                                                                Enumerable.Empty<SerializableFailureMechanismSectionAssembly>(),
                                                                Enumerable.Empty<SerializableCombinedFailureMechanismSectionAssembly>(),
@@ -247,9 +247,9 @@
             TestDelegate call = () => new SerializableAssembly(string.Empty,
                                                                new Point2D(random.NextDouble(), random.NextDouble()),
                                                                new Point2D(random.NextDouble(), random.NextDouble()),
-                                                               Enumerable.Empty<SerializableAssessmentSection>(),
-                                                               Enumerable.Empty<SerializableAssessmentProcess>(),
-                                                               Enumerable.Empty<SerializableTotalAssemblyResult>(),
+                                                               new SerializableAssessmentSection(),
+                                                               new SerializableAssessmentProcess(),
+                                                               new SerializableTotalAssemblyResult(),
                                                                Enumerable.Empty<SerializableFailureMechanism>(),
                                                                null,
                                                                Enumerable.Empty<SerializableCombinedFailureMechanismSectionAssembly>(),
@@ -270,9 +270,9 @@
             TestDelegate call = () => new SerializableAssembly(string.Empty,
                                                                new Point2D(random.NextDouble(), random.NextDouble()),
                                                                new Point2D(random.NextDouble(), random.NextDouble()),
-                                                               Enumerable.Empty<SerializableAssessmentSection>(),
-                                                               Enumerable.Empty<SerializableAssessmentProcess>(),
-                                                               Enumerable.Empty<SerializableTotalAssemblyResult>(),
+                                                               new SerializableAssessmentSection(),
+                                                               new SerializableAssessmentProcess(),
+                                                               new SerializableTotalAssemblyResult(),
                                                                Enumerable.Empty<SerializableFailureMechanism>(),
                                                                Enumerable.Empty<SerializableFailureMechanismSectionAssembly>(),
                                                                null,
@@ -293,9 +293,9 @@
             TestDelegate call = () => new SerializableAssembly(string.Empty,
                                                                new Point2D(random.NextDouble(), random.NextDouble()),
                                                                new Point2D(random.NextDouble(), random.NextDouble()),
-                                                               Enumerable.Empty<SerializableAssessmentSection>(),
-                                                               Enumerable.Empty<SerializableAssessmentProcess>(),
-                                                               Enumerable.Empty<SerializableTotalAssemblyResult>(),
+                                                               new SerializableAssessmentSection(),
+                                                               new SerializableAssessmentProcess(),
+                                                               new SerializableTotalAssemblyResult(),
                                                                Enumerable.Empty<SerializableFailureMechanism>(),
                                                                Enumerable.Empty<SerializableFailureMechanismSectionAssembly>(),
                                                                Enumerable.Empty<SerializableCombinedFailureMechanismSectionAssembly>(),
@@ -316,9 +316,9 @@
             TestDelegate call = () => new SerializableAssembly(string.Empty,
                                                                new Point2D(random.NextDouble(), random.NextDouble()),
                                                                new Point2D(random.NextDouble(), random.NextDouble()),
-                                                               Enumerable.Empty<SerializableAssessmentSection>(),
-                                                               Enumerable.Empty<SerializableAssessmentProcess>(),
-                                                               Enumerable.Empty<SerializableTotalAssemblyResult>(),
+                                                               new SerializableAssessmentSection(),
+                                                               new SerializableAssessmentProcess(),
+                                                               new SerializableTotalAssemblyResult(),
                                                                Enumerable.Empty<SerializableFailureMechanism>(),
                                                                Enumerable.Empty<SerializableFailureMechanismSectionAssembly>(),
                                                                Enumerable.Empty<SerializableCombinedFailureMechanismSectionAssembly>(),
@@ -351,20 +351,11 @@
             var assembly = new SerializableAssembly(id,
                                                     lowerCorner,
                                                     upperCorner,
+                                                    assessmentSection,
+                                                    assessmentProcess,
+                                                    totalAssemblyResult,
                                                     new[]
                                                     {
-                                                        assessmentSection
-                                                    },
-                                                    new[]
-                                                    {
-                                                        assessmentProcess
-                                                    },
-                                                    new[]
-                                                    {
-                                                        totalAssemblyResult
-                                                    },
-                                                    new[]
-                                                    {
                                                         failureMechanism
                                                     },
                                                     new[]
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs
===================================================================
diff -u -r1ea93714d7063df84c6ecf043209ef821ca54a70 -rf610fd08d6d26cb5fc5db3da3c7267e66cf208b9
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs	(.../SerializableAssemblyWriterTest.cs)	(revision 1ea93714d7063df84c6ecf043209ef821ca54a70)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/SerializableAssemblyWriterTest.cs	(.../SerializableAssemblyWriterTest.cs)	(revision f610fd08d6d26cb5fc5db3da3c7267e66cf208b9)
@@ -75,9 +75,9 @@
                 "id",
                 new Point2D(0.0, 10.0),
                 new Point2D(10.0, 20.0),
-                Enumerable.Empty<SerializableAssessmentSection>(),
-                Enumerable.Empty<SerializableAssessmentProcess>(),
-                Enumerable.Empty<SerializableTotalAssemblyResult>(),
+                new SerializableAssessmentSection(),
+                new SerializableAssessmentProcess(),
+                new SerializableTotalAssemblyResult(),
                 new[]
                 {
                     new SerializableFailureMechanism()
@@ -353,20 +353,11 @@
                 "assemblage_1",
                 new Point2D(12.0, 34.0),
                 new Point2D(56.053, 78.0002345),
+                assessmentSection,
+                assessmentProcess,
+                totalAssemblyResult,
                 new[]
                 {
-                    assessmentSection
-                },
-                new[]
-                {
-                    assessmentProcess
-                },
-                new[]
-                {
-                    totalAssemblyResult
-                },
-                new[]
-                {
                     failureMechanism
                 },
                 new[]