Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -rb1689a3cc2357a00e831ff7229278fcfcf129708 -r326ea3c17e8fb26083edbc487d5fa3bede0064ee
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision b1689a3cc2357a00e831ff7229278fcfcf129708)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 326ea3c17e8fb26083edbc487d5fa3bede0064ee)
@@ -300,7 +300,24 @@
             {
                 if (project is RiskeerProject riskeerProject)
                 {
-                    return WrapFailureMechanismsInContexts(riskeerProject.AssessmentSections.First());
+                    AssessmentSection assessmentSection = riskeerProject.AssessmentSections.First();
+
+                    var failureMechanisms = new IFailureMechanism[]
+                    {
+                        assessmentSection.MacroStabilityOutwards,
+                        assessmentSection.Microstability,
+                        assessmentSection.WaterPressureAsphaltCover,
+                        assessmentSection.GrassCoverSlipOffOutwards,
+                        assessmentSection.GrassCoverSlipOffInwards,
+                        assessmentSection.PipingStructure,
+                        assessmentSection.StrengthStabilityLengthwiseConstruction,
+                        assessmentSection.TechnicalInnovation
+                    };
+
+                    return failureMechanisms.Select(failureMechanism => failureMechanismAssociations
+                                                                        .First(a => a.Match(failureMechanism))
+                                                                        .Create(failureMechanism, assessmentSection))
+                                            .ToArray();
                 }
 
                 return null;
@@ -310,7 +327,26 @@
             {
                 if (project is RiskeerProject riskeerProject)
                 {
-                    return WrapFailureMechanismsInContexts(riskeerProject.AssessmentSections.First());
+                    AssessmentSection assessmentSection = riskeerProject.AssessmentSections.First();
+
+                    var failureMechanisms = new IFailureMechanism[]
+                    {
+                        assessmentSection.Piping,
+                        assessmentSection.GrassCoverErosionInwards,
+                        assessmentSection.MacroStabilityInwards,
+                        assessmentSection.StabilityStoneCover,
+                        assessmentSection.WaveImpactAsphaltCover,
+                        assessmentSection.GrassCoverErosionOutwards,
+                        assessmentSection.HeightStructures,
+                        assessmentSection.ClosingStructures,
+                        assessmentSection.StabilityPointStructures,
+                        assessmentSection.DuneErosion
+                    };
+
+                    return failureMechanisms.Select(failureMechanism => failureMechanismAssociations
+                                                                        .First(a => a.Match(failureMechanism))
+                                                                        .Create(failureMechanism, assessmentSection))
+                                            .ToArray();
                 }
 
                 return null;