diff --git a/coinmarketcap/coinmarketcap.pro b/coinmarketcap/coinmarketcap.pro
index ad3216c7..0f061dc7 100644
--- a/coinmarketcap/coinmarketcap.pro
+++ b/coinmarketcap/coinmarketcap.pro
@@ -9,4 +9,3 @@ SOURCES += \
 
 HEADERS += \
     deviceplugincoinmarketcap.h \
-
diff --git a/coinmarketcap/deviceplugincoinmarketcap.cpp b/coinmarketcap/deviceplugincoinmarketcap.cpp
index 8f24f6b9..d99b5abd 100644
--- a/coinmarketcap/deviceplugincoinmarketcap.cpp
+++ b/coinmarketcap/deviceplugincoinmarketcap.cpp
@@ -1,6 +1,6 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *                                                                         *
- *  Copyright (C) 2019 Bernhard Trinnes <bernhard.trinnes@nymea.io         *
+ *  Copyright (C) 2019 Bernhard Trinnes <bernhard.trinnes@nymea.io>        *
  *                                                                         *
  *  This file is part of nymea.                                            *
  *                                                                         *
@@ -29,18 +29,23 @@ DevicePluginCoinMarketCap::DevicePluginCoinMarketCap()
 {
 }
 
-Device::DeviceSetupStatus DevicePluginCoinMarketCap::setupDevice(Device *device)
+void DevicePluginCoinMarketCap::setupDevice(DeviceSetupInfo *info)
 {
-    if(!m_pluginTimer) {
-        m_pluginTimer = hardwareManager()->pluginTimerManager()->registerTimer(10);
-        connect(m_pluginTimer, &PluginTimer::timeout, this, &DevicePluginCoinMarketCap::onPluginTimer);
-    }
+    Device *device = info->device();
 
     if (device->deviceClassId() == currentPricesDeviceClassId) {
         getPriceCall(device);
-        return Device::DeviceSetupStatusSuccess;
+
+        if(!m_pluginTimer) {
+            m_pluginTimer = hardwareManager()->pluginTimerManager()->registerTimer(10);
+            connect(m_pluginTimer, &PluginTimer::timeout, this, &DevicePluginCoinMarketCap::onPluginTimer);
+        }
+
+        info->finish(Device::DeviceErrorNoError);
+        return;
     }
-    return Device::DeviceSetupStatusFailure;
+    info->finish(Device::DeviceErrorSetupFailed);
+    return;
 }
 
 void DevicePluginCoinMarketCap::deviceRemoved(Device *device)
@@ -53,6 +58,7 @@ void DevicePluginCoinMarketCap::deviceRemoved(Device *device)
 
     if (myDevices().empty()) {
         hardwareManager()->pluginTimerManager()->unregisterTimer(m_pluginTimer);
+        m_pluginTimer = nullptr;
     }
 }
 
diff --git a/coinmarketcap/deviceplugincoinmarketcap.h b/coinmarketcap/deviceplugincoinmarketcap.h
index 6f7827ff..dfeaa553 100644
--- a/coinmarketcap/deviceplugincoinmarketcap.h
+++ b/coinmarketcap/deviceplugincoinmarketcap.h
@@ -38,7 +38,7 @@ class DevicePluginCoinMarketCap : public DevicePlugin
 public:
     explicit DevicePluginCoinMarketCap();
 
-    Device::DeviceSetupStatus setupDevice(Device *device) override;
+    void setupDevice(DeviceSetupInfo *info) override;
     void deviceRemoved(Device *device) override;
 
 private: