Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs
===================================================================
diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -rcd06d26ed9c6790e3dcf9edd85dea5448daaf669
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs	(.../ClosingStructuresFailureMechanism.cs)	(revision dfd2e82406d3cafb83004a065b3ea1f943ced729)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs	(.../ClosingStructuresFailureMechanism.cs)	(revision cd06d26ed9c6790e3dcf9edd85dea5448daaf669)
@@ -38,9 +38,10 @@
     /// </summary>
     public class ClosingStructuresFailureMechanism : FailureMechanismBase,
                                                      ICalculatableFailureMechanism,
-                                                     IHasSectionResults<ClosingStructuresFailureMechanismSectionResultOld>
+                                                     IHasSectionResults<ClosingStructuresFailureMechanismSectionResultOld, AdoptableFailureMechanismSectionResult>
     {
-        private readonly ObservableList<ClosingStructuresFailureMechanismSectionResultOld> sectionResults;
+        private readonly ObservableList<ClosingStructuresFailureMechanismSectionResultOld> sectionResultsOld;
+        private readonly ObservableList<AdoptableFailureMechanismSectionResult> sectionResults;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ClosingStructuresFailureMechanism"/> class.
@@ -52,9 +53,11 @@
             {
                 Name = RiskeerCommonDataResources.FailureMechanism_Calculations_DisplayName
             };
+
             GeneralInput = new GeneralClosingStructuresInput();
             ClosingStructures = new StructureCollection<ClosingStructure>();
-            sectionResults = new ObservableList<ClosingStructuresFailureMechanismSectionResultOld>();
+            sectionResultsOld = new ObservableList<ClosingStructuresFailureMechanismSectionResultOld>();
+            sectionResults = new ObservableList<AdoptableFailureMechanismSectionResult>();
             ForeshoreProfiles = new ForeshoreProfileCollection();
         }
 
@@ -75,30 +78,22 @@
 
         public CalculationGroup CalculationsGroup { get; }
 
-        public override IEnumerable<ICalculation> Calculations
-        {
-            get
-            {
-                return CalculationsGroup.GetCalculations().Cast<StructuresCalculation<ClosingStructuresInput>>();
-            }
-        }
+        public override IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations().Cast<StructuresCalculation<ClosingStructuresInput>>();
 
-        public IObservableEnumerable<ClosingStructuresFailureMechanismSectionResultOld> SectionResultsOld
-        {
-            get
-            {
-                return sectionResults;
-            }
-        }
+        public IObservableEnumerable<ClosingStructuresFailureMechanismSectionResultOld> SectionResultsOld => sectionResultsOld;
 
+        public IObservableEnumerable<AdoptableFailureMechanismSectionResult> SectionResults => sectionResults;
+
         protected override void AddSectionDependentData(FailureMechanismSection section)
         {
             base.AddSectionDependentData(section);
-            sectionResults.Add(new ClosingStructuresFailureMechanismSectionResultOld(section));
+            sectionResultsOld.Add(new ClosingStructuresFailureMechanismSectionResultOld(section));
+            sectionResults.Add(new AdoptableFailureMechanismSectionResult(section));
         }
 
         protected override void ClearSectionDependentData()
         {
+            sectionResultsOld.Clear();
             sectionResults.Clear();
         }
     }
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs
===================================================================
diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -rcd06d26ed9c6790e3dcf9edd85dea5448daaf669
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs	(.../ClosingStructuresFailureMechanismTest.cs)	(revision dfd2e82406d3cafb83004a065b3ea1f943ced729)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs	(.../ClosingStructuresFailureMechanismTest.cs)	(revision cd06d26ed9c6790e3dcf9edd85dea5448daaf669)
@@ -42,7 +42,7 @@
             // Assert
             Assert.IsInstanceOf<FailureMechanismBase>(failureMechanism);
             Assert.IsInstanceOf<ICalculatableFailureMechanism>(failureMechanism);
-            Assert.IsInstanceOf<IHasSectionResults<ClosingStructuresFailureMechanismSectionResultOld>>(failureMechanism);
+            Assert.IsInstanceOf<IHasSectionResults<ClosingStructuresFailureMechanismSectionResultOld, AdoptableFailureMechanismSectionResult>>(failureMechanism);
             Assert.AreEqual("Betrouwbaarheid sluiting kunstwerk", failureMechanism.Name);
             Assert.AreEqual("BSKW", failureMechanism.Code);
             Assert.AreEqual(1, failureMechanism.Group);
@@ -74,6 +74,7 @@
 
             // Assert
             Assert.AreEqual(1, failureMechanism.Sections.Count());
+            Assert.AreEqual(1, failureMechanism.SectionResults.Count());
             Assert.AreEqual(1, failureMechanism.SectionResultsOld.Count());
             Assert.AreSame(section, failureMechanism.SectionResultsOld.First().Section);
         }
@@ -97,12 +98,14 @@
             });
 
             // Precondition
+            Assert.AreEqual(2, failureMechanism.SectionResults.Count());
             Assert.AreEqual(2, failureMechanism.SectionResultsOld.Count());
 
             // Call
             failureMechanism.ClearAllSections();
 
             // Assert
+            CollectionAssert.IsEmpty(failureMechanism.SectionResults);
             CollectionAssert.IsEmpty(failureMechanism.SectionResultsOld);
         }