Index: /applications/editors/josm/plugins/buildings_tools/build.xml
===================================================================
--- /applications/editors/josm/plugins/buildings_tools/build.xml	(revision 32454)
+++ /applications/editors/josm/plugins/buildings_tools/build.xml	(revision 32455)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="BuildingTools: Alt key to disable tags"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="8863"/>
+    <property name="plugin.main.version" value="10353"/>
     
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/Building.java
===================================================================
--- /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/Building.java	(revision 32454)
+++ /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/Building.java	(revision 32455)
@@ -207,5 +207,5 @@
 
     private Node findNode(EastNorth pos) {
-        DataSet ds = Main.main.getCurrentDataSet();
+        DataSet ds = Main.getLayerManager().getEditDataSet();
         LatLon l = eastNorth2latlon(pos);
         List<Node> nodes = ds.searchNodes(new BBox(l.lon() - 0.0000001, l.lat() - 0.0000001,
@@ -234,5 +234,5 @@
         List<Node> nodes = new LinkedList<>();
         nodesloop:
-        for (Node n : Main.main.getCurrentDataSet().searchNodes(bbox)) {
+        for (Node n : Main.getLayerManager().getEditDataSet().searchNodes(bbox)) {
             if (!n.isUsable())
                 continue;
Index: /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java
===================================================================
--- /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java	(revision 32454)
+++ /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java	(revision 32455)
@@ -20,5 +20,4 @@
 import java.util.Collection;
 import java.util.LinkedList;
-import java.util.Map;
 import java.util.Map.Entry;
 
@@ -128,5 +127,5 @@
     public void enterMode() {
         super.enterMode();
-        if (getCurrentDataSet() == null) {
+        if (getLayerManager().getEditDataSet() == null) {
             Main.map.selectSelectTool(false);
             return;
@@ -140,5 +139,5 @@
         Main.map.keyDetector.addModifierListener(this);
         DataSet.addSelectionListener(this);
-        updateSnap(getCurrentDataSet().getSelected());
+        updateSnap(getLayerManager().getEditDataSet().getSelected());
     }
 
@@ -307,6 +306,6 @@
                     showAddrDialog(w);
                 if (ToolSettings.isAutoSelect()
-                        && (Main.main.getCurrentDataSet().getSelected().isEmpty() || shift)) {
-                    Main.main.getCurrentDataSet().setSelected(w);
+                        && (getLayerManager().getEditDataSet().getSelected().isEmpty() || shift)) {
+                    getLayerManager().getEditDataSet().setSelected(w);
                 }
             }
Index: /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/MergeAddrPointsAction.java
===================================================================
--- /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/MergeAddrPointsAction.java	(revision 32454)
+++ /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/MergeAddrPointsAction.java	(revision 32455)
@@ -49,5 +49,5 @@
         if (!isEnabled())
             return;
-        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
+        Collection<OsmPrimitive> selection = getLayerManager().getEditDataSet().getSelected();
         if (selection.isEmpty()) {
             new Notification(tr("Select both address nodes and building ways to merge"))
@@ -146,5 +146,5 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(getCurrentDataSet() != null);
+        setEnabled(getLayerManager().getEditDataSet() != null);
     }
 }