Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -r2adb3c29acf0444b0c3b67dba9a1269a8347be9a -r26759da804c8d9c559de39f30e220ab5dbaa5f3c
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 2adb3c29acf0444b0c3b67dba9a1269a8347be9a)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 26759da804c8d9c559de39f30e220ab5dbaa5f3c)
@@ -2513,21 +2513,9 @@
         {
             var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
 
-            var addHydraulicBoundaryDatabaseItem = new StrictContextMenuItem(
-                Resources.ContextMenuStrip_Add_HydraulicBoundaryDatabase,
-                Resources.ContextMenuStrip_Add_HydraulicBoundaryDatabase_ToolTip,
-                RiskeerCommonFormsResources.DatabaseIcon,
-                (sender, args) =>
-                {
-                    nodeData.WrappedData.HydraulicBoundaryDatabases.Add(new HydraulicBoundaryDatabase
-                    {
-                        FilePath = Path.Combine(Path.GetDirectoryName(nodeData.WrappedData.HydraulicLocationConfigurationDatabase.FilePath), "Test.sqlite")
-                    });
-
-                    nodeData.WrappedData.NotifyObservers();
-                });
-
-            return builder.AddCustomItem(addHydraulicBoundaryDatabaseItem)
+            return builder.AddImportItem(Resources.ContextMenuStrip_Add_HydraulicBoundaryDatabase,
+                                         Resources.ContextMenuStrip_Add_HydraulicBoundaryDatabase_ToolTip,
+                                         RiskeerCommonFormsResources.DatabaseIcon)
                           .AddSeparator()
                           .AddRemoveAllChildrenItem()
                           .AddSeparator()
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabasesContextTreeNodeInfoTest.cs
===================================================================
diff -u -recbba2f636e82f8d94ee7deea09730e39190d2bb -r26759da804c8d9c559de39f30e220ab5dbaa5f3c
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabasesContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabasesContextTreeNodeInfoTest.cs)	(revision ecbba2f636e82f8d94ee7deea09730e39190d2bb)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabasesContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabasesContextTreeNodeInfoTest.cs)	(revision 26759da804c8d9c559de39f30e220ab5dbaa5f3c)
@@ -123,7 +123,7 @@
 
             using (mocks.Ordered())
             {
-                menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder);
+                menuBuilder.Expect(mb => mb.AddImportItem(null, null, null)).IgnoreArguments().Return(menuBuilder);
                 menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);
                 menuBuilder.Expect(mb => mb.AddDeleteChildrenItem()).Return(menuBuilder);
                 menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);