Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs
===================================================================
diff -u -r6ade88c0cbceb0799e6f48f2a646a3bfebfb00df -rb25d71c274bf802dc8dd9fce8c69fd8263f7c054
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs	(.../ExportableAssessmentSectionFactory.cs)	(revision 6ade88c0cbceb0799e6f48f2a646a3bfebfb00df)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs	(.../ExportableAssessmentSectionFactory.cs)	(revision b25d71c274bf802dc8dd9fce8c69fd8263f7c054)
@@ -67,7 +67,8 @@
         /// <returns>An <see cref="ExportableAssessmentSection"/> with assembly results.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when no reference line is set for <paramref name="assessmentSection"/>.</exception>
-        /// <exception cref="AssemblyException">Thrown when assembly results cannot be created for <paramref name="assessmentSection"/>.</exception>
+        /// <exception cref="AssemblyException">Thrown when assembly results cannot be created for
+        /// <paramref name="assessmentSection"/>.</exception>
         /// <exception cref="AssemblyFactoryException">Thrown when assembly results are invalid and cannot be exported.</exception>
         public static ExportableAssessmentSection CreateExportableAssessmentSection(IdentifierGenerator idGenerator, AssessmentSection assessmentSection)
         {
@@ -92,17 +93,19 @@
                                                    CreateExportableFailureMechanismSectionCollections(idGenerator, registry, assessmentSection, combinedSectionAssemblyResults),
                                                    CreateExportableAssessmentSectionAssemblyResult(idGenerator, assessmentSection),
                                                    CreateExportableFailureMechanisms(idGenerator, registry, assessmentSection),
-                                                   CreateExportableCombinedSectionAssemblyCollection(assessmentSection, combinedSectionAssemblyResults));
+                                                   CreateExportableCombinedSectionAssemblyCollection(idGenerator, registry, assessmentSection, combinedSectionAssemblyResults));
         }
 
         /// <summary>
         /// Creates an <see cref="ExportableAssessmentSectionAssemblyResult"/> with the assembly result
         /// based on <paramref name="assessmentSection"/>.
         /// </summary>
         /// <param name="idGenerator">The generator to generate ids for the exportable components.</param>
-        /// <param name="assessmentSection">The assessment section to create an <see cref="ExportableAssessmentSectionAssemblyResult"/> for.</param>
+        /// <param name="assessmentSection">The assessment section to create an
+        /// <see cref="ExportableAssessmentSectionAssemblyResult"/> for.</param>
         /// <returns>An <see cref="ExportableAssessmentSectionAssemblyResult"/> with assembly result.</returns>
-        /// <exception cref="AssemblyException">Thrown when assembly result cannot be created for <paramref name="assessmentSection"/>.</exception>
+        /// <exception cref="AssemblyException">Thrown when assembly result cannot be created for
+        /// <paramref name="assessmentSection"/>.</exception>
         private static ExportableAssessmentSectionAssemblyResult CreateExportableAssessmentSectionAssemblyResult(IdentifierGenerator idGenerator,
                                                                                                                  AssessmentSection assessmentSection)
         {
@@ -116,7 +119,8 @@
         }
 
         /// <summary>
-        /// Converts an <see cref="AssessmentSectionAssemblyGroup"/> into an <see cref="ExportableAssessmentSectionAssemblyGroup"/>.
+        /// Converts an <see cref="AssessmentSectionAssemblyGroup"/> into an <see cref="ExportableAssessmentSectionAssemblyGroup"/>
+        /// .
         /// </summary>
         /// <param name="assemblyGroup">The <see cref="AssessmentSectionAssemblyGroup"/> to convert.</param>
         /// <returns>The converted <see cref="ExportableAssessmentSectionAssemblyGroup"/>.</returns>
@@ -161,7 +165,8 @@
         /// <see cref="ExportableFailureMechanism"/> with probability for.</param>
         /// <returns>A collection of <see cref="ExportableFailureMechanism"/> based on failure
         /// mechanisms that are in assembly.</returns>
-        /// <exception cref="AssemblyException">Thrown when assembly results cannot be created for <paramref name="assessmentSection"/>.</exception>
+        /// <exception cref="AssemblyException">Thrown when assembly results cannot be created for
+        /// <paramref name="assessmentSection"/>.</exception>
         /// <exception cref="AssemblyFactoryException">Thrown when assembly results are invalid and cannot be exported.</exception>
         private static IEnumerable<ExportableFailureMechanism> CreateExportableFailureMechanisms(
             IdentifierGenerator idGenerator, ExportableModelRegistry registry, AssessmentSection assessmentSection)
@@ -253,10 +258,12 @@
         /// <param name="failureMechanism">The failure mechanism to export.</param>
         /// <param name="assessmentSection">The assessment section the failure mechanism belongs to.</param>
         /// <param name="assembleFailureMechanismFunc">The <see cref="Func{T1,T2,TResult}"/> to assemble the failure mechanism.</param>
-        /// <param name="assembleFailureMechanismSectionFunc">The <see cref="Func{T1,T2,T3,TResult}"/> to assemble the failure mechanism section.</param>
+        /// <param name="assembleFailureMechanismSectionFunc">The <see cref="Func{T1,T2,T3,TResult}"/> to assemble the failure
+        /// mechanism section.</param>
         /// <typeparam name="TFailureMechanism">The type of failure mechanism.</typeparam>
         /// <typeparam name="TSectionResult">The type of section result.</typeparam>
-        /// <exception cref="AssemblyException">Thrown when assembly results cannot be created for <paramref name="failureMechanism"/>.</exception>
+        /// <exception cref="AssemblyException">Thrown when assembly results cannot be created for
+        /// <paramref name="failureMechanism"/>.</exception>
         /// <exception cref="AssemblyFactoryException">Thrown when assembly results are invalid and cannot be exported.</exception>
         private static void AddGenericFailureMechanismWhenInAssembly<TFailureMechanism, TSectionResult>(
             IdentifierGenerator idGenerator, ExportableModelRegistry registry, List<ExportableFailureMechanism> exportableFailureMechanisms,
@@ -285,31 +292,35 @@
                 failureMechanismsInAssembly.Select(failureMechanism => ExportableFailureMechanismSectionCollectionFactory.CreateExportableFailureMechanismSectionCollection(
                                                        idGenerator, registry, failureMechanism.Sections))
                                            .ToArray();
-            
+
             var failureMechanismSectionCollections = new List<ExportableFailureMechanismSectionCollection>();
             failureMechanismSectionCollections.AddRange(failureMechanismsInAssemblySectionCollections);
             if (combinedSectionAssemblyResults.Any())
             {
                 failureMechanismSectionCollections.Add(ExportableFailureMechanismSectionCollectionFactory.CreateExportableFailureMechanismSectionCollection(
                                                            idGenerator, registry, assessmentSection.ReferenceLine, combinedSectionAssemblyResults));
             }
-            
+
             return failureMechanismSectionCollections;
         }
 
         /// <summary>
         /// Creates a collection of <see cref="ExportableCombinedSectionAssembly"/> based on <paramref name="assessmentSection"/>.
         /// </summary>
-        /// <param name="assessmentSection">The assessment section to create a collection of <see cref="ExportableCombinedSectionAssembly"/> for.</param>
-        /// <param name="combinedFailureMechanismSectionAssemblyResults">The collection of <see cref="CombinedFailureMechanismSectionAssemblyResult"/>.</param>
+        /// <param name="idGenerator">The generator to generate ids for the exportable components.</param>
+        /// <param name="registry">The <see cref="ExportableModelRegistry"/> to keep track of the created items.</param>
+        /// <param name="assessmentSection">The assessment section to create a collection of
+        /// <see cref="ExportableCombinedSectionAssembly"/> for.</param>
+        /// <param name="combinedFailureMechanismSectionAssemblyResults">The collection of
+        /// <see cref="CombinedFailureMechanismSectionAssemblyResult"/>.</param>
         /// <returns>An <see cref="IEnumerable{T}"/> of <see cref="ExportableCombinedSectionAssembly"/>.</returns>
         /// <exception cref="AssemblyFactoryException">Thrown when assembly results are invalid and cannot be exported.</exception>
         private static IEnumerable<ExportableCombinedSectionAssembly> CreateExportableCombinedSectionAssemblyCollection(
-            AssessmentSection assessmentSection, IEnumerable<CombinedFailureMechanismSectionAssemblyResult> combinedFailureMechanismSectionAssemblyResults)
+            IdentifierGenerator idGenerator, ExportableModelRegistry registry, AssessmentSection assessmentSection,
+            IEnumerable<CombinedFailureMechanismSectionAssemblyResult> combinedFailureMechanismSectionAssemblyResults)
         {
             return ExportableCombinedSectionAssemblyFactory.CreateExportableCombinedSectionAssemblyCollection(
-                combinedFailureMechanismSectionAssemblyResults,
-                assessmentSection);
+                idGenerator, registry, combinedFailureMechanismSectionAssemblyResults, assessmentSection);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs
===================================================================
diff -u -r67b3d776bcd2a24360d3187557b5aaa6ba74f7c9 -rb25d71c274bf802dc8dd9fce8c69fd8263f7c054
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs	(.../ExportableCombinedSectionAssemblyFactory.cs)	(revision 67b3d776bcd2a24360d3187557b5aaa6ba74f7c9)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableCombinedSectionAssemblyFactory.cs	(.../ExportableCombinedSectionAssemblyFactory.cs)	(revision b25d71c274bf802dc8dd9fce8c69fd8263f7c054)
@@ -30,7 +30,8 @@
 using Riskeer.Integration.Data;
 using Riskeer.Integration.Data.Assembly;
 using Riskeer.Integration.IO.Exceptions;
-using Riskeer.Integration.Util;
+using Riskeer.Integration.IO.Helpers;
+using Riskeer.Integration.IO.Properties;
 
 namespace Riskeer.Integration.IO.Factories
 {
@@ -43,6 +44,8 @@
         /// Creates a collection of <see cref="ExportableCombinedSectionAssembly"/>
         /// based on <paramref name="combinedSectionAssemblyResults"/>.
         /// </summary>
+        /// <param name="idGenerator">The generator to generate ids for the exportable components.</param>
+        /// <param name="registry">The <see cref="ExportableModelRegistry"/> to keep track of the created items.</param>
         /// <param name="combinedSectionAssemblyResults">A collection of combined section results to
         /// create a collection of <see cref="ExportableCombinedSectionAssembly"/> for.</param>
         /// <param name="assessmentSection">The <see cref="AssessmentSection"/> the section results belong to.</param>
@@ -51,9 +54,20 @@
         /// <exception cref="AssemblyFactoryException">Thrown when <see cref="CombinedFailureMechanismSectionAssemblyResult.TotalResult"/>
         /// is invalid and cannot be exported.</exception>
         public static IEnumerable<ExportableCombinedSectionAssembly> CreateExportableCombinedSectionAssemblyCollection(
+            IdentifierGenerator idGenerator, ExportableModelRegistry registry,
             IEnumerable<CombinedFailureMechanismSectionAssemblyResult> combinedSectionAssemblyResults,
             AssessmentSection assessmentSection)
         {
+            if (idGenerator == null)
+            {
+                throw new ArgumentNullException(nameof(idGenerator));
+            }
+
+            if (registry == null)
+            {
+                throw new ArgumentNullException(nameof(registry));
+            }
+
             if (combinedSectionAssemblyResults == null)
             {
                 throw new ArgumentNullException(nameof(combinedSectionAssemblyResults));
@@ -72,15 +86,11 @@
                 {
                     throw new AssemblyFactoryException("The assembly result is invalid and cannot be created.");
                 }
-                
-                var exportableSection = new ExportableCombinedFailureMechanismSection(
-                    "id", FailureMechanismSectionHelper.GetFailureMechanismSectionGeometry(
-                        assessmentSection.ReferenceLine, assemblyResult.SectionStart, assemblyResult.SectionEnd),
-                    assemblyResult.SectionStart, assemblyResult.SectionEnd,
-                    ExportableAssemblyMethodConverter.ConvertTo(assemblyResult.CommonSectionAssemblyMethod));
 
+                ExportableCombinedFailureMechanismSection exportableSection = registry.Get(assemblyResult);
+
                 var exportableSectionResult = new ExportableCombinedSectionAssembly(
-                    "id", exportableSection, assemblyResult.TotalResult,
+                    idGenerator.GetNewId(Resources.ExportableCombinedSectionAssembly_IdPrefix), exportableSection, assemblyResult.TotalResult,
                     ExportableAssemblyMethodConverter.ConvertTo(assemblyResult.CombinedSectionResultAssemblyMethod),
                     CreateFailureMechanismCombinedSectionAssemblyResults(assemblyResult, assessmentSection));
 
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -r84db10065dd9b7c393da13a6db0b01bf122aba80 -rb25d71c274bf802dc8dd9fce8c69fd8263f7c054
--- Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 84db10065dd9b7c393da13a6db0b01bf122aba80)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision b25d71c274bf802dc8dd9fce8c69fd8263f7c054)
@@ -136,6 +136,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Gf.
+        /// </summary>
+        public static string ExportableCombinedSectionAssembly_IdPrefix {
+            get {
+                return ResourceManager.GetString("ExportableCombinedSectionAssembly_IdPrefix", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Fm.
         /// </summary>
         public static string ExportableFailureMechanism_IdPrefix {
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.resx
===================================================================
diff -u -r84db10065dd9b7c393da13a6db0b01bf122aba80 -rb25d71c274bf802dc8dd9fce8c69fd8263f7c054
--- Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.resx	(.../Resources.resx)	(revision 84db10065dd9b7c393da13a6db0b01bf122aba80)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.resx	(.../Resources.resx)	(revision b25d71c274bf802dc8dd9fce8c69fd8263f7c054)
@@ -206,4 +206,7 @@
   <data name="ExportableFailureMechanismSectionAssemblyResult_IdPrefix" xml:space="preserve">
     <value>Fa</value>
   </data>
+  <data name="ExportableCombinedSectionAssembly_IdPrefix" xml:space="preserve">
+    <value>Gf</value>
+  </data>
 </root>
\ No newline at end of file
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs
===================================================================
diff -u -r3f16d047b4c6d2a626357315f8ae38d678be17bb -rb25d71c274bf802dc8dd9fce8c69fd8263f7c054
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs	(.../ExportableCombinedSectionAssemblyFactoryTest.cs)	(revision 3f16d047b4c6d2a626357315f8ae38d678be17bb)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyFactoryTest.cs	(.../ExportableCombinedSectionAssemblyFactoryTest.cs)	(revision b25d71c274bf802dc8dd9fce8c69fd8263f7c054)
@@ -35,19 +35,45 @@
 using Riskeer.Integration.Data.TestUtil;
 using Riskeer.Integration.IO.Exceptions;
 using Riskeer.Integration.IO.Factories;
-using Riskeer.Integration.Util;
+using Riskeer.Integration.IO.Helpers;
 
 namespace Riskeer.Integration.IO.Test.Factories
 {
     [TestFixture]
     public class ExportableCombinedSectionAssemblyFactoryTest
     {
         [Test]
+        public void CreateExportableCombinedSectionAssemblyCollection_IdGeneratorNull_ThrowsArgumentNullException()
+        {
+            // Call
+            void Call() => ExportableCombinedSectionAssemblyFactory.CreateExportableCombinedSectionAssemblyCollection(
+                null, new ExportableModelRegistry(), Enumerable.Empty<CombinedFailureMechanismSectionAssemblyResult>(),
+                new AssessmentSection(AssessmentSectionComposition.Dike));
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("idGenerator", exception.ParamName);
+        }
+
+        [Test]
+        public void CreateExportableCombinedSectionAssemblyCollection_RegistryNull_ThrowsArgumentNullException()
+        {
+            // Call
+            void Call() => ExportableCombinedSectionAssemblyFactory.CreateExportableCombinedSectionAssemblyCollection(
+                new IdentifierGenerator(), null, Enumerable.Empty<CombinedFailureMechanismSectionAssemblyResult>(),
+                new AssessmentSection(AssessmentSectionComposition.Dike));
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("registry", exception.ParamName);
+        }
+
+        [Test]
         public void CreateExportableCombinedSectionAssemblyCollection_CombinedSectionAssemblyResultsNull_ThrowsArgumentNullException()
         {
             // Call
             void Call() => ExportableCombinedSectionAssemblyFactory.CreateExportableCombinedSectionAssemblyCollection(
-                null, new AssessmentSection(AssessmentSectionComposition.Dike));
+                new IdentifierGenerator(), new ExportableModelRegistry(), null, new AssessmentSection(AssessmentSectionComposition.Dike));
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -59,7 +85,7 @@
         {
             // Call
             void Call() => ExportableCombinedSectionAssemblyFactory.CreateExportableCombinedSectionAssemblyCollection(
-                Enumerable.Empty<CombinedFailureMechanismSectionAssemblyResult>(), null);
+                new IdentifierGenerator(), new ExportableModelRegistry(), Enumerable.Empty<CombinedFailureMechanismSectionAssemblyResult>(), null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -79,12 +105,13 @@
             CombinedFailureMechanismSectionAssemblyResult[] assemblyResults =
             {
                 new CombinedFailureMechanismSectionAssemblyResult(random.NextDouble(), random.NextDouble(), assemblyGroup,
-                random.NextEnumValue<AssemblyMethod>(), random.NextEnumValue<AssemblyMethod>(), random.NextEnumValue<AssemblyMethod>(),
-                new CombinedFailureMechanismSectionAssemblyResult.ConstructionProperties())
+                                                                  random.NextEnumValue<AssemblyMethod>(), random.NextEnumValue<AssemblyMethod>(), random.NextEnumValue<AssemblyMethod>(),
+                                                                  new CombinedFailureMechanismSectionAssemblyResult.ConstructionProperties())
             };
 
             // Call
-            void Call() => ExportableCombinedSectionAssemblyFactory.CreateExportableCombinedSectionAssemblyCollection(assemblyResults, assessmentSection);
+            void Call() => ExportableCombinedSectionAssemblyFactory.CreateExportableCombinedSectionAssemblyCollection(
+                new IdentifierGenerator(), new ExportableModelRegistry(), assemblyResults, assessmentSection);
 
             // Assert
             var exception = Assert.Throws<AssemblyFactoryException>(Call);
@@ -122,20 +149,32 @@
                 CombinedFailureMechanismSectionAssemblyResultTestFactory.Create(22, hasAssemblyGroupResults)
             };
 
+            var idGenerator = new IdentifierGenerator();
+            var registry = new ExportableModelRegistry();
+            RegisterFailureMechanismSections(registry, assessmentSection.ReferenceLine, assemblyResults);
+
             // Call
             IEnumerable<ExportableCombinedSectionAssembly> exportableCombinedSectionAssemblies =
-                ExportableCombinedSectionAssemblyFactory.CreateExportableCombinedSectionAssemblyCollection(assemblyResults, assessmentSection);
+                ExportableCombinedSectionAssemblyFactory.CreateExportableCombinedSectionAssemblyCollection(
+                    idGenerator, registry, assemblyResults, assessmentSection);
 
             // Assert
-            AssertCombinedFailureMechanismSectionAssemblyResults(
-                assemblyResults, exportableCombinedSectionAssemblies,
-                assessmentSection.ReferenceLine, hasAssemblyGroupResults);
+            AssertCombinedFailureMechanismSectionAssemblyResults(registry, assemblyResults, exportableCombinedSectionAssemblies,
+                                                                 hasAssemblyGroupResults);
         }
 
-        private static void AssertCombinedFailureMechanismSectionAssemblyResults(IEnumerable<CombinedFailureMechanismSectionAssemblyResult> assemblyResults,
-                                                                                 IEnumerable<ExportableCombinedSectionAssembly> exportableCombinedSectionAssemblies,
-                                                                                 ReferenceLine referenceLine, bool hasAssemblyGroupResults)
+        private static void RegisterFailureMechanismSections(ExportableModelRegistry registry, ReferenceLine referenceLine,
+                                                             IEnumerable<CombinedFailureMechanismSectionAssemblyResult> assemblyResults)
         {
+            ExportableFailureMechanismSectionCollectionFactory.CreateExportableFailureMechanismSectionCollection(new IdentifierGenerator(), registry, referenceLine, assemblyResults);
+        }
+
+        private static void AssertCombinedFailureMechanismSectionAssemblyResults(
+            ExportableModelRegistry registry,
+            IEnumerable<CombinedFailureMechanismSectionAssemblyResult> assemblyResults,
+            IEnumerable<ExportableCombinedSectionAssembly> exportableCombinedSectionAssemblies,
+            bool hasAssemblyGroupResults)
+        {
             int expectedNrOfSections = assemblyResults.Count();
             Assert.AreEqual(expectedNrOfSections, exportableCombinedSectionAssemblies.Count());
 
@@ -144,34 +183,20 @@
                 CombinedFailureMechanismSectionAssemblyResult combinedFailureMechanismSectionAssemblyResult = assemblyResults.ElementAt(i);
                 ExportableCombinedSectionAssembly exportableCombinedSectionAssembly = exportableCombinedSectionAssemblies.ElementAt(i);
 
-                AssertExportableCombinedFailureMechanismSection(combinedFailureMechanismSectionAssemblyResult, exportableCombinedSectionAssembly.Section, referenceLine);
                 AssertExportableCombinedFailureMechanismSectionResult(
-                    combinedFailureMechanismSectionAssemblyResult, exportableCombinedSectionAssembly.Section, exportableCombinedSectionAssembly,
-                    hasAssemblyGroupResults);
+                    i, combinedFailureMechanismSectionAssemblyResult, registry.Get(combinedFailureMechanismSectionAssemblyResult),
+                    exportableCombinedSectionAssembly, hasAssemblyGroupResults);
             }
         }
 
-        private static void AssertExportableCombinedFailureMechanismSection(CombinedFailureMechanismSectionAssemblyResult expectedSection,
-                                                                            ExportableCombinedFailureMechanismSection actualSection,
-                                                                            ReferenceLine referenceLine)
-        {
-            IEnumerable<Point2D> expectedGeometry = FailureMechanismSectionHelper.GetFailureMechanismSectionGeometry(
-                referenceLine,
-                actualSection.StartDistance,
-                actualSection.EndDistance).ToArray();
-            CollectionAssert.IsNotEmpty(expectedGeometry);
-
-            Assert.AreEqual(expectedSection.SectionStart, actualSection.StartDistance);
-            Assert.AreEqual(expectedSection.SectionEnd, actualSection.EndDistance);
-            CollectionAssert.AreEqual(expectedGeometry, actualSection.Geometry);
-            Assert.AreEqual(ExportableAssemblyMethodConverter.ConvertTo(expectedSection.CommonSectionAssemblyMethod), actualSection.AssemblyMethod);
-        }
-
-        private static void AssertExportableCombinedFailureMechanismSectionResult(CombinedFailureMechanismSectionAssemblyResult expectedSection,
+        private static void AssertExportableCombinedFailureMechanismSectionResult(int index,
+                                                                                  CombinedFailureMechanismSectionAssemblyResult expectedSection,
                                                                                   ExportableCombinedFailureMechanismSection actualSection,
                                                                                   ExportableCombinedSectionAssembly actualSectionResult,
                                                                                   bool hasAssemblyGroupResults)
         {
+            Assert.AreEqual($"Gf.{index}", actualSectionResult.Id);
+
             Assert.AreSame(actualSection, actualSectionResult.Section);
             Assert.AreEqual(expectedSection.TotalResult, actualSectionResult.AssemblyGroup);
             Assert.AreEqual(ExportableAssemblyMethodConverter.ConvertTo(expectedSection.CombinedSectionResultAssemblyMethod), actualSectionResult.AssemblyGroupAssemblyMethod);
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml
===================================================================
diff -u -r0a99f56530fcba864b9d978accda370bf2a78c69 -rb25d71c274bf802dc8dd9fce8c69fd8263f7c054
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml	(.../ExpectedGml.gml)	(revision 0a99f56530fcba864b9d978accda370bf2a78c69)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml	(.../ExpectedGml.gml)	(revision b25d71c274bf802dc8dd9fce8c69fd8263f7c054)
@@ -526,12 +526,12 @@
     </uboi:Faalanalyse>
   </uboi:featureMember>
   <uboi:featureMember>
-    <uboi:AnalyseDeelvakGecombineerd gml:id="id">
+    <uboi:AnalyseDeelvakGecombineerd gml:id="Gf.0">
       <uboi:duidingsklasse>+II</uboi:duidingsklasse>
       <uboi:assemblagemethode>BOI-3C-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:specificeert xlink:href="Vo.0" />
-      <uboi:geldtVoor xlink:href="id" />
+      <uboi:geldtVoor xlink:href="Bv.32" />
     </uboi:AnalyseDeelvakGecombineerd>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -540,7 +540,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.0" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -549,7 +549,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.0" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -558,7 +558,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.0" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -567,7 +567,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.0" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -576,7 +576,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.0" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -585,7 +585,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.0" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -594,7 +594,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.0" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -603,7 +603,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.0" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -612,7 +612,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.0" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -621,7 +621,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.0" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -630,7 +630,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.0" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -639,7 +639,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.0" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -648,7 +648,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.0" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -657,7 +657,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.0" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -666,7 +666,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.0" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -675,16 +675,16 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.0" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
-    <uboi:AnalyseDeelvakGecombineerd gml:id="id">
+    <uboi:AnalyseDeelvakGecombineerd gml:id="Gf.1">
       <uboi:duidingsklasse>+III</uboi:duidingsklasse>
       <uboi:assemblagemethode>BOI-3C-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:specificeert xlink:href="Vo.0" />
-      <uboi:geldtVoor xlink:href="id" />
+      <uboi:geldtVoor xlink:href="Bv.33" />
     </uboi:AnalyseDeelvakGecombineerd>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -693,7 +693,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.1" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -702,7 +702,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.1" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -711,7 +711,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.1" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -720,7 +720,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.1" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -729,7 +729,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.1" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -738,7 +738,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.1" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -747,7 +747,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.1" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -756,7 +756,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.1" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -765,7 +765,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.1" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -774,7 +774,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.1" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -783,7 +783,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.1" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -792,7 +792,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.1" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -801,7 +801,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.1" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -810,7 +810,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.1" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -819,7 +819,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.1" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>
@@ -828,7 +828,7 @@
       <uboi:assemblagemethode>BOI-3B-1</uboi:assemblagemethode>
       <uboi:status>VOLLDG</uboi:status>
       <uboi:afgeleidVan xlink:href="id" />
-      <uboi:duidt xlink:href="id" />
+      <uboi:duidt xlink:href="Gf.1" />
     </uboi:AnalyseDeelvak>
   </uboi:featureMember>
   <uboi:featureMember>