diff --git a/networkdetector/devicepluginnetworkdetector.cpp b/networkdetector/devicepluginnetworkdetector.cpp
index ab0fcc24..7fd460a9 100644
--- a/networkdetector/devicepluginnetworkdetector.cpp
+++ b/networkdetector/devicepluginnetworkdetector.cpp
@@ -31,26 +31,21 @@
 
 DevicePluginNetworkDetector::DevicePluginNetworkDetector()
 {
-    m_discovery = new Discovery(this);
-    connect(m_discovery, &Discovery::finished, this, &DevicePluginNetworkDetector::discoveryFinished);
-
     m_broadcastPing = new BroadcastPing(this);
     connect(m_broadcastPing, &BroadcastPing::finished, this, &DevicePluginNetworkDetector::broadcastPingFinished);
 }
 
 DevicePluginNetworkDetector::~DevicePluginNetworkDetector()
 {
-    if (m_discovery->isRunning()) {
-        m_discovery->abort();
-    }
 }
 
 void DevicePluginNetworkDetector::init()
 {
 }
 
-Device::DeviceSetupStatus DevicePluginNetworkDetector::setupDevice(Device *device)
+void DevicePluginNetworkDetector::setupDevice(DeviceSetupInfo *info)
 {
+    Device *device = info->device();
     qCDebug(dcNetworkDetector()) << "Setup" << device->name() << device->params();
     DeviceMonitor *monitor = new DeviceMonitor(device->name(),
                                                device->paramValue(networkDeviceDeviceMacAddressParamTypeId).toString(),
@@ -80,25 +75,39 @@ Device::DeviceSetupStatus DevicePluginNetworkDetector::setupDevice(Device *devic
         m_broadcastPing->run();
     }
 
-    return Device::DeviceSetupStatusSuccess;
+    info->finish(Device::DeviceErrorNoError);
 }
 
-Device::DeviceError DevicePluginNetworkDetector::discoverDevices(const DeviceClassId &deviceClassId, const ParamList &params)
+void DevicePluginNetworkDetector::discoverDevices(DeviceDiscoveryInfo *info)
 {
-    Q_UNUSED(params)
+    Discovery *discovery = new Discovery(this);
+    discovery->discoverHosts(25);
 
+    // clean up discovery object when this discovery info is deleted
+    connect(info, &DeviceDiscoveryInfo::destroyed, discovery, &Discovery::deleteLater);
 
-    if (deviceClassId != networkDeviceDeviceClassId)
-        return Device::DeviceErrorDeviceClassNotFound;
+    connect(discovery, &Discovery::finished, info, [this, info](const QList<Host> &hosts) {
+        qCDebug(dcNetworkDetector()) << "Discovery finished. Found" << hosts.count() << "devices";
+        foreach (const Host &host, hosts) {
+            DeviceDescriptor descriptor(networkDeviceDeviceClassId, host.hostName().isEmpty() ? host.address() : host.hostName(), host.address() + " (" + host.macAddress() + ")");
 
-    if (m_discovery->isRunning()) {
-        qCWarning(dcNetworkDetector()) << "Network discovery already running";
-        return Device::DeviceErrorDeviceInUse;
-    }
+            foreach (Device *existingDevice, myDevices()) {
+                if (existingDevice->paramValue(networkDeviceDeviceMacAddressParamTypeId).toString() == host.macAddress()) {
+                    descriptor.setDeviceId(existingDevice->id());
+                    break;
+                }
+            }
 
-    m_discovery->discoverHosts(25);
+            ParamList params;
+            params << Param(networkDeviceDeviceMacAddressParamTypeId, host.macAddress());
+            params << Param(networkDeviceDeviceAddressParamTypeId, host.address());
+            descriptor.setParams(params);
 
-    return Device::DeviceErrorAsync;
+            info->addDeviceDescriptor(descriptor);
+
+        }
+        info->finish(Device::DeviceErrorNoError);
+    });
 }
 
 void DevicePluginNetworkDetector::deviceRemoved(Device *device)
@@ -121,41 +130,6 @@ void DevicePluginNetworkDetector::broadcastPingFinished()
     }
 }
 
-void DevicePluginNetworkDetector::discoveryFinished(const QList<Host> &hosts)
-{
-    qCDebug(dcNetworkDetector()) << "Discovery finished. Found" << hosts.count() << "devices";
-    QList<DeviceDescriptor> discoveredDevices;
-    foreach (const Host &host, hosts) {
-
-        DeviceDescriptor descriptor(networkDeviceDeviceClassId, host.hostName().isEmpty() ? host.address() : host.hostName(), host.address() + " (" + host.macAddress() + ")");
-
-        foreach (Device *existingDevice, myDevices()) {
-            if (existingDevice->paramValue(networkDeviceDeviceMacAddressParamTypeId).toString() == host.macAddress()) {
-                descriptor.setDeviceId(existingDevice->id());
-                break;
-            }
-        }
-
-        ParamList paramList;
-        Param macAddress(networkDeviceDeviceMacAddressParamTypeId, host.macAddress());
-        Param address(networkDeviceDeviceAddressParamTypeId, host.address());
-        paramList.append(macAddress);
-        paramList.append(address);
-        descriptor.setParams(paramList);
-
-        foreach (Device *existingDevice, myDevices()) {
-            if (existingDevice->paramValue(networkDeviceDeviceMacAddressParamTypeId).toString() == host.macAddress()) {
-                descriptor.setDeviceId(existingDevice->id());
-                break;
-            }
-        }
-
-        discoveredDevices.append(descriptor);
-    }
-
-    emit devicesDiscovered(networkDeviceDeviceClassId, discoveredDevices);
-}
-
 void DevicePluginNetworkDetector::deviceReachableChanged(bool reachable)
 {
     DeviceMonitor *monitor = static_cast<DeviceMonitor*>(sender());
diff --git a/networkdetector/devicepluginnetworkdetector.h b/networkdetector/devicepluginnetworkdetector.h
index 6c357376..e87b73cf 100644
--- a/networkdetector/devicepluginnetworkdetector.h
+++ b/networkdetector/devicepluginnetworkdetector.h
@@ -48,14 +48,12 @@ public:
 
     void init() override;
 
-    Device::DeviceSetupStatus setupDevice(Device *device) override;
-    Device::DeviceError discoverDevices(const DeviceClassId &deviceClassId, const ParamList &params) override;
+    void setupDevice(DeviceSetupInfo *info) override;
+    void discoverDevices(DeviceDiscoveryInfo *info) override;
     void deviceRemoved(Device *device) override;
 
 
 private slots:
-    void discoveryFinished(const QList<Host> &hosts);
-
     void deviceReachableChanged(bool reachable);
     void deviceAddressChanged(const QString &address);
     void deviceSeen();
@@ -64,7 +62,6 @@ private slots:
 
 private:
     PluginTimer *m_pluginTimer = nullptr;
-    Discovery *m_discovery = nullptr;
     BroadcastPing *m_broadcastPing = nullptr;
     QHash<DeviceMonitor*, Device*> m_monitors;
 };