Index: Riskeer/Common/src/Riskeer.Common.Forms/Observers/CalculatableFailureMechanismResultObserver.cs
===================================================================
diff -u -rd07611d7e455e358e7255b2807447412ac56f9c6 -r21c1614486e326b3cba28e8e846fc117e5f5c41d
--- Riskeer/Common/src/Riskeer.Common.Forms/Observers/CalculatableFailureMechanismResultObserver.cs	(.../CalculatableFailureMechanismResultObserver.cs)	(revision d07611d7e455e358e7255b2807447412ac56f9c6)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Observers/CalculatableFailureMechanismResultObserver.cs	(.../CalculatableFailureMechanismResultObserver.cs)	(revision 21c1614486e326b3cba28e8e846fc117e5f5c41d)
@@ -31,20 +31,22 @@
     /// related to its section results.
     /// </summary>
     /// <typeparam name="TFailureMechanism">The type of the failure mechanism to listen to.</typeparam>
+    /// <typeparam name="TSectionResultOld">The type of the failure mechanism section results in the <typeparamref name="TFailureMechanism"/>.</typeparam>
     /// <typeparam name="TSectionResult">The type of the failure mechanism section results in the <typeparamref name="TFailureMechanism"/>.</typeparam>
     /// <typeparam name="TCalculation">The type of the calculations in the <typeparamref name="TFailureMechanism"/>.</typeparam>
-    public class CalculatableFailureMechanismResultObserver<TFailureMechanism, TSectionResult, TCalculation>
-        : FailureMechanismResultObserver<TFailureMechanism, TSectionResult>
-        where TFailureMechanism : IFailureMechanism, IHasSectionResults<TSectionResult>, ICalculatableFailureMechanism
-        where TSectionResult : FailureMechanismSectionResultOld
+    public class CalculatableFailureMechanismResultObserver<TFailureMechanism, TSectionResultOld, TSectionResult, TCalculation>
+        : FailureMechanismResultObserver<TFailureMechanism, TSectionResultOld, TSectionResult>
+        where TFailureMechanism : IFailureMechanism, IHasSectionResults<TSectionResultOld, TSectionResult>, ICalculatableFailureMechanism
+        where TSectionResultOld : FailureMechanismSectionResultOld
+        where TSectionResult : FailureMechanismSectionResult
         where TCalculation : ICalculation<ICalculationInput>
     {
         private readonly RecursiveObserver<CalculationGroup, ICalculationBase> calculationObserver;
         private readonly RecursiveObserver<CalculationGroup, ICalculationInput> calculationInputObserver;
 
         /// <inheritdoc />
         /// <summary>
-        /// Creates a new instance of <see cref="CalculatableFailureMechanismResultObserver{TFailureMechanism,TSectionResult,TCalculation}"/>.
+        /// Creates a new instance of <see cref="CalculatableFailureMechanismResultObserver{TFailureMechanism,TSectionResultOld, TSectionResult, TCalculation}"/>.
         /// </summary>
         public CalculatableFailureMechanismResultObserver(TFailureMechanism failureMechanism)
             : base(failureMechanism)
Index: Riskeer/Common/src/Riskeer.Common.Forms/Observers/FailureMechanismResultObserver.cs
===================================================================
diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -r21c1614486e326b3cba28e8e846fc117e5f5c41d
--- Riskeer/Common/src/Riskeer.Common.Forms/Observers/FailureMechanismResultObserver.cs	(.../FailureMechanismResultObserver.cs)	(revision dfd2e82406d3cafb83004a065b3ea1f943ced729)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Observers/FailureMechanismResultObserver.cs	(.../FailureMechanismResultObserver.cs)	(revision 21c1614486e326b3cba28e8e846fc117e5f5c41d)
@@ -30,17 +30,19 @@
     /// its section results.
     /// </summary>
     /// <typeparam name="TFailureMechanism">The type of the failure mechanism to observe.</typeparam>
+    /// <typeparam name="TSectionResultOld">The type of the section results in the failure mechanism.</typeparam>
     /// <typeparam name="TSectionResult">The type of the section results in the failure mechanism.</typeparam>
-    public class FailureMechanismResultObserver<TFailureMechanism, TSectionResult> : Observable, IDisposable
-        where TFailureMechanism : IFailureMechanism, IHasSectionResults<TSectionResult>
-        where TSectionResult : FailureMechanismSectionResultOld
+    public class FailureMechanismResultObserver<TFailureMechanism, TSectionResultOld, TSectionResult> : Observable, IDisposable
+        where TFailureMechanism : IFailureMechanism, IHasSectionResults<TSectionResultOld, TSectionResult>
+        where TSectionResultOld : FailureMechanismSectionResultOld
+        where TSectionResult : FailureMechanismSectionResult
     {
         private readonly Observer failureMechanismObserver;
         private readonly Observer failureMechanismSectionResultObserver;
         private readonly RecursiveObserver<IObservableEnumerable<TSectionResult>, TSectionResult> failureMechanismSectionResultsObserver;
 
         /// <summary>
-        /// Creates a new instance of <see cref="FailureMechanismResultObserver{TFailureMechanism,TSectionResult}"/>.
+        /// Creates a new instance of <see cref="FailureMechanismResultObserver{TFailureMechanism,TSectionResultOld,TSectionResult}"/>.
         /// </summary>
         /// <param name="failureMechanism">The <typeparamref name="TFailureMechanism"/> to observe.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/> is <c>null</c>.</exception>
@@ -65,7 +67,7 @@
                 NotifyObservers,
                 sr => sr)
             {
-                Observable = failureMechanism.SectionResultsOld
+                Observable = failureMechanism.SectionResults
             };
         }
 
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Observers/CalculatableFailureMechanismResultObserverTest.cs
===================================================================
diff -u -rd07611d7e455e358e7255b2807447412ac56f9c6 -r21c1614486e326b3cba28e8e846fc117e5f5c41d
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Observers/CalculatableFailureMechanismResultObserverTest.cs	(.../CalculatableFailureMechanismResultObserverTest.cs)	(revision d07611d7e455e358e7255b2807447412ac56f9c6)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Observers/CalculatableFailureMechanismResultObserverTest.cs	(.../CalculatableFailureMechanismResultObserverTest.cs)	(revision 21c1614486e326b3cba28e8e846fc117e5f5c41d)
@@ -39,11 +39,12 @@
         {
             // Call
             using (var resultObserver = new CalculatableFailureMechanismResultObserver<TestCalculatableFailureMechanism,
-                FailureMechanismSectionResultOld,
+                FailureMechanismSectionResultOld, FailureMechanismSectionResult,
                 TestCalculationWithInput>(new TestCalculatableFailureMechanism()))
             {
                 // Assert
-                Assert.IsInstanceOf<FailureMechanismResultObserver<TestCalculatableFailureMechanism, FailureMechanismSectionResultOld>>(resultObserver);
+                Assert.IsInstanceOf<FailureMechanismResultObserver<TestCalculatableFailureMechanism,
+                    FailureMechanismSectionResultOld, FailureMechanismSectionResult>>(resultObserver);
             }
         }
 
@@ -57,6 +58,7 @@
 
             using (var resultObserver = new CalculatableFailureMechanismResultObserver<TestCalculatableFailureMechanism,
                 FailureMechanismSectionResultOld,
+                FailureMechanismSectionResult,
                 TestCalculationWithInput>(failureMechanism))
             {
                 var mocks = new MockRepository();
@@ -84,6 +86,7 @@
 
             using (var resultObserver = new CalculatableFailureMechanismResultObserver<TestCalculatableFailureMechanism,
                 FailureMechanismSectionResultOld,
+                FailureMechanismSectionResult,
                 TestCalculationWithInput>(failureMechanism))
             {
                 var mocks = new MockRepository();
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Observers/FailureMechanismResultObserverTest.cs
===================================================================
diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -r21c1614486e326b3cba28e8e846fc117e5f5c41d
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Observers/FailureMechanismResultObserverTest.cs	(.../FailureMechanismResultObserverTest.cs)	(revision dfd2e82406d3cafb83004a065b3ea1f943ced729)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Observers/FailureMechanismResultObserverTest.cs	(.../FailureMechanismResultObserverTest.cs)	(revision 21c1614486e326b3cba28e8e846fc117e5f5c41d)
@@ -37,7 +37,7 @@
         public void Constructor_FailureMechanismNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate test = () => new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResultOld>(null);
+            TestDelegate test = () => new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResultOld, FailureMechanismSectionResult>(null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -48,7 +48,7 @@
         public void Constructor_WithFailureMechanism_ExpectedProperties()
         {
             // Call
-            using (var resultObserver = new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResultOld>(new TestFailureMechanism()))
+            using (var resultObserver = new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResultOld, FailureMechanismSectionResult>(new TestFailureMechanism()))
             {
                 // Assert
                 Assert.IsInstanceOf<Observable>(resultObserver);
@@ -62,7 +62,7 @@
             // Given
             var failureMechanism = new TestFailureMechanism();
 
-            using (var resultObserver = new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResultOld>(failureMechanism))
+            using (var resultObserver = new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResultOld, FailureMechanismSectionResult>(failureMechanism))
             {
                 var mocks = new MockRepository();
                 var observer = mocks.StrictMock<IObserver>();
@@ -85,7 +85,7 @@
             // Given
             var failureMechanism = new TestFailureMechanism();
 
-            using (var resultObserver = new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResultOld>(failureMechanism))
+            using (var resultObserver = new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResultOld, FailureMechanismSectionResult>(failureMechanism))
             {
                 var mocks = new MockRepository();
                 var observer = mocks.StrictMock<IObserver>();
@@ -112,7 +112,7 @@
                 FailureMechanismSectionTestFactory.CreateFailureMechanismSection()
             });
 
-            using (var resultObserver = new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResultOld>(failureMechanism))
+            using (var resultObserver = new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResultOld, FailureMechanismSectionResult>(failureMechanism))
             {
                 var mocks = new MockRepository();
                 var observer = mocks.StrictMock<IObserver>();
@@ -122,7 +122,7 @@
                 resultObserver.Attach(observer);
 
                 // When
-                failureMechanism.SectionResultsOld.Single().NotifyObservers();
+                failureMechanism.SectionResults.Single().NotifyObservers();
 
                 // Then
                 mocks.VerifyAll();
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Observers/AssessmentSectionResultObserver.cs
===================================================================
diff -u -r6977a377f1246ff91e82f292125d8bd880784412 -r21c1614486e326b3cba28e8e846fc117e5f5c41d
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Observers/AssessmentSectionResultObserver.cs	(.../AssessmentSectionResultObserver.cs)	(revision 6977a377f1246ff91e82f292125d8bd880784412)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Observers/AssessmentSectionResultObserver.cs	(.../AssessmentSectionResultObserver.cs)	(revision 21c1614486e326b3cba28e8e846fc117e5f5c41d)
@@ -93,49 +93,63 @@
             };
 
             closingStructuresObserver = CreateCalculatableFailureMechanismObserver<ClosingStructuresFailureMechanism,
-                ClosingStructuresFailureMechanismSectionResultOld, StructuresCalculation<ClosingStructuresInput>>(assessmentSection.ClosingStructures);
+                ClosingStructuresFailureMechanismSectionResultOld, AdoptableFailureMechanismSectionResult,
+                StructuresCalculation<ClosingStructuresInput>>(assessmentSection.ClosingStructures);
 
             duneErosionObserver = CreateFailureMechanismObserver<DuneErosionFailureMechanism,
-                DuneErosionFailureMechanismSectionResultOld>(assessmentSection.DuneErosion);
+                DuneErosionFailureMechanismSectionResultOld, NonAdoptableFailureMechanismSectionResult>(assessmentSection.DuneErosion);
 
             grassCoverErosionInwardsObserver = CreateCalculatableFailureMechanismObserver<GrassCoverErosionInwardsFailureMechanism,
-                GrassCoverErosionInwardsFailureMechanismSectionResultOld, GrassCoverErosionInwardsCalculation>(assessmentSection.GrassCoverErosionInwards);
+                GrassCoverErosionInwardsFailureMechanismSectionResultOld, AdoptableWithProfileProbabilityFailureMechanismSectionResult,
+                GrassCoverErosionInwardsCalculation>(assessmentSection.GrassCoverErosionInwards);
 
             grassCoverErosionOutwardsObserver = CreateFailureMechanismObserver<GrassCoverErosionOutwardsFailureMechanism,
-                GrassCoverErosionOutwardsFailureMechanismSectionResultOld>(assessmentSection.GrassCoverErosionOutwards);
+                GrassCoverErosionOutwardsFailureMechanismSectionResultOld,
+                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(assessmentSection.GrassCoverErosionOutwards);
 
             heightStructuresObserver = CreateCalculatableFailureMechanismObserver<HeightStructuresFailureMechanism,
-                HeightStructuresFailureMechanismSectionResultOld, StructuresCalculation<HeightStructuresInput>>(assessmentSection.HeightStructures);
+                HeightStructuresFailureMechanismSectionResultOld, AdoptableFailureMechanismSectionResult,
+                StructuresCalculation<HeightStructuresInput>>(assessmentSection.HeightStructures);
 
             macroStabilityInwardsObserver = CreateCalculatableFailureMechanismObserver<MacroStabilityInwardsFailureMechanism,
-                MacroStabilityInwardsFailureMechanismSectionResultOld, MacroStabilityInwardsCalculationScenario>(assessmentSection.MacroStabilityInwards);
+                MacroStabilityInwardsFailureMechanismSectionResultOld, AdoptableWithProfileProbabilityFailureMechanismSectionResult,
+                MacroStabilityInwardsCalculationScenario>(assessmentSection.MacroStabilityInwards);
 
             pipingObserver = CreateCalculatableFailureMechanismObserver<PipingFailureMechanism,
-                PipingFailureMechanismSectionResultOld, SemiProbabilisticPipingCalculationScenario>(assessmentSection.Piping);
+                PipingFailureMechanismSectionResultOld, AdoptableWithProfileProbabilityFailureMechanismSectionResult,
+                SemiProbabilisticPipingCalculationScenario>(assessmentSection.Piping);
 
             stabilityPointStructuresObserver = CreateCalculatableFailureMechanismObserver<StabilityPointStructuresFailureMechanism,
-                StabilityPointStructuresFailureMechanismSectionResultOld, StructuresCalculation<StabilityPointStructuresInput>>(assessmentSection.StabilityPointStructures);
+                StabilityPointStructuresFailureMechanismSectionResultOld, AdoptableFailureMechanismSectionResult,
+                StructuresCalculation<StabilityPointStructuresInput>>(assessmentSection.StabilityPointStructures);
 
             stabilityStoneCoverObserver = CreateFailureMechanismObserver<StabilityStoneCoverFailureMechanism,
-                StabilityStoneCoverFailureMechanismSectionResultOld>(assessmentSection.StabilityStoneCover);
+                StabilityStoneCoverFailureMechanismSectionResultOld,
+                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(assessmentSection.StabilityStoneCover);
 
             waveImpactAsphaltCoverObserver = CreateFailureMechanismObserver<WaveImpactAsphaltCoverFailureMechanism,
-                WaveImpactAsphaltCoverFailureMechanismSectionResultOld>(assessmentSection.WaveImpactAsphaltCover);
+                WaveImpactAsphaltCoverFailureMechanismSectionResultOld,
+                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(assessmentSection.WaveImpactAsphaltCover);
 
             grassCoverSlipOffInwardsObserver = CreateFailureMechanismObserver<GrassCoverSlipOffInwardsFailureMechanism,
-                GrassCoverSlipOffInwardsFailureMechanismSectionResultOld>(assessmentSection.GrassCoverSlipOffInwards);
+                GrassCoverSlipOffInwardsFailureMechanismSectionResultOld,
+                NonAdoptableFailureMechanismSectionResult>(assessmentSection.GrassCoverSlipOffInwards);
 
             grassCoverSlipOffOutwardsObserver = CreateFailureMechanismObserver<GrassCoverSlipOffOutwardsFailureMechanism,
-                GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld>(assessmentSection.GrassCoverSlipOffOutwards);
+                GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld,
+                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(assessmentSection.GrassCoverSlipOffOutwards);
 
             microstabilityObserver = CreateFailureMechanismObserver<MicrostabilityFailureMechanism,
-                MicrostabilityFailureMechanismSectionResultOld>(assessmentSection.Microstability);
+                MicrostabilityFailureMechanismSectionResultOld,
+                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(assessmentSection.Microstability);
 
             pipingStructureObserver = CreateFailureMechanismObserver<PipingStructureFailureMechanism,
-                PipingStructureFailureMechanismSectionResultOld>(assessmentSection.PipingStructure);
+                PipingStructureFailureMechanismSectionResultOld,
+                NonAdoptableFailureMechanismSectionResult>(assessmentSection.PipingStructure);
 
             waterPressureAsphaltCoverObserver = CreateFailureMechanismObserver<WaterPressureAsphaltCoverFailureMechanism,
-                WaterPressureAsphaltCoverFailureMechanismSectionResultOld>(assessmentSection.WaterPressureAsphaltCover);
+                WaterPressureAsphaltCoverFailureMechanismSectionResultOld,
+                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(assessmentSection.WaterPressureAsphaltCover);
         }
 
         public void Dispose()
@@ -189,26 +203,28 @@
             waterPressureAsphaltCoverObserver.Observable = assessmentSection.WaterPressureAsphaltCover;
         }
 
-        private Observer CreateCalculatableFailureMechanismObserver<TFailureMechanism, TSectionResult, TCalculation>(TFailureMechanism failureMechanism)
-            where TFailureMechanism : IFailureMechanism, IHasSectionResults<TSectionResult>, ICalculatableFailureMechanism
-            where TSectionResult : FailureMechanismSectionResultOld
+        private Observer CreateCalculatableFailureMechanismObserver<TFailureMechanism, TSectionResultOld, TSectionResult, TCalculation>(TFailureMechanism failureMechanism)
+            where TFailureMechanism : IFailureMechanism, IHasSectionResults<TSectionResultOld, TSectionResult>, ICalculatableFailureMechanism
+            where TSectionResultOld : FailureMechanismSectionResultOld
+            where TSectionResult : FailureMechanismSectionResult
             where TCalculation : ICalculation<ICalculationInput>
         {
             return new Observer(NotifyObservers)
             {
                 Observable = new CalculatableFailureMechanismResultObserver<TFailureMechanism,
-                    TSectionResult, TCalculation>(failureMechanism)
+                    TSectionResultOld, TSectionResult, TCalculation>(failureMechanism)
             };
         }
 
-        private Observer CreateFailureMechanismObserver<TFailureMechanism, TSectionResult>(TFailureMechanism failureMechanism)
-            where TFailureMechanism : IFailureMechanism, IHasSectionResults<TSectionResult>
-            where TSectionResult : FailureMechanismSectionResultOld
+        private Observer CreateFailureMechanismObserver<TFailureMechanism, TSectionResultOld, TSectionResult>(TFailureMechanism failureMechanism)
+            where TFailureMechanism : IFailureMechanism, IHasSectionResults<TSectionResultOld, TSectionResult>
+            where TSectionResultOld : FailureMechanismSectionResultOld
+            where TSectionResult : FailureMechanismSectionResult
         {
             return new Observer(NotifyObservers)
             {
                 Observable = new FailureMechanismResultObserver<TFailureMechanism,
-                    TSectionResult>(failureMechanism)
+                    TSectionResultOld, TSectionResult>(failureMechanism)
             };
         }
     }