diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index a1a2f52305..a2dc27f483 100755
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -2,6 +2,8 @@
 # Cura is released under the terms of the LGPLv3 or higher.
 #Type hinting.
 from typing import Dict
+
+from PyQt5.QtCore import QObject
 from PyQt5.QtNetwork import QLocalServer
 from PyQt5.QtNetwork import QLocalSocket
 
@@ -859,11 +861,13 @@ class CuraApplication(QtApplication):
             self._object_manager = ObjectsModel.createObjectsModel()
         return self._object_manager
 
+    @pyqtSlot(result = QObject)
     def getMultiBuildPlateModel(self, *args):
         if self._multi_build_plate_model is None:
             self._multi_build_plate_model = MultiBuildPlateModel(self)
         return self._multi_build_plate_model
 
+    @pyqtSlot(result = QObject)
     def getBuildPlateModel(self, *args):
         if self._build_plate_model is None:
             self._build_plate_model = BuildPlateModel(self)
@@ -936,8 +940,8 @@ class CuraApplication(QtApplication):
         qmlRegisterSingletonType(MachineActionManager.MachineActionManager, "Cura", 1, 0, "MachineActionManager", self.getMachineActionManager)
 
         qmlRegisterSingletonType(ObjectsModel, "Cura", 1, 0, "ObjectsModel", self.getObjectsModel)
-        qmlRegisterSingletonType(BuildPlateModel, "Cura", 1, 0, "BuildPlateModel", self.getBuildPlateModel)
-        qmlRegisterSingletonType(MultiBuildPlateModel, "Cura", 1, 0, "MultiBuildPlateModel", self.getMultiBuildPlateModel)
+        qmlRegisterType(BuildPlateModel, "Cura", 1, 0, "BuildPlateModel")
+        qmlRegisterType(MultiBuildPlateModel, "Cura", 1, 0, "MultiBuildPlateModel")
         qmlRegisterType(InstanceContainer, "Cura", 1, 0, "InstanceContainer")
         qmlRegisterType(ExtrudersModel, "Cura", 1, 0, "ExtrudersModel")
 
diff --git a/resources/qml/Menus/BuildplateMenu.qml b/resources/qml/Menus/BuildplateMenu.qml
index 8dfc3ced6c..0b67b37cc1 100644
--- a/resources/qml/Menus/BuildplateMenu.qml
+++ b/resources/qml/Menus/BuildplateMenu.qml
@@ -12,17 +12,19 @@ Menu
     id: menu
     title: "Build plate"
 
+    property Cura.BuildPlateModel buildPlateModel: CuraApplication.getBuildPlateModel()
+
     Instantiator
     {
-        model: Cura.BuildPlateModel
+        model: menu.buildPlateModel
 
         MenuItem {
             text: model.name
             checkable: true
-            checked: model.name == Cura.MachineManager.globalVariantName // TODO
+            checked: model.name == Cura.MachineManager.globalVariantName
             exclusiveGroup: group
             onTriggered: {
-                Cura.MachineManager.setGlobalVariant(model.container_node); // TODO
+                Cura.MachineManager.setGlobalVariant(model.container_node);
             }
         }
 
diff --git a/resources/qml/Menus/ContextMenu.qml b/resources/qml/Menus/ContextMenu.qml
index a37204d255..656e94b336 100644
--- a/resources/qml/Menus/ContextMenu.qml
+++ b/resources/qml/Menus/ContextMenu.qml
@@ -15,6 +15,8 @@ Menu
 
     property bool shouldShowExtruders: machineExtruderCount.properties.value > 1;
 
+    property Cura.MultiBuildPlateModel multiBuildPlateModel: CuraApplication.getMultiBuildPlateModel()
+
     // Selection-related actions.
     MenuItem { action: Cura.Actions.centerSelection; }
     MenuItem { action: Cura.Actions.deleteSelection; }
@@ -45,13 +47,13 @@ Menu
 
     Instantiator
     {
-        model: Cura.MultiBuildPlateModel
+        model: base.multiBuildPlateModel
         MenuItem {
             enabled: UM.Selection.hasSelection
-            text: Cura.MultiBuildPlateModel.getItem(index).name;
-            onTriggered: CuraActions.setBuildPlateForSelection(Cura.MultiBuildPlateModel.getItem(index).buildPlateNumber);
+            text: base.multiBuildPlateModel.getItem(index).name;
+            onTriggered: CuraActions.setBuildPlateForSelection(base.multiBuildPlateModel.getItem(index).buildPlateNumber);
             checkable: true
-            checked: Cura.MultiBuildPlateModel.selectionBuildPlates.indexOf(Cura.MultiBuildPlateModel.getItem(index).buildPlateNumber) != -1;
+            checked: base.multiBuildPlateModel.selectionBuildPlates.indexOf(base.multiBuildPlateModel.getItem(index).buildPlateNumber) != -1;
             visible: UM.Preferences.getValue("cura/use_multi_build_plate")
         }
         onObjectAdded: base.insertItem(index, object);
@@ -62,7 +64,7 @@ Menu
         enabled: UM.Selection.hasSelection
         text: "New build plate";
         onTriggered: {
-            CuraActions.setBuildPlateForSelection(Cura.MultiBuildPlateModel.maxBuildPlate + 1);
+            CuraActions.setBuildPlateForSelection(base.multiBuildPlateModel.maxBuildPlate + 1);
             checked = false;
         }
         checkable: true
diff --git a/resources/qml/Menus/ViewMenu.qml b/resources/qml/Menus/ViewMenu.qml
index ff749bec90..fc0339e0c6 100644
--- a/resources/qml/Menus/ViewMenu.qml
+++ b/resources/qml/Menus/ViewMenu.qml
@@ -13,6 +13,8 @@ Menu
     id: base
     enabled: !PrintInformation.preSliced
 
+    property Cura.MultiBuildPlateModel multiBuildPlateModel: CuraApplication.getMultiBuildPlateModel()
+
     // main views
     Instantiator
     {
@@ -53,12 +55,12 @@ Menu
         visible: UM.Preferences.getValue("cura/use_multi_build_plate")
         Instantiator
         {
-            model: Cura.MultiBuildPlateModel
+            model: base.multiBuildPlateModel
             MenuItem {
-                text: Cura.MultiBuildPlateModel.getItem(index).name;
-                onTriggered: Cura.SceneController.setActiveBuildPlate(Cura.MultiBuildPlateModel.getItem(index).buildPlateNumber);
+                text: base.multiBuildPlateModel.getItem(index).name;
+                onTriggered: Cura.SceneController.setActiveBuildPlate(base.multiBuildPlateModel.getItem(index).buildPlateNumber);
                 checkable: true;
-                checked: Cura.MultiBuildPlateModel.getItem(index).buildPlateNumber == Cura.MultiBuildPlateModel.activeBuildPlate;
+                checked: base.multiBuildPlateModel.getItem(index).buildPlateNumber == base.multiBuildPlateModel.activeBuildPlate;
                 exclusiveGroup: buildPlateGroup;
                 visible: UM.Preferences.getValue("cura/use_multi_build_plate")
             }
diff --git a/resources/qml/ObjectsList.qml b/resources/qml/ObjectsList.qml
index f51e1081e6..e7dd63ea05 100644
--- a/resources/qml/ObjectsList.qml
+++ b/resources/qml/ObjectsList.qml
@@ -33,6 +33,8 @@ Rectangle
 
     property bool collapsed: true;
 
+    property Cura.MultiBuildPlateModel multiBuildPlateModel: CuraApplication.getMultiBuildPlateModel()
+
     SystemPalette { id: palette }
 
     Button {
@@ -67,7 +69,7 @@ Rectangle
         Rectangle
             {
                 height: childrenRect.height
-                color: Cura.MultiBuildPlateModel.getItem(index).buildPlateNumber == Cura.MultiBuildPlateModel.activeBuildPlate ? palette.highlight : index % 2 ? palette.base : palette.alternateBase
+                color: multiBuildPlateModel.getItem(index).buildPlateNumber == multiBuildPlateModel.activeBuildPlate ? palette.highlight : index % 2 ? palette.base : palette.alternateBase
                 width: parent.width
                 Label
                 {
@@ -75,8 +77,8 @@ Rectangle
                     anchors.left: parent.left
                     anchors.leftMargin: UM.Theme.getSize("default_margin").width
                     width: parent.width - 2 * UM.Theme.getSize("default_margin").width - 30
-                    text: Cura.MultiBuildPlateModel.getItem(index) ? Cura.MultiBuildPlateModel.getItem(index).name : "";
-                    color: Cura.MultiBuildPlateModel.activeBuildPlate == index ? palette.highlightedText : palette.text
+                    text: multiBuildPlateModel.getItem(index) ? multiBuildPlateModel.getItem(index).name : "";
+                    color: multiBuildPlateModel.activeBuildPlate == index ? palette.highlightedText : palette.text
                     elide: Text.ElideRight
                 }
 
@@ -118,13 +120,12 @@ Rectangle
         ListView
         {
             id: buildPlateListView
-            model: Cura.MultiBuildPlateModel
+            model: multiBuildPlateModel
             width: parent.width
             delegate: buildPlateDelegate
         }
     }
 
-
     Component {
         id: objectDelegate
         Rectangle
@@ -200,7 +201,6 @@ Rectangle
         }
     }
 
-
     CheckBox
     {
         id: filterBuildPlateCheckbox
@@ -260,6 +260,4 @@ Rectangle
         }
         action: Cura.Actions.arrangeAll;
     }
-
-
 }