Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -rf99c766e67789eab53284ff88c86bb5cb6a5323b -r818c6e0cd70f67eab31941bffea5bd62d1a191e6
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision f99c766e67789eab53284ff88c86bb5cb6a5323b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 818c6e0cd70f67eab31941bffea5bd62d1a191e6)
@@ -384,7 +384,7 @@
             };
             yield return new PropertyInfo<ReferenceLineContext, ReferenceLineProperties>
             {
-                CreateInstance = context => new ReferenceLineProperties(context.WrappedData.ReferenceLine)
+                CreateInstance = context => new ReferenceLineProperties(context.WrappedData)
             };
             yield return new PropertyInfo<FailureMechanismAssemblyCategoriesContext, FailureMechanismAssemblyCategoriesProperties>
             {
@@ -764,8 +764,8 @@
             yield return new ExportInfo<ReferenceLineContext>
             {
                 Name = RingtoetsCommonDataResources.ReferenceLine_DisplayName,
-                CreateFileExporter = (context, filePath) => new ReferenceLineExporter(context.WrappedData.ReferenceLine, context.WrappedData.Id, filePath),
-                IsEnabled = context => HasReferenceLine(context.WrappedData),
+                CreateFileExporter = (context, filePath) => new ReferenceLineExporter(context.WrappedData, context.AssessmentSection.Id, filePath),
+                IsEnabled = context => HasReferenceLine(context.AssessmentSection),
                 FileFilterGenerator = new FileFilterGenerator(RingtoetsCommonIOResources.Shape_file_filter_Extension,
                                                               RingtoetsCommonIOResources.Shape_file_filter_Description)
             };
@@ -904,7 +904,7 @@
             {
                 Text = context => RingtoetsCommonDataResources.ReferenceLine_DisplayName,
                 Image = context => RingtoetsCommonFormsResources.ReferenceLineIcon,
-                ForeColor = context => context.WrappedData.ReferenceLine.Points.Any()
+                ForeColor = context => context.WrappedData.Points.Any()
                                            ? Color.FromKnownColor(KnownColor.ControlText)
                                            : Color.FromKnownColor(KnownColor.GrayText),
                 ContextMenuStrip = ReferenceLineContextMenuStrip
@@ -1662,7 +1662,7 @@
         {
             var childNodes = new List<object>
             {
-                new ReferenceLineContext(nodeData),
+                new ReferenceLineContext(nodeData.ReferenceLine, nodeData),
                 new NormContext(nodeData.FailureMechanismContribution, nodeData),
                 new FailureMechanismContributionContext(nodeData.FailureMechanismContribution, nodeData),
                 new HydraulicBoundaryDatabaseContext(nodeData.HydraulicBoundaryDatabase, nodeData),
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/ReferenceLineContextExportInfoTest.cs
===================================================================
diff -u -r1d1c635affe9ac0e8454cd1badea40cf11669916 -r818c6e0cd70f67eab31941bffea5bd62d1a191e6
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/ReferenceLineContextExportInfoTest.cs	(.../ReferenceLineContextExportInfoTest.cs)	(revision 1d1c635affe9ac0e8454cd1badea40cf11669916)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/ReferenceLineContextExportInfoTest.cs	(.../ReferenceLineContextExportInfoTest.cs)	(revision 818c6e0cd70f67eab31941bffea5bd62d1a191e6)
@@ -62,7 +62,7 @@
             // Setup
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
 
-            var context = new ReferenceLineContext(assessmentSection);
+            var context = new ReferenceLineContext(assessmentSection.ReferenceLine, assessmentSection);
             const string filePath = "test";
 
             using (var plugin = new RingtoetsPlugin())
@@ -98,7 +98,7 @@
         {
             // Setup
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
-            var context = new ReferenceLineContext(assessmentSection);
+            var context = new ReferenceLineContext(assessmentSection.ReferenceLine, assessmentSection);
 
             using (var plugin = new RingtoetsPlugin())
             {
@@ -119,7 +119,7 @@
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
             assessmentSection.ReferenceLine.SetGeometry(ReferenceLineTestFactory.CreateReferenceLineGeometry());
 
-            var context = new ReferenceLineContext(assessmentSection);
+            var context = new ReferenceLineContext(assessmentSection.ReferenceLine, assessmentSection);
 
             using (var plugin = new RingtoetsPlugin())
             {
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/ReferenceLinePropertyInfoTest.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r818c6e0cd70f67eab31941bffea5bd62d1a191e6
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/ReferenceLinePropertyInfoTest.cs	(.../ReferenceLinePropertyInfoTest.cs)	(revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/ReferenceLinePropertyInfoTest.cs	(.../ReferenceLinePropertyInfoTest.cs)	(revision 818c6e0cd70f67eab31941bffea5bd62d1a191e6)
@@ -64,7 +64,7 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var context = new ReferenceLineContext(assessmentSection);
+            var context = new ReferenceLineContext(assessmentSection.ReferenceLine, assessmentSection);
 
             // Call
             IObjectProperties objectProperties = info.CreateInstance(context);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ReferenceLineContextTreeNodeInfoTest.cs
===================================================================
diff -u -r9d3f2fc54e77d3a814922bcc3530eecdab5089b9 -r818c6e0cd70f67eab31941bffea5bd62d1a191e6
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ReferenceLineContextTreeNodeInfoTest.cs	(.../ReferenceLineContextTreeNodeInfoTest.cs)	(revision 9d3f2fc54e77d3a814922bcc3530eecdab5089b9)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ReferenceLineContextTreeNodeInfoTest.cs	(.../ReferenceLineContextTreeNodeInfoTest.cs)	(revision 818c6e0cd70f67eab31941bffea5bd62d1a191e6)
@@ -86,14 +86,14 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var referenceLineContext = new ReferenceLineContext(assessmentSection);
+            var context = new ReferenceLineContext(new ReferenceLine(), assessmentSection);
 
             using (var plugin = new RingtoetsPlugin())
             {
                 TreeNodeInfo info = GetInfo(plugin);
 
                 // Call
-                string text = info.Text(referenceLineContext);
+                string text = info.Text(context);
 
                 // Assert
                 Assert.AreEqual("Referentielijn", text);
@@ -109,14 +109,14 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var referenceLineContext = new ReferenceLineContext(assessmentSection);
+            var context = new ReferenceLineContext(new ReferenceLine(), assessmentSection);
 
             using (var plugin = new RingtoetsPlugin())
             {
                 TreeNodeInfo info = GetInfo(plugin);
 
                 // Call
-                Image image = info.Image(referenceLineContext);
+                Image image = info.Image(context);
 
                 // Assert
                 TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ReferenceLineIcon, image);
@@ -164,10 +164,9 @@
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            assessmentSection.Stub(a => a.ReferenceLine).Return(new ReferenceLine());
             mocks.ReplayAll();
 
-            var referenceLineContext = new ReferenceLineContext(assessmentSection);
+            var referenceLineContext = new ReferenceLineContext(new ReferenceLine(), assessmentSection);
 
             using (var plugin = new RingtoetsPlugin())
             {
@@ -188,10 +187,10 @@
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            assessmentSection.Stub(a => a.ReferenceLine).Return(ReferenceLineTestFactory.CreateReferenceLineWithGeometry());
             mocks.ReplayAll();
 
-            var referenceLineContext = new ReferenceLineContext(assessmentSection);
+            var referenceLineContext = new ReferenceLineContext(ReferenceLineTestFactory.CreateReferenceLineWithGeometry(),
+                                                                assessmentSection);
 
             using (var plugin = new RingtoetsPlugin())
             {