diff --git a/plugins/UM3NetworkPrinting/src/Models/Http/PrinterSystemStatus.py b/plugins/UM3NetworkPrinting/src/Models/Http/PrinterSystemStatus.py
index 01539bd365..ad7b9c8698 100644
--- a/plugins/UM3NetworkPrinting/src/Models/Http/PrinterSystemStatus.py
+++ b/plugins/UM3NetworkPrinting/src/Models/Http/PrinterSystemStatus.py
@@ -1,12 +1,15 @@
 # Copyright (c) 2019 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
+from typing import Dict, Any
+
 from ..BaseModel import BaseModel
 
 
 ## Class representing the system status of a printer.
 class PrinterSystemStatus(BaseModel):
 
-    def __init__(self, guid: str, firmware: str, hostname: str, name: str, platform: str, variant: str, **kwargs
+    def __init__(self, guid: str, firmware: str, hostname: str, name: str, platform: str, variant: str,
+                 hardware: Dict[str, Any], **kwargs
                  ) -> None:
         self.guid = guid
         self.firmware = firmware
@@ -14,4 +17,5 @@ class PrinterSystemStatus(BaseModel):
         self.name = name
         self.platform = platform
         self.variant = variant
+        self.hardware = hardware
         super().__init__(**kwargs)
diff --git a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py
index 47a7df7faf..1b31f94567 100644
--- a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py
+++ b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py
@@ -115,9 +115,10 @@ class LocalClusterOutputDeviceManager:
         self._onDeviceDiscovered("manual:{}".format(address), address, {
             b"name": status.name.encode("utf-8"),
             b"address": address.encode("utf-8"),
+            b"machine": str(status.hardware.get("typeid", "")).encode("utf-8"),
             b"manual": b"true",
-            b"incomplete": b"true",
-            b"temporary": b"true"
+            b"firmware_version": status.firmware.encode("utf-8"),
+            b"cluster_size": b"1"
         })
         CuraApplication.getInstance().callLater(callback, True, address)