diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26b3c07..369c26d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ project(nuki_hub CXX)
 # ARDUHAL_LOG_LEVEL_NONE, define ARDUHAL_LOG_LEVEL_ERROR, define ARDUHAL_LOG_LEVEL_WARN, define ARDUHAL_LOG_LEVEL_INFO,
 # define ARDUHAL_LOG_LEVEL_DEBUG, define ARDUHAL_LOG_LEVEL_VERBOSE
 
-set(LOG_LEVEL ARDUHAL_LOG_LEVEL_NONE)
+set(LOG_LEVEL ARDUHAL_LOG_LEVEL_DEBUG)
 
 include_directories(${PROJECT_NAME}
         PRIVATE
diff --git a/Network.cpp b/Network.cpp
index 4b061b5..92dab7e 100644
--- a/Network.cpp
+++ b/Network.cpp
@@ -89,21 +89,6 @@ void Network::initialize()
         _preferences->putString(preference_mqtt_lock_path, _mqttPath);
     }
 
-    String mqttOpenerPath = _preferences->getString(preference_mqtt_opener_path);
-    if(mqttOpenerPath.length() > 0)
-    {
-        size_t len = mqttOpenerPath.length();
-        for(int i=0; i < len; i++)
-        {
-            _mqttOpenerPath[i] = mqttOpenerPath.charAt(i);
-        }
-    }
-    else
-    {
-        strcpy(_mqttOpenerPath, "nukiopener");
-        _preferences->putString(preference_mqtt_opener_path, _mqttOpenerPath);
-    }
-
     String mqttUser = _preferences->getString(preference_mqtt_user);
     if(mqttUser.length() > 0)
     {
@@ -448,4 +433,4 @@ bool Network::comparePrefixedPath(const char *fullPath, const char *subPath)
     char prefixedPath[500];
     buildMqttPath(subPath, prefixedPath);
     return strcmp(fullPath, prefixedPath) == 0;
-}
+}
\ No newline at end of file
diff --git a/Network.h b/Network.h
index 6a88088..bbc0284 100644
--- a/Network.h
+++ b/Network.h
@@ -67,7 +67,6 @@ private:
     unsigned long _nextReconnect = 0;
     char _mqttBrokerAddr[101] = {0};
     char _mqttPath[181] = {0};
-    char _mqttOpenerPath[181] = {0};
     char _mqttUser[31] = {0};
     char _mqttPass[31] = {0};
     int _networkTimeout = 0;
diff --git a/NukiOpenerWrapper.cpp b/NukiOpenerWrapper.cpp
index 9b28a05..e3f1228 100644
--- a/NukiOpenerWrapper.cpp
+++ b/NukiOpenerWrapper.cpp
@@ -6,9 +6,10 @@
 
 NukiOpenerWrapper* nukiOpenerInst;
 
-NukiOpenerWrapper::NukiOpenerWrapper(const std::string& deviceName, uint32_t id, Network* network, Preferences* preferences)
+NukiOpenerWrapper::NukiOpenerWrapper(const std::string& deviceName, uint32_t id, BleScanner::Scanner* scanner,  Network* network, Preferences* preferences)
         : _deviceName(deviceName),
-          _nukiBle(deviceName, id),
+          _nukiOpener(deviceName, id),
+          _bleScanner(scanner),
           _network(network),
           _preferences(preferences)
 {
@@ -27,18 +28,14 @@ NukiOpenerWrapper::NukiOpenerWrapper(const std::string& deviceName, uint32_t id,
 
 NukiOpenerWrapper::~NukiOpenerWrapper()
 {
-    delete _bleScanner;
     _bleScanner = nullptr;
 }
 
 
 void NukiOpenerWrapper::initialize()
 {
-    _bleScanner = new BleScanner::Scanner();
-    _bleScanner->initialize(_deviceName);
-    _bleScanner->setScanDuration(10);
-    _nukiBle.initialize();
-    _nukiBle.registerBleScanner(_bleScanner);
+    _nukiOpener.initialize();
+    _nukiOpener.registerBleScanner(_bleScanner);
 
     _intervalLockstate = _preferences->getInt(preference_query_interval_lockstate);
     _intervalBattery = _preferences->getInt(preference_query_interval_battery);
@@ -55,7 +52,7 @@ void NukiOpenerWrapper::initialize()
         _preferences->putInt(preference_query_interval_battery, _intervalBattery);
     }
 
-    _nukiBle.setEventHandler(this);
+    _nukiOpener.setEventHandler(this);
 
     Serial.print(F("Lock state interval: "));
     Serial.print(_intervalLockstate);
@@ -73,12 +70,12 @@ void NukiOpenerWrapper::initialize()
 void NukiOpenerWrapper::update()
 {
     if (!_paired) {
-        Serial.println(F("Nuki start pairing"));
+        Serial.println(F("Nuki opener start pairing"));
 
         _bleScanner->update();
         vTaskDelay( 5000 / portTICK_PERIOD_MS);
-        if (_nukiBle.pairNuki() == NukiOpener::PairingResult::Success) {
-            Serial.println(F("Nuki paired"));
+        if (_nukiOpener.pairNuki() == NukiOpener::PairingResult::Success) {
+            Serial.println(F("Nuki opener paired"));
             _paired = true;
         }
         else
@@ -88,32 +85,30 @@ void NukiOpenerWrapper::update()
         }
     }
 
-    vTaskDelay( 20 / portTICK_PERIOD_MS);
-    _bleScanner->update();
-    _nukiBle.updateConnectionState();
+    _nukiOpener.updateConnectionState();
 
     unsigned long ts = millis();
 
-    if(_statusUpdated || _nextLockStateUpdateTs == 0 || ts >= _nextLockStateUpdateTs)
-    {
-        _statusUpdated = false;
-        _nextLockStateUpdateTs = ts + _intervalLockstate * 1000;
-        updateKeyTurnerState();
-    }
-    if(_nextBatteryReportTs == 0 || ts > _nextBatteryReportTs)
-    {
-        _nextBatteryReportTs = ts + _intervalBattery * 1000;
-        updateBatteryState();
-    }
-    if(_nextConfigUpdateTs == 0 || ts > _nextConfigUpdateTs)
-    {
-        _nextConfigUpdateTs = ts + _intervalConfig * 1000;
-        updateConfig();
-    }
+//    if(_statusUpdated || _nextLockStateUpdateTs == 0 || ts >= _nextLockStateUpdateTs)
+//    {
+//        _statusUpdated = false;
+//        _nextLockStateUpdateTs = ts + _intervalLockstate * 1000;
+//        updateKeyTurnerState();
+//    }
+//    if(_nextBatteryReportTs == 0 || ts > _nextBatteryReportTs)
+//    {
+//        _nextBatteryReportTs = ts + _intervalBattery * 1000;
+//        updateBatteryState();
+//    }
+//    if(_nextConfigUpdateTs == 0 || ts > _nextConfigUpdateTs)
+//    {
+//        _nextConfigUpdateTs = ts + _intervalConfig * 1000;
+//        updateConfig();
+//    }
 
     if(_nextLockAction != (NukiOpener::LockAction)0xff)
     {
-        NukiOpener::CmdResult cmdResult = _nukiBle.lockAction(_nextLockAction, 0, 0);
+        NukiOpener::CmdResult cmdResult = _nukiOpener.lockAction(_nextLockAction, 0, 0);
 
         char resultStr[15] = {0};
         NukiOpener::cmdResultToString(cmdResult, resultStr);
@@ -136,30 +131,30 @@ void NukiOpenerWrapper::update()
         _clearAuthData = false;
     }
 
-    memcpy(&_lastKeyTurnerState, &_keyTurnerState, sizeof(NukiLock::KeyTurnerState));
+    memcpy(&_lastKeyTurnerState, &_keyTurnerState, sizeof(NukiOpener::KeyTurnerState));
 }
 
 void NukiOpenerWrapper::setPin(const uint16_t pin)
 {
-    _nukiBle.saveSecurityPincode(pin);
+    _nukiOpener.saveSecurityPincode(pin);
 }
 
 void NukiOpenerWrapper::unpair()
 {
-    _nukiBle.unPairNuki();
+    _nukiOpener.unPairNuki();
     _paired = false;
 }
 
 void NukiOpenerWrapper::updateKeyTurnerState()
 {
-    _nukiBle.requestKeyTurnerState(&_keyTurnerState);
+    _nukiOpener.requestKeyTurnerState(&_keyTurnerState);
 //    _network->publishKeyTurnerState(_keyTurnerState, _lastKeyTurnerState);
 
     if(_keyTurnerState.lockState != _lastKeyTurnerState.lockState)
     {
         char lockStateStr[20];
         lockstateToString(_keyTurnerState.lockState, lockStateStr);
-        Serial.print(F("Nuki lock state: "));
+        Serial.print(F("Nuki opener state: "));
         Serial.println(lockStateStr);
     }
 
@@ -171,7 +166,7 @@ void NukiOpenerWrapper::updateKeyTurnerState()
 
 void NukiOpenerWrapper::updateBatteryState()
 {
-    _nukiBle.requestBatteryReport(&_batteryReport);
+    _nukiOpener.requestBatteryReport(&_batteryReport);
 //    _network->publishBatteryReport(_batteryReport);
 }
 
@@ -185,7 +180,7 @@ void NukiOpenerWrapper::updateConfig()
 
 void NukiOpenerWrapper::updateAuthData()
 {
-    Nuki::CmdResult result = _nukiBle.retrieveLogEntries(0, 0, 0, true);
+    Nuki::CmdResult result = _nukiOpener.retrieveLogEntries(0, 0, 0, true);
     if(result != Nuki::CmdResult::Success)
     {
         _network->publishAuthorizationInfo(0, "");
@@ -193,7 +188,7 @@ void NukiOpenerWrapper::updateAuthData()
     }
     vTaskDelay( 100 / portTICK_PERIOD_MS);
 
-    result = _nukiBle.retrieveLogEntries(_nukiBle.getLogEntryCount() - 2, 1, 0, false);
+    result = _nukiOpener.retrieveLogEntries(_nukiOpener.getLogEntryCount() - 2, 1, 0, false);
     if(result != Nuki::CmdResult::Success)
     {
         _network->publishAuthorizationInfo(0, "");
@@ -202,7 +197,7 @@ void NukiOpenerWrapper::updateAuthData()
     vTaskDelay( 200 / portTICK_PERIOD_MS);
 
     std::list<NukiOpener::LogEntry> log;
-    _nukiBle.getLogEntries(&log);
+    _nukiOpener.getLogEntries(&log);
 
     if(log.size() > 0)
     {
@@ -253,42 +248,42 @@ void NukiOpenerWrapper::onConfigUpdateReceived(const char *topic, const char *va
     {
         bool newValue = atoi(value) > 0;
         if(!_nukiConfigValid || _nukiConfig.buttonEnabled == newValue) return;
-        _nukiBle.enableButton(newValue);
+        _nukiOpener.enableButton(newValue);
         _nextConfigUpdateTs = millis() + 300;
     }
     if(strcmp(topic, mqtt_topic_config_led_enabled) == 0)
     {
         bool newValue = atoi(value) > 0;
         if(!_nukiConfigValid || _nukiConfig.ledEnabled == newValue) return;
-        _nukiBle.enableLedFlash(newValue);
+        _nukiOpener.enableLedFlash(newValue);
         _nextConfigUpdateTs = millis() + 300;
     }
     else if(strcmp(topic, mqtt_topic_config_led_brightness) == 0)
     {
         int newValue = atoi(value);
         if(!_nukiConfigValid || _nukiConfig.ledBrightness == newValue) return;
-        _nukiBle.setLedBrightness(newValue);
+        _nukiOpener.setLedBrightness(newValue);
         _nextConfigUpdateTs = millis() + 300;
     }
     else if(strcmp(topic, mqtt_topic_config_auto_unlock) == 0)
     {
         bool newValue = !(atoi(value) > 0);
         if(!_nukiAdvancedConfigValid || _nukiAdvancedConfig.autoUnLockDisabled == newValue) return;
-        _nukiBle.disableAutoUnlock(newValue);
+        _nukiOpener.disableAutoUnlock(newValue);
         _nextConfigUpdateTs = millis() + 300;
     }
     else if(strcmp(topic, mqtt_topic_config_auto_lock) == 0)
     {
         bool newValue = atoi(value) > 0;
         if(!_nukiAdvancedConfigValid || _nukiAdvancedConfig.autoLockEnabled == newValue) return;
-        _nukiBle.enableAutoLock(newValue);
+        _nukiOpener.enableAutoLock(newValue);
         _nextConfigUpdateTs = millis() + 300;
     }
     else if(strcmp(topic, mqtt_topic_config_auto_lock) == 0)
     {
         bool newValue = atoi(value) > 0;
         if(!_nukiAdvancedConfigValid || _nukiAdvancedConfig.autoLockEnabled == newValue) return;
-        _nukiBle.enableAutoLock(newValue);
+        _nukiOpener.enableAutoLock(newValue);
         _nextConfigUpdateTs = millis() + 300;
     }
 }
@@ -318,16 +313,16 @@ void NukiOpenerWrapper::notify(Nuki::EventType eventType)
 
 void NukiOpenerWrapper::readConfig()
 {
-    Serial.print(F("Reading config. Result: "));
-    Nuki::CmdResult result = _nukiBle.requestConfig(&_nukiConfig);
+    Serial.print(F("Reading opener config. Result: "));
+    Nuki::CmdResult result = _nukiOpener.requestConfig(&_nukiConfig);
     _nukiConfigValid = result == Nuki::CmdResult::Success;
     Serial.println(result);
 }
 
 void NukiOpenerWrapper::readAdvancedConfig()
 {
-    Serial.print(F("Reading advanced config. Result: "));
-    Nuki::CmdResult result = _nukiBle.requestAdvancedConfig(&_nukiAdvancedConfig);
+    Serial.print(F("Reading opener advanced config. Result: "));
+    Nuki::CmdResult result = _nukiOpener.requestAdvancedConfig(&_nukiAdvancedConfig);
     _nukiAdvancedConfigValid = result == Nuki::CmdResult::Success;
     Serial.println(result);
 }
diff --git a/NukiOpenerWrapper.h b/NukiOpenerWrapper.h
index de33917..5358bb2 100644
--- a/NukiOpenerWrapper.h
+++ b/NukiOpenerWrapper.h
@@ -9,7 +9,7 @@
 class NukiOpenerWrapper : public NukiOpener::SmartlockEventHandler
 {
 public:
-    NukiOpenerWrapper(const std::string& deviceName, uint32_t id, Network* network, Preferences* preferences);
+    NukiOpenerWrapper(const std::string& deviceName,  uint32_t id,  BleScanner::Scanner* scanner, Network* network, Preferences* preferences);
     virtual ~NukiOpenerWrapper();
 
     void initialize();
@@ -42,7 +42,7 @@ private:
     NukiOpener::LockAction lockActionToEnum(const char* str); // char array at least 14 characters
 
     std::string _deviceName;
-    NukiOpener::NukiOpener _nukiBle;
+    NukiOpener::NukiOpener _nukiOpener;
     BleScanner::Scanner* _bleScanner;
     Network* _network;
     Preferences* _preferences;
diff --git a/NukiWrapper.cpp b/NukiWrapper.cpp
index 7f4dc14..4c811e9 100644
--- a/NukiWrapper.cpp
+++ b/NukiWrapper.cpp
@@ -304,7 +304,7 @@ const bool NukiWrapper::isPaired()
     return _paired;
 }
 
-BleScanner::Scanner *NukiWrapper::bleScanner()
+BleScanner::Scanner* NukiWrapper::bleScanner()
 {
     return _bleScanner;
 }
diff --git a/main.cpp b/main.cpp
index fa0da7a..1c01d20 100644
--- a/main.cpp
+++ b/main.cpp
@@ -33,6 +33,7 @@ void nukiTask(void *pvParameters)
     while(true)
     {
         nuki->update();
+        nukiOpener->update();
     }
 }
 
@@ -122,10 +123,13 @@ void setup()
     initEthServer(networkDevice);
 
     nuki = new NukiWrapper("NukiHub", deviceId, network, preferences);
-//    nukiOpener = new NukiOpenerWrapper("NukiHub", deviceId, network, preferences);
+    nuki->initialize();
+
+    nukiOpener = new NukiOpenerWrapper("NukiHub", deviceId, nuki->bleScanner(), network, preferences);
+    nukiOpener->initialize();
+
     webCfgServer = new WebCfgServer(nuki, network, ethServer, preferences, networkDevice == NetworkDeviceType::WiFi);
     webCfgServer->initialize();
-    nuki->initialize();
 
     presenceDetection = new PresenceDetection(preferences, nuki->bleScanner(), network);
     presenceDetection->initialize();