Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensions.cs
===================================================================
diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -rb456ef8d3145ac3b434af49704b12b02afcb9b38
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensions.cs	(.../StabilityPointStructuresFailureMechanismCreateExtensions.cs)	(revision dfd2e82406d3cafb83004a065b3ea1f943ced729)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensions.cs	(.../StabilityPointStructuresFailureMechanismCreateExtensions.cs)	(revision b456ef8d3145ac3b434af49704b12b02afcb9b38)
@@ -24,7 +24,9 @@
 using Core.Common.Util.Extensions;
 using Riskeer.Common.Data;
 using Riskeer.Common.Data.DikeProfiles;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.StabilityPointStructures.Data;
+using Riskeer.Storage.Core.Create.FailureMechanismSectionResults;
 using Riskeer.Storage.Core.DbContext;
 
 namespace Riskeer.Storage.Core.Create.StabilityPointStructures
@@ -48,18 +50,18 @@
             AddEntitiesForStabilityPointStructures(mechanism.StabilityPointStructures, entity, registry);
             AddEntitiesForFailureMechanismMeta(mechanism, entity);
             entity.CalculationGroupEntity = mechanism.CalculationsGroup.Create(registry, 0);
-            AddEntitiesForSectionResults(mechanism.SectionResultsOld, registry);
+            AddEntitiesForSectionResults(mechanism.SectionResults, registry);
 
             return entity;
         }
 
         private static void AddEntitiesForSectionResults(
-            IEnumerable<StabilityPointStructuresFailureMechanismSectionResultOld> sectionResults,
+            IEnumerable<AdoptableFailureMechanismSectionResult> sectionResults,
             PersistenceRegistry registry)
         {
-            foreach (StabilityPointStructuresFailureMechanismSectionResultOld failureMechanismSectionResult in sectionResults)
+            foreach (AdoptableFailureMechanismSectionResult failureMechanismSectionResult in sectionResults)
             {
-                StabilityPointStructuresSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create();
+                var sectionResultEntity = failureMechanismSectionResult.Create<StabilityPointStructuresSectionResultEntity>();
                 FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section);
                 section.StabilityPointStructuresSectionResultEntities.Add(sectionResultEntity);
             }
Fisheye: Tag b456ef8d3145ac3b434af49704b12b02afcb9b38 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismSectionResultCreateExtensions.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/Partials/PartialStabilityPointStructuresSectionResultEntity.cs
===================================================================
diff -u
--- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/Partials/PartialStabilityPointStructuresSectionResultEntity.cs	(revision 0)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/Partials/PartialStabilityPointStructuresSectionResultEntity.cs	(revision b456ef8d3145ac3b434af49704b12b02afcb9b38)
@@ -0,0 +1,29 @@
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Riskeer.Storage.Core.DbContext
+{
+    /// <summary>
+    /// Partial implementation of <see cref="StabilityPointStructuresSectionResultEntity"/> that implements 
+    /// <see cref="IAdoptableFailureMechanismSectionResultEntity"/>.
+    /// </summary>
+    public partial class StabilityPointStructuresSectionResultEntity : IAdoptableFailureMechanismSectionResultEntity {}
+}
\ No newline at end of file
Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/StabilityPointStructuresSectionResultEntity.cs
===================================================================
diff -u -r07650efa100bd67bc2be95f5666a87e59da8e103 -rb456ef8d3145ac3b434af49704b12b02afcb9b38
--- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/StabilityPointStructuresSectionResultEntity.cs	(.../StabilityPointStructuresSectionResultEntity.cs)	(revision 07650efa100bd67bc2be95f5666a87e59da8e103)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/StabilityPointStructuresSectionResultEntity.cs	(.../StabilityPointStructuresSectionResultEntity.cs)	(revision b456ef8d3145ac3b434af49704b12b02afcb9b38)
@@ -30,7 +30,7 @@
 
 namespace Riskeer.Storage.Core.DbContext
 {
-    public class StabilityPointStructuresSectionResultEntity
+    public partial class StabilityPointStructuresSectionResultEntity
     {
         public long StabilityPointStructuresSectionResultEntityId { get; set; }
         public long FailureMechanismSectionEntityId { get; set; }
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -rdce1ae84f0269d30cddbeb502227db25d84e7f7a -rb456ef8d3145ac3b434af49704b12b02afcb9b38
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision dce1ae84f0269d30cddbeb502227db25d84e7f7a)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision b456ef8d3145ac3b434af49704b12b02afcb9b38)
@@ -1072,8 +1072,7 @@
             foreach (StabilityPointStructuresSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.StabilityPointStructuresSectionResultEntities))
             {
                 FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
-                StabilityPointStructuresFailureMechanismSectionResultOld result = failureMechanism.SectionResultsOld
-                                                                                                  .Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
+                AdoptableFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
 
                 sectionResultEntity.Read(result);
             }
Fisheye: Tag b456ef8d3145ac3b434af49704b12b02afcb9b38 refers to a dead (removed) revision in file `Riskeer/Storage/src/Riskeer.Storage.Core/Read/StabilityPointStructures/StabilityPointStructuresSectionResultEntityReadExtensions.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b456ef8d3145ac3b434af49704b12b02afcb9b38 refers to a dead (removed) revision in file `Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismSectionResultCreateExtensionsTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b456ef8d3145ac3b434af49704b12b02afcb9b38 refers to a dead (removed) revision in file `Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StabilityPointStructures/StabilityPointStructuresSectionResultEntityReadExtensionsTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?