Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableAssembly.cs
===================================================================
diff -u -r5e2248b589fcb4b39e7ff664cd11a200b08daa28 -r2a28064a44daa277c25e597f4b3eea1edd52e37c
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableAssembly.cs	(.../SerializableAssembly.cs)	(revision 5e2248b589fcb4b39e7ff664cd11a200b08daa28)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableAssembly.cs	(.../SerializableAssembly.cs)	(revision 2a28064a44daa277c25e597f4b3eea1edd52e37c)
@@ -20,6 +20,8 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Xml.Serialization;
 using Core.Common.Base.Geometry;
 using Ringtoets.AssemblyTool.IO.Model.Gml;
@@ -44,10 +46,34 @@
         /// <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="featureMembers">The collection of <see cref="SerializableFeatureMember"/> that
+        /// <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="failureMechanisms">The collection of <see cref="SerializableFailureMechanism"/> that
+        /// belong to the assembly.</param>
+        /// <param name="failureMechanismSectionAssemblies">The collection of <see cref="SerializableFailureMechanismSectionAssembly"/> that
+        /// belong to the assembly.</param>
+        /// <param name="combinedFailureMechanismSectionAssemblies">The collection of <see cref="SerializableCombinedFailureMechanismSectionAssembly"/> that
+        /// belong to the assembly.</param>
+        /// <param name="failureMechanismSectionCollections">The collection of <see cref="SerializableFailureMechanismSectionCollection"/> that
+        /// belong to the assembly.</param>
+        /// <param name="failureMechanismSections">The collection of <see cref="SerializableFailureMechanismSection"/> that
+        /// belong to the assembly.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public SerializableAssembly(string id, Point2D lowerCorner, Point2D upperCorner, SerializableFeatureMember[] featureMembers)
+        public SerializableAssembly(string id,
+                                    Point2D lowerCorner,
+                                    Point2D upperCorner,
+                                    IEnumerable<SerializableAssessmentSection> assessmentSections,
+                                    IEnumerable<SerializableAssessmentProcess> assessmentProcesses,
+                                    IEnumerable<SerializableTotalAssemblyResult> totalAssemblyResults,
+                                    IEnumerable<SerializableFailureMechanism> failureMechanisms,
+                                    IEnumerable<SerializableFailureMechanismSectionAssembly> failureMechanismSectionAssemblies,
+                                    IEnumerable<SerializableCombinedFailureMechanismSectionAssembly> combinedFailureMechanismSectionAssemblies,
+                                    IEnumerable<SerializableFailureMechanismSectionCollection> failureMechanismSectionCollections,
+                                    IEnumerable<SerializableFailureMechanismSection> failureMechanismSections)
         {
             if (id == null)
             {
@@ -64,14 +90,59 @@
                 throw new ArgumentNullException(nameof(upperCorner));
             }
 
-            if (featureMembers == null)
+            if (assessmentSections == null)
             {
-                throw new ArgumentNullException(nameof(featureMembers));
+                throw new ArgumentNullException(nameof(assessmentSections));
             }
 
+            if (assessmentProcesses == null)
+            {
+                throw new ArgumentNullException(nameof(assessmentProcesses));
+            }
+
+            if (totalAssemblyResults == null)
+            {
+                throw new ArgumentNullException(nameof(totalAssemblyResults));
+            }
+
+            if (failureMechanisms == null)
+            {
+                throw new ArgumentNullException(nameof(failureMechanisms));
+            }
+
+            if (failureMechanismSectionAssemblies == null)
+            {
+                throw new ArgumentNullException(nameof(failureMechanismSectionAssemblies));
+            }
+
+            if (combinedFailureMechanismSectionAssemblies == null)
+            {
+                throw new ArgumentNullException(nameof(combinedFailureMechanismSectionAssemblies));
+            }
+
+            if (failureMechanismSectionCollections == null)
+            {
+                throw new ArgumentNullException(nameof(failureMechanismSectionCollections));
+            }
+
+            if (failureMechanismSections == null)
+            {
+                throw new ArgumentNullException(nameof(failureMechanismSections));
+            }
+
             Id = id;
             Boundary = new SerializableBoundary(lowerCorner, upperCorner);
-            FeatureMembers = featureMembers;
+            
+            var featureMembers = new List<SerializableFeatureMember>();
+            featureMembers.AddRange(assessmentSections);
+            featureMembers.AddRange(assessmentProcesses);
+            featureMembers.AddRange(totalAssemblyResults);
+            featureMembers.AddRange(failureMechanisms);
+            featureMembers.AddRange(failureMechanismSectionAssemblies);
+            featureMembers.AddRange(combinedFailureMechanismSectionAssemblies);
+            featureMembers.AddRange(failureMechanismSectionCollections);
+            featureMembers.AddRange(failureMechanismSections);
+            FeatureMembers = featureMembers.ToArray();
         }
 
         /// <summary>
@@ -90,14 +161,14 @@
         /// Gets or sets the collection of feature members for the assembly.
         /// </summary>
         [XmlArray(AssemblyXmlIdentifiers.FeatureMember)]
-        [XmlArrayItem(typeof(SerializableAssessmentProcess))]
         [XmlArrayItem(typeof(SerializableAssessmentSection))]
+        [XmlArrayItem(typeof(SerializableAssessmentProcess))]
         [XmlArrayItem(typeof(SerializableTotalAssemblyResult))]
         [XmlArrayItem(typeof(SerializableFailureMechanism))]
         [XmlArrayItem(typeof(SerializableFailureMechanismSectionAssembly))]
-        [XmlArrayItem(typeof(SerializableFailureMechanismSections))]
-        [XmlArrayItem(typeof(SerializableFailureMechanismSection))]
         [XmlArrayItem(typeof(SerializableCombinedFailureMechanismSectionAssembly))]
+        [XmlArrayItem(typeof(SerializableFailureMechanismSectionCollection))]
+        [XmlArrayItem(typeof(SerializableFailureMechanismSection))]
         public SerializableFeatureMember[] FeatureMembers { get; set; }
     }
 }
\ No newline at end of file