Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -r4fdfde48aaf11f12a67b4dd49b5c8e680419180f -r2df76933d9ad8eb749c41ef3363003ca58bde1df
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 4fdfde48aaf11f12a67b4dd49b5c8e680419180f)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 2df76933d9ad8eb749c41ef3363003ca58bde1df)
@@ -2418,7 +2418,8 @@
             {
                 return new object[]
                 {
-                    new HydraulicBoundaryDatabasesContext(nodeData.WrappedData, nodeData.AssessmentSection),
+                    new HydraulicLocationConfigurationDatabaseContext(nodeData.WrappedData, nodeData.AssessmentSection),
+                    new HydraulicBoundaryDatabasesContext(nodeData.WrappedData, nodeData.AssessmentSection)
                 };
             }
 
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDataContextTreeNodeInfoTest.cs
===================================================================
diff -u -rd84083bdbd06350e904ba709cdd0a760f6f62b75 -r2df76933d9ad8eb749c41ef3363003ca58bde1df
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDataContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDataContextTreeNodeInfoTest.cs)	(revision d84083bdbd06350e904ba709cdd0a760f6f62b75)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDataContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDataContextTreeNodeInfoTest.cs)	(revision 2df76933d9ad8eb749c41ef3363003ca58bde1df)
@@ -136,8 +136,6 @@
                 }
 
                 menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);
-                menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder);
-                menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);
                 menuBuilder.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilder);
                 menuBuilder.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilder);
                 menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);
@@ -259,7 +257,7 @@
                     // Call
                     using (ContextMenuStrip menu = info.ContextMenuStrip(context, null, treeViewControl))
                     {
-                        Assert.AreEqual(9, menu.Items.Count);
+                        Assert.AreEqual(7, menu.Items.Count);
 
                         TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuSelectDifferentFolderIndex,
                                                                       "Selecteer andere bestandsmap...",
@@ -358,10 +356,15 @@
                 object[] objects = info.ChildNodeObjects(hydraulicBoundaryDataContext).ToArray();
 
                 // Assert
-                Assert.AreEqual(1, objects.Length);
+                Assert.AreEqual(2, objects.Length);
 
-                var hydraulicBoundaryDatabasesContext = (HydraulicBoundaryDatabasesContext) objects[0];
+                var hydraulicLocationConfigurationDatabaseContext = (HydraulicLocationConfigurationDatabaseContext) objects[0];
+                Assert.AreSame(assessmentSection.HydraulicBoundaryData, hydraulicLocationConfigurationDatabaseContext.WrappedData);
+                Assert.AreSame(assessmentSection, hydraulicLocationConfigurationDatabaseContext.AssessmentSection);
+
+                var hydraulicBoundaryDatabasesContext = (HydraulicBoundaryDatabasesContext) objects[1];
                 Assert.AreSame(assessmentSection.HydraulicBoundaryData, hydraulicBoundaryDatabasesContext.WrappedData);
+                Assert.AreSame(assessmentSection, hydraulicBoundaryDatabasesContext.AssessmentSection);
             }
         }