Chg: update image tag in helm values to v2.11.0-RC1

2026-03-20 03:41:02 +00:00 · 2023-09-01 16:08:44 +00:00
86 changed files with 3064 additions and 5405 deletions
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -24,7 +24,7 @@ sudo apt install librdkafka-dev // default-libmysqlclient-dev
 sudo apt install nlohmann-json-dev

 cd ~
-git clone https://github.com/AriliaWireless/poco --branch poco-tip-v2
+git clone https://github.com/AriliaWireless/poco --branch poco-tip-v1
 cd poco
 mkdir cmake-build
 cd cmake-build
@@ -75,7 +75,7 @@ sudo yum install yaml-cpp-devel lua-devel
 sudo dnf install postgresql.x86_64 librdkafka-devel
 sudo dnf install postgresql-devel json-devel

-git clone https://github.com/AriliaWireless/poco --branch poco-tip-v2
+git clone https://github.com/AriliaWireless/poco --branch poco-tip-v1
 cd poco
 mkdir cmake-build
 cd cmake-build
@@ -125,7 +125,7 @@ brew install openssl \
 	nlohmann-json \
 	fmt

-git clone https://github.com/AriliaWireless/poco --branch poco-tip-v2
+git clone https://github.com/AriliaWireless/poco --branch poco-tip-v1
 pushd poco
 mkdir cmake-build
 push cmake-build
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(owgw VERSION 3.0.0)
+project(owgw VERSION 2.11.0)

 set(CMAKE_CXX_STANDARD 17)

@@ -49,7 +49,7 @@ if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
    string(REGEX REPLACE "\n$" "" GIT_HASH "${GIT_HASH}")
 endif()

-add_definitions(-DTIP_GATEWAY_SERVICE="1" -DPOCO_LOG_DEBUG="1" -DBOOST_NO_CXX98_FUNCTION_BASE=1)
+add_definitions(-DTIP_GATEWAY_SERVICE="1" -DPOCO_LOG_DEBUG="1")

 find_package(OpenSSL REQUIRED)
 find_package(ZLIB REQUIRED)
@@ -175,7 +175,7 @@ add_executable( owgw
        src/SDKcalls.cpp
        src/SDKcalls.h
        src/StateUtils.cpp src/StateUtils.h
-        src/AP_WS_Reactor_Pool.h
+        src/AP_WS_ReactorPool.h
        src/AP_WS_Connection.h
        src/AP_WS_Connection.cpp
        src/TelemetryClient.h src/TelemetryClient.cpp
@@ -199,7 +199,7 @@ add_executable( owgw
        src/AP_WS_Process_deviceupdate.cpp
        src/AP_WS_Process_telemetry.cpp
        src/AP_WS_Process_venuebroadcast.cpp
-        src/RADIUS_Destination.h
+        src/RADSEC_server.h
        src/UI_GW_WebSocketNotifications.cpp src/UI_GW_WebSocketNotifications.h
        src/framework/RESTAPI_SystemConfiguration.h
        src/ScriptManager.cpp src/ScriptManager.h
@@ -211,8 +211,7 @@ add_executable( owgw
        src/RegulatoryInfo.cpp src/RegulatoryInfo.h
        src/RADIUSSessionTracker.cpp src/RADIUSSessionTracker.h
        src/libs/Scheduler.h src/libs/InterruptableSleep.h src/libs/ctpl_stl.h src/libs/Cron.h
-        src/GenericScheduler.cpp src/GenericScheduler.h src/framework/default_device_types.h src/AP_WS_Process_rebootLog.cpp src/AP_WS_ConfigAutoUpgrader.cpp src/AP_WS_ConfigAutoUpgrader.h src/RESTAPI/RESTAPI_default_firmwares.cpp src/RESTAPI/RESTAPI_default_firmwares.h src/RESTAPI/RESTAPI_default_firmware.cpp src/RESTAPI/RESTAPI_default_firmware.h src/storage/storage_def_firmware.cpp src/firmware_revision_cache.h src/sdks/sdk_fms.h
-        src/AP_WS_LookForUpgrade.cpp)
+        src/GenericScheduler.cpp src/GenericScheduler.h src/framework/default_device_types.h src/AP_WS_Process_rebootLog.cpp src/AP_WS_ConfigAutoUpgrader.cpp src/AP_WS_ConfigAutoUpgrader.h src/RESTAPI/RESTAPI_default_firmwares.cpp src/RESTAPI/RESTAPI_default_firmwares.h src/RESTAPI/RESTAPI_default_firmware.cpp src/RESTAPI/RESTAPI_default_firmware.h src/storage/storage_def_firmware.cpp src/firmware_revision_cache.h src/sdks/sdk_fms.h)

 if(NOT SMALL_BUILD)

@@ -224,17 +223,14 @@ INSTALL(TARGETS owgw

 target_link_libraries(owgw PUBLIC
        ${Poco_LIBRARIES}
-        ${ZLIB_LIBRARIES}
-)
+        ${ZLIB_LIBRARIES})

 if(NOT SMALL_BUILD)
    target_link_libraries(owgw PUBLIC
-            ${MySQL_LIBRARIES}
-            ${ZLIB_LIBRARIES}
-            CppKafka::cppkafka
-            fmt::fmt
-            resolv
-    )
+            ${MySQL_LIBRARIES} ${ZLIB_LIBRARIES}
+                CppKafka::cppkafka
+                fmt::fmt
+             )
    if(UNIX AND NOT APPLE)
        target_link_libraries(owgw PUBLIC PocoJSON)
    endif()
--- a/5
+++ b/5
@@ -87,11 +87,6 @@ ENV APP_NAME=$APP_NAME \
    APP_CONFIG=/$APP_NAME-data \
    APP_HOME_DIR=$APP_HOME_DIR

-# This is for legacy
-ENV OWGW_USER=$APP_USER \
-    OWGW_ROOT=$APP_ROOT \
-    OWGW_CONFIG=$APP_CONFIG
-
 RUN useradd $APP_USER

 RUN mkdir $APP_HOME_DIR
--- a/PROTOCOL.md
+++ b/PROTOCOL.md
@@ -775,146 +775,6 @@ The device should answer:
 }
 ```

-#### Controller wants the device to replace its certificates
-Controller sends this command to run a predefined script. Extreme care must be taken.
-```json
-{    "jsonrpc" : "2.0" , 
-     "method" : "certupdate" , 
-     "params" : {
-        "serial" : <serial number>,
-        "certificates" : <BASE64 encoded tar file of the cert package from the certificate portal>
-     },
-     "id" : <some number>
-}
-```
-
-The device should answer:
-```json
-{     "jsonrpc" : "2.0" , 
-      "result" : {
-          "serial" : <serial number> ,
-          "status" : {
-            "error" : <0 or the value of $? from the shell running the command, 255 signifies a timeout>,
-            "txt" : <text describing the error or success>
-      },
-  "id" : <same number as request>
-}
-```
-
-#### Controller wants the device to switch to another controller
-Controller sends this when the device should change the controller it connects to without looking up a new redirector.
-
-```json
-{    "jsonrpc" : "2.0" , 
-     "method" : "transfer" , 
-     "params" : {
-        "serial" : <serial number>,
-        "server" : <controller hostname>,
-        "port" : <controller port number (integer)>,
-     },
-     "id" : <some number>
-}
-```
-
-The device should answer:
-```json
-{     "jsonrpc" : "2.0" , 
-      "result" : {
-          "serial" : <serial number> ,
-          "status" : {
-            "error" : <0 or the value of $? from the shell running the command, 255 signifies a timeout>,
-            "txt" : <text describing the error or success>
-      },
-  "id" : <same number as request>
-}
-```
-
-### RRM AP device commands
-The following command is used to send RRM commands to an AP. RRM commands are send to an AP, however the 
-controller will not or cannot verify if they have been sent or the action was performed.
-
-```json
-{    "jsonrpc" : "2.0" , 
-     "method" : "rrm" , 
-     "params" : {
-        "serial" : <serial number>,
-        "actions" : [ array of actions. Each possible action is defined next]
-     },
-     "id" : <some number>
-}
-```
-
-The device should answer:
-```json
-{     "jsonrpc" : "2.0" , 
-      "result" : {
-          "serial" : <serial number> ,
-          "status" : {
-            "error" : <0 or the value of $? from the shell running the command, 255 signifies a timeout>,
-            "txt" : <text describing the error or success>
-      },
-  "id" : <same number as request>
-}
-```
-
-#### RRM Roam action
-
-##### Kick
-```json
-{     
-      "action" : "kick" ,
-      "addr" : <mac if the client that shall be kicked> ,
-      "reason": <number>, (default: 5, https://www.cisco.com/assets/sol/sb/WAP371_Emulators/WAP371_Emulator_v1-0-1-5/help/Apx_ReasonCodes2.html)
-      "ban_time": <number> (seconds, optional)
-}
-```
-
-##### Channel Switch Announcement
-```json
-{   
-    "action" : "channel_switch" ,
-    "bssid" : <mac of the SSID> , (all other SSIDs on the same radio will perform the same action)
-    "channel" : <number> (HT/HW mode will be retained upon issuing the CSA)
-}
-```
-
-##### Change TX-Power
-```json
-{   
-    "action" : "tx_power" ,
-    "bssid" : <mac of the SSID> , (all other SSIDs on the same radio will perform the same action)
-    "level" : <number> (DBm inside the positive number space)
-}
-```
-
-##### Beacon Scan
-```json
-{   
-    "action" : "beacon_request" ,
-    "addr" : <mac if the client that shall perform the scan> ,
-    "ssid": <string>, (the SSID the client shall scan for on all frequencies),
-    "channel": <number> (the channel that shall be scanned)
-}
-```
-
-##### BSS Transition
-```json
-{   
-    "action" : "bss_transition" ,
-    "addr" : <mac if the client that shall perform the roam> ,
-    "neighbors": [ <string> ], (an array of BSSIDs the client shall consider as roamin candidates)
-}
-```
-
-##### Update neighbours
-```json
-{   
-    "action" : "neighbors" ,
-    "bssid" : <mac of the SSID> , (the SSID of the specific VAP)
-    "neighbors": [ [ <BSS>, <ssid>, <neighbor report> ] ]
-}
-```
-
 ### `rtty server`
 More information about the [rtty server](https://github.com/zhaojh329/rtty) can be found here.

--- a/2
+++ b/2
@@ -1 +1 @@
-63
+18
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -9,7 +9,7 @@ fullnameOverride: ""
 images:
  owgw:
    repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owgw
-    tag: master
+    tag: v2.11.0-RC1
    pullPolicy: Always
 #    regcred:
 #      registry: tip-tip-wlan-cloud-ucentral.jfrog.io
--- a/openapi/owgw.yaml
+++ b/openapi/owgw.yaml
@@ -903,114 +903,6 @@ components:
            kafkaClients:
              type: integer

-    RRM_Kick:
-      type: object
-      properties:
-        action:
-          type: string
-          enum:
-            - kick
-        addr:
-          type: string
-          format: mac
-        reason:
-          type: integer
-          default: 5
-        ban_time:
-          type: integer
-          format: int64
-
-    RRM_channel_switch:
-      type: object
-      properties:
-        action:
-          type: string
-          enum:
-            - channel_switch
-        bssid:
-          type: string
-          format: mac
-        channel:
-          type: integer
-
-    RRM_tx_power:
-      type: object
-      properties:
-        action:
-          type: string
-          enum:
-            - tx_power
-        bssid:
-          type: string
-          format: mac
-        level:
-          type: integer
-
-    RRM_beacon_request:
-      type: object
-      properties:
-        action:
-          type: string
-          enum:
-            - beacon_request
-        addr:
-          type: string
-          format: mac
-        ssid:
-          type: string
-        channel:
-          type: integer
-
-    RRM_bss_transition:
-      type: object
-      properties:
-        action:
-          type: string
-          enum:
-            - bss_transition
-        addr:
-          type: string
-          format: mac
-        neighbors:
-          type: array
-          items:
-            type: string
-            format: mac
-
-    RRM_neighbors:
-      type: object
-      properties:
-        action:
-          type: string
-          enum:
-            - neighbors
-        bssid:
-          type: string
-          format: mac
-        neighbors:
-          type: array
-          items:
-            type: string
-            format: mac
-
-    RRM_action:
-      type: object
-      oneOf:
-        - $ref: '#/components/schemas/RRM_Kick'
-        - $ref: '#/components/schemas/RRM_channel_switch'
-        - $ref: '#/components/schemas/RRM_tx_power'
-        - $ref: '#/components/schemas/RRM_beacon_request'
-        - $ref: '#/components/schemas/RRM_bss_transition'
-        - $ref: '#/components/schemas/RRM_neighbors'
-
-    RRM_actions:
-      type: object
-      properties:
-        actions:
-          type: array
-          items:
-            $ref: '#/components/schemas/RRM_action'
-
    #########################################################################################
    ##
    ## These are endpoints that all services in the uCentral stack must provide
@@ -1447,30 +1339,6 @@ components:
          $ref: '#/components/schemas/RadiusProxyServerConfig'
        coaConfig:
          $ref: '#/components/schemas/RadiusProxyServerConfig'
-        radsecPoolType:
-          type: string
-          enum:
-            - generic
-            - orion
-            - globalreach
-            - radsec
-          default:
-            generic
-        poolProxyIp:
-          type: string
-          description: This is the fake IP for the entire pool
-          example:
-            - These addresses must match the addresses in the AP configuration and must start with 0.0
-            - 0.0.0.1
-            - 0.0.1.1
-        radsecPoolKeepAlive:
-          type: integer
-          description: The keep alive value in seconds. Usually 30s or less.
-          format: int64
-          default: 25
-        enabled:
-          type: boolean
-          default: true

    RadiusProxyPoolList:
      type: object
@@ -1543,28 +1411,6 @@ components:
        userName:
          type: string

-    DeviceTransferRequest:
-      type: object
-      properties:
-        serialNumber:
-          type: string
-          format: uuid
-        server:
-          type: string
-          format: hostname
-        port:
-          type: integer
-          format: int32
-
-    DeviceCertificateUpdateRequest:
-      type: object
-      properties:
-        serialNumber:
-          type: string
-        encodedCertificate:
-          type: string
-          format: base64
-          description: This is a base64 encoded string of the certificate bundle (the current bundle .tar.gz file from the PKI portal)

 paths:
  /devices:
@@ -1712,12 +1558,8 @@ paths:
            type: integer
            format: int64
          required: false
-        - in: query
-          description: Filter the results
-          name: simulatedDevices
-          schema:
-            type: boolean
-          required: false
+
+
      responses:
        200:
          $ref: '#/components/responses/Success'
@@ -2710,7 +2552,7 @@ paths:
        404:
          $ref: '#/components/responses/NotFound'

-  /device/{serialNumber}/script:
+  /device/{serialNumber}/:
    post:
      tags:
        - Commands
@@ -2924,88 +2766,6 @@ paths:
        404:
          $ref: '#/components/responses/NotFound'

-  /device/{serialNumber}/rrm:
-    post:
-      tags:
-        - Commands
-      summary: Send RRM commands to a device.
-      operationId: sendRRMcommandsForADevice
-      parameters:
-        - in: path
-          name: serialNumber
-          schema:
-            type: string
-          required: true
-      requestBody:
-        description: Commands to send
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/RRM_actions'
-      responses:
-        200:
-          $ref: '#/components/responses/Success'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-  /device/{serialNumber}/transfer:
-    post:
-      tags:
-        - Commands
-      summary: Transfer a device to a new redirector.
-      operationId: transferDevice
-      parameters:
-        - in: path
-          name: serialNumber
-          schema:
-            type: string
-          required: true
-      requestBody:
-        description: Transfer details
-        content:
-          application/json:
-            schema:
-              type: array
-              items:
-                $ref: '#/components/schemas/DeviceTransferRequest'
-      responses:
-        200:
-          $ref: '#/components/responses/Success'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-  /device/{serialNumber}/certupdate:
-    post:
-      tags:
-        - Commands
-      summary: Update the certificates for a device.
-      operationId: updateCertificates
-      parameters:
-        - in: path
-          name: serialNumber
-          schema:
-            type: string
-          required: true
-      requestBody:
-        description: Certificate update details
-        content:
-          application/json:
-            schema:
-              type: array
-              items:
-                $ref: '#/components/schemas/DeviceCertificateUpdateRequest'
-      responses:
-        200:
-          $ref: '#/components/responses/Success'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
  /ouis:
    get:
      tags:
@@ -3512,6 +3272,8 @@ paths:
        404:
          $ref: '#/components/responses/NotFound'

+
+
  /deviceDashboard:
    get:
      tags:
--- a/owgw.properties.tmpl
+++ b/owgw.properties.tmpl
@@ -145,7 +145,7 @@ storage.type.sqlite.db = devices.db
 storage.type.sqlite.idletime = 120
 storage.type.sqlite.maxsessions = 128

-storage.type.postgresql.maxsessions = 250
+storage.type.postgresql.maxsessions = 64
 storage.type.postgresql.idletime = 60
 storage.type.postgresql.host = ${STORAGE_TYPE_POSTGRESQL_HOST}
 storage.type.postgresql.username = ${STORAGE_TYPE_POSTGRESQL_USERNAME}
--- a/src/AP_WS_Connection.cpp
+++ b/src/AP_WS_Connection.cpp
@@ -36,20 +36,22 @@

 namespace OpenWifi {

+#define DBL                                                                                        \
+	{                                                                                              \
+		std::cout << __LINE__ << "  ID: " << ConnectionId_ << "  Ser: " << SerialNumber_           \
+				  << std::endl;                                                                    \
+	}
+
 	void AP_WS_Connection::LogException(const Poco::Exception &E) {
 		poco_information(Logger_, fmt::format("EXCEPTION({}): {}", CId_, E.displayText()));
 	}

 	AP_WS_Connection::AP_WS_Connection(Poco::Net::HTTPServerRequest &request,
 									   Poco::Net::HTTPServerResponse &response,
-									   uint64_t session_id, Poco::Logger &L,
-									   std::pair<std::shared_ptr<Poco::Net::SocketReactor>, std::shared_ptr<LockedDbSession>> R)
-		: Logger_(L) {
-
-		Reactor_ = R.first;
-		DbSession_ = R.second;
-		State_.sessionId = session_id;
-
+									   uint64_t connection_id, Poco::Logger &L,
+									   Poco::Net::SocketReactor &R)
+		: Logger_(L), Reactor_(R) {
+		State_.sessionId = connection_id;
 		WS_ = std::make_unique<Poco::Net::WebSocket>(request, response);

 		auto TS = Poco::Timespan(360, 0);
@@ -59,89 +61,29 @@ namespace OpenWifi {
 		WS_->setNoDelay(false);
 		WS_->setKeepAlive(true);
 		WS_->setBlocking(false);
+
+		Reactor_.addEventHandler(*WS_,
+								 Poco::NObserver<AP_WS_Connection, Poco::Net::ReadableNotification>(
+									 *this, &AP_WS_Connection::OnSocketReadable));
+		Reactor_.addEventHandler(*WS_,
+								 Poco::NObserver<AP_WS_Connection, Poco::Net::ShutdownNotification>(
+									 *this, &AP_WS_Connection::OnSocketShutdown));
+		Reactor_.addEventHandler(*WS_,
+								 Poco::NObserver<AP_WS_Connection, Poco::Net::ErrorNotification>(
+									 *this, &AP_WS_Connection::OnSocketError));
+		Registered_ = true;
+		Valid_ = true;
 		uuid_ = MicroServiceRandom(std::numeric_limits<std::uint64_t>::max()-1);
 	}

-	void AP_WS_Connection::Start() {
-		Registered_ = true;
-		LastContact_ = Utils::Now();
-
-		Reactor_->addEventHandler(*WS_,
-								  Poco::NObserver<AP_WS_Connection, Poco::Net::ReadableNotification>(
-									  *this, &AP_WS_Connection::OnSocketReadable));
-		Reactor_->addEventHandler(*WS_,
-								  Poco::NObserver<AP_WS_Connection, Poco::Net::ShutdownNotification>(
-									  *this, &AP_WS_Connection::OnSocketShutdown));
-		Reactor_->addEventHandler(*WS_,
-								  Poco::NObserver<AP_WS_Connection, Poco::Net::ErrorNotification>(
-									  *this, &AP_WS_Connection::OnSocketError));
-
-	}
-
-	AP_WS_Connection::~AP_WS_Connection() {
-//		poco_information(Logger_, fmt::format("DESTRUCTOR({}): 0 - Session={} Connection closed.", SerialNumber_,
-//											  State_.sessionId));
-		std::lock_guard G(ConnectionMutex_);
-//		poco_information(Logger_, fmt::format("DESTRUCTOR({}): 1 - Session={} Connection closed.", SerialNumber_,
-//											  State_.sessionId));
-		EndConnection(false);
-		poco_debug(Logger_, fmt::format("TERMINATION({}): Session={}, Connection removed.", SerialNumber_,
-											  State_.sessionId));
-	}
-
-	static void NotifyKafkaDisconnect(const std::string &SerialNumber, std::uint64_t uuid) {
-		try {
-			Poco::JSON::Object Disconnect;
-			Poco::JSON::Object Details;
-			Details.set(uCentralProtocol::SERIALNUMBER, SerialNumber);
-			Details.set(uCentralProtocol::TIMESTAMP, Utils::Now());
-			Details.set(uCentralProtocol::UUID,uuid);
-			Disconnect.set(uCentralProtocol::DISCONNECTION, Details);
-			KafkaManager()->PostMessage(KafkaTopics::CONNECTION, SerialNumber, Disconnect);
-		} catch (...) {
-		}
-	}
-
-	void AP_WS_Connection::EndConnection(bool Clean) {
-		bool expectedValue=false;
-		if (Dead_.compare_exchange_strong(expectedValue,true,std::memory_order_release,std::memory_order_relaxed)) {
-
-			if(!SerialNumber_.empty() && State_.LastContact!=0) {
-				StorageService()->SetDeviceLastRecordedContact(SerialNumber_, State_.LastContact);
-			}
-
-			if (Registered_) {
-				Registered_ = false;
-				Reactor_->removeEventHandler(
-					*WS_, Poco::NObserver<AP_WS_Connection, Poco::Net::ReadableNotification>(
-							  *this, &AP_WS_Connection::OnSocketReadable));
-				Reactor_->removeEventHandler(
-					*WS_, Poco::NObserver<AP_WS_Connection, Poco::Net::ShutdownNotification>(
-							  *this, &AP_WS_Connection::OnSocketShutdown));
-				Reactor_->removeEventHandler(
-					*WS_, Poco::NObserver<AP_WS_Connection, Poco::Net::ErrorNotification>(
-							  *this, &AP_WS_Connection::OnSocketError));
-				Registered_=false;
-			}
-			WS_->close();
-
-			if(!SerialNumber_.empty()) {
-				DeviceDisconnectionCleanup(SerialNumber_, uuid_);
-			}
-
-			if(Clean)
-				AP_WS_Server()->EndSession(State_.sessionId, SerialNumberInt_);
-		}
-	}
-
 	bool AP_WS_Connection::ValidatedDevice() {
-
-		if(Dead_)
-			return false;
-
 		if (DeviceValidated_)
 			return true;

+		if (!Valid_)
+			return false;
+
+		std::lock_guard Lock(ConnectionMutex_);
 		try {
 			auto SockImpl = dynamic_cast<Poco::Net::WebSocketImpl *>(WS_->impl());
 			auto SS =
@@ -156,6 +98,7 @@ namespace OpenWifi {
 				poco_warning(Logger_, fmt::format("TLS-CONNECTION({}): Session={} Connection is "
 												  "NOT secure. Device is not allowed.",
 												  CId_, State_.sessionId));
+				EndConnection();
 				return false;
 			}

@@ -168,6 +111,7 @@ namespace OpenWifi {
 					Logger_,
 					fmt::format("TLS-CONNECTION({}): Session={} No certificates available..", CId_,
 								State_.sessionId));
+				EndConnection();
 				return false;
 			}

@@ -178,19 +122,11 @@ namespace OpenWifi {
 							 fmt::format("TLS-CONNECTION({}): Session={} Device certificate is not "
 										 "valid. Device is not allowed.",
 										 CId_, State_.sessionId));
+				EndConnection();
 				return false;
 			}

 			CN_ = Poco::trim(Poco::toLower(PeerCert.commonName()));
-			if(!Utils::ValidSerialNumber(CN_)) {
-				poco_trace(Logger_,
-						   fmt::format("TLS-CONNECTION({}): Session={} Invalid serial number: CN={}", CId_,
-									   State_.sessionId, CN_));
-				return false;
-			}
-			SerialNumber_ = CN_;
-			SerialNumberInt_ = Utils::SerialNumberToInt(SerialNumber_);
-
 			State_.VerifiedCertificate = GWObjects::VALID_CERTIFICATE;
 			poco_trace(Logger_,
 					   fmt::format("TLS-CONNECTION({}): Session={} Valid certificate: CN={}", CId_,
@@ -200,27 +136,30 @@ namespace OpenWifi {
 				poco_warning(Logger_, fmt::format("TLS-CONNECTION({}): Session={} Sim Device {} is "
 												  "not allowed. Disconnecting.",
 												  CId_, State_.sessionId, CN_));
+				EndConnection();
 				return false;
 			}

-			if(AP_WS_Server::IsSim(SerialNumber_)) {
+			if(AP_WS_Server::IsSim(CN_)) {
 				State_.VerifiedCertificate = GWObjects::SIMULATED;
-				Simulated_ = true;
 			}

 			std::string reason, author;
 			std::uint64_t created;
-			if (!CN_.empty() && StorageService()->IsBlackListed(SerialNumberInt_, reason, author, created)) {
+			if (!CN_.empty() && StorageService()->IsBlackListed(CN_, reason, author, created)) {
 				DeviceBlacklistedKafkaEvent KE(Utils::SerialNumberToInt(CN_), Utils::Now(), reason, author, created, CId_);
 				poco_warning(
 					Logger_,
 					fmt::format(
 						"TLS-CONNECTION({}): Session={} Device {} is black listed. Disconnecting.",
 						CId_, State_.sessionId, CN_));
+				EndConnection();
 				return false;
 			}

 			State_.certificateExpiryDate = PeerCert.expiresOn().timestamp().epochTime();
+			SerialNumber_ = CN_;
+			SerialNumberInt_ = Utils::SerialNumberToInt(SerialNumber_);

 			poco_trace(Logger_,
 					   fmt::format("TLS-CONNECTION({}): Session={} CN={} Completed. (t={})", CId_,
@@ -284,14 +223,152 @@ namespace OpenWifi {
 		return false;
 	}

-	void AP_WS_Connection::DeviceDisconnectionCleanup(const std::string &SerialNumber, std::uint64_t uuid) {
+	static void NotifyKafkaDisconnect(const std::string &SerialNumber, std::uint64_t uuid) {
+		try {
+			Poco::JSON::Object Disconnect;
+			Poco::JSON::Object Details;
+			Details.set(uCentralProtocol::SERIALNUMBER, SerialNumber);
+			Details.set(uCentralProtocol::TIMESTAMP, Utils::Now());
+			Details.set(uCentralProtocol::UUID,uuid);
+			Disconnect.set(uCentralProtocol::DISCONNECTION, Details);
+			Poco::JSON::Stringifier Stringify;
+			std::ostringstream OS;
+			Stringify.condense(Disconnect, OS);
+			KafkaManager()->PostMessage(KafkaTopics::CONNECTION, SerialNumber, std::make_shared<std::string>(OS.str()));
+		} catch (...) {
+		}
+	}
+
+	AP_WS_Connection::~AP_WS_Connection() {
+		Valid_ = false;
+		EndConnection();
+	}
+
+	void DeviceDisconnectionCleanup(const std::string &SerialNumber, std::uint64_t uuid) {
 		if (KafkaManager()->Enabled()) {
 			NotifyKafkaDisconnect(SerialNumber, uuid);
 		}
 		RADIUSSessionTracker()->DeviceDisconnect(SerialNumber);
-		GWWebSocketNotifications::SingleDevice_t N;
-		N.content.serialNumber = SerialNumber;
-		GWWebSocketNotifications::DeviceDisconnected(N);
+	}
+
+	void AP_WS_Connection::EndConnection(bool DeleteSession) {
+    	Valid_ = false;
+		if (!Dead_.test_and_set()) {
+
+			if(!SerialNumber_.empty() && State_.LastContact!=0) {
+				StorageService()->SetDeviceLastRecordedContact(SerialNumber_, State_.LastContact);
+			}
+
+			if (Registered_) {
+				Registered_ = false;
+				Reactor_.removeEventHandler(
+					*WS_, Poco::NObserver<AP_WS_Connection, Poco::Net::ReadableNotification>(
+							  *this, &AP_WS_Connection::OnSocketReadable));
+				Reactor_.removeEventHandler(
+					*WS_, Poco::NObserver<AP_WS_Connection, Poco::Net::ShutdownNotification>(
+							  *this, &AP_WS_Connection::OnSocketShutdown));
+				Reactor_.removeEventHandler(
+					*WS_, Poco::NObserver<AP_WS_Connection, Poco::Net::ErrorNotification>(
+							  *this, &AP_WS_Connection::OnSocketError));
+			}
+			WS_->close();
+
+			if(!SerialNumber_.empty()) {
+				std::thread	Cleanup(DeviceDisconnectionCleanup,SerialNumber_, uuid_);
+				Cleanup.detach();
+			}
+
+			bool SessionDeleted = false;
+			if(DeleteSession)
+				SessionDeleted = AP_WS_Server()->EndSession(State_.sessionId, SerialNumberInt_);
+
+			if (SessionDeleted || !DeleteSession) {
+				GWWebSocketNotifications::SingleDevice_t N;
+				N.content.serialNumber = SerialNumber_;
+				GWWebSocketNotifications::DeviceDisconnected(N);
+			}
+		}
+	}
+
+	bool AP_WS_Connection::LookForUpgrade(const uint64_t UUID, uint64_t &UpgradedUUID) {
+
+		//	A UUID of zero means ignore updates for that connection.
+		if (UUID == 0)
+			return false;
+
+		uint64_t GoodConfig = ConfigurationCache().CurrentConfig(SerialNumberInt_);
+		if (GoodConfig && (GoodConfig == UUID || GoodConfig == State_.PendingUUID)) {
+			UpgradedUUID = UUID;
+			return false;
+		}
+
+		GWObjects::Device D;
+		if (StorageService()->GetDevice(SerialNumber_, D)) {
+
+			if(D.pendingUUID!=0 && UUID==D.pendingUUID) {
+				//	so we sent an upgrade to a device, and now it is completing now...
+				UpgradedUUID = D.pendingUUID;
+				StorageService()->CompleteDeviceConfigurationChange(SerialNumber_);
+				return true;
+			}
+
+			//	This is the case where the cache is empty after a restart. So GoodConfig will 0. If
+			// the device already 	has the right UUID, we just return.
+			if (D.UUID == UUID) {
+				UpgradedUUID = UUID;
+				ConfigurationCache().Add(SerialNumberInt_, UUID);
+				return false;
+			}
+
+			Config::Config Cfg(D.Configuration);
+			if (UUID > D.UUID) {
+				//	so we have a problem, the device has a newer config than we have. So we need to
+				// make sure our config 	is newer.
+				D.UUID = UUID + 2;
+				UpgradedUUID = D.UUID;
+			}
+
+			Cfg.SetUUID(D.UUID);
+			D.Configuration = Cfg.get();
+			State_.PendingUUID = UpgradedUUID = D.UUID;
+
+			GWObjects::CommandDetails Cmd;
+			Cmd.SerialNumber = SerialNumber_;
+			Cmd.UUID = MicroServiceCreateUUID();
+			Cmd.SubmittedBy = uCentralProtocol::SUBMITTED_BY_SYSTEM;
+			Cmd.Status = uCentralProtocol::PENDING;
+			Cmd.Command = uCentralProtocol::CONFIGURE;
+			Poco::JSON::Parser P;
+			auto ParsedConfig = P.parse(D.Configuration).extract<Poco::JSON::Object::Ptr>();
+			Poco::JSON::Object Params;
+			Params.set(uCentralProtocol::SERIAL, SerialNumber_);
+			Params.set(uCentralProtocol::UUID, D.UUID);
+			Params.set(uCentralProtocol::WHEN, 0);
+			Params.set(uCentralProtocol::CONFIG, ParsedConfig);
+
+			std::ostringstream O;
+			Poco::JSON::Stringifier::stringify(Params, O);
+			Cmd.Details = O.str();
+			poco_information(Logger_,
+							 fmt::format("CFG-UPGRADE({}): Current ID: {}, newer configuration {}.",
+										 CId_, UUID, D.UUID));
+			bool Sent;
+
+			StorageService()->AddCommand(SerialNumber_, Cmd,
+										 Storage::CommandExecutionType::COMMAND_EXECUTED);
+			CommandManager()->PostCommand(
+				CommandManager()->Next_RPC_ID(), APCommands::to_apcommand(Cmd.Command.c_str()),
+				SerialNumber_, Cmd.Command, Params, Cmd.UUID, Sent, false, false);
+
+			GWWebSocketNotifications::SingleDeviceConfigurationChange_t Notification;
+			Notification.content.serialNumber = D.SerialNumber;
+			Notification.content.oldUUID = UUID;
+			Notification.content.newUUID = UpgradedUUID;
+			GWWebSocketNotifications::DeviceConfigurationChange(Notification);
+
+			return true;
+		}
+		return false;
 	}

 	void AP_WS_Connection::ProcessJSONRPCResult(Poco::JSON::Object::Ptr Doc) {
@@ -372,7 +449,7 @@ namespace OpenWifi {

 		std::string reason, author;
 		std::uint64_t created;
-		if (StorageService()->IsBlackListed(SerialNumberInt_, reason, author, created)) {
+		if (StorageService()->IsBlackListed(Serial, reason, author, created)) {
 			DeviceBlacklistedKafkaEvent KE(Utils::SerialNumberToInt(CN_), Utils::Now(), reason, author, created, CId_);
 			Poco::Exception E(
 				fmt::format("BLACKLIST({}): device is blacklisted and not allowed to connect.",
@@ -503,17 +580,17 @@ namespace OpenWifi {
 	}

 	bool AP_WS_Connection::SetWebSocketTelemetryReporting(
-		std::uint64_t RPCID, std::uint64_t Interval, std::uint64_t LifeTime,
+		uint64_t RPCID, uint64_t Interval, uint64_t LifeTime,
 		const std::vector<std::string> &TelemetryTypes) {
 		std::unique_lock Lock(TelemetryMutex_);
 		TelemetryWebSocketRefCount_++;
 		TelemetryInterval_ = TelemetryInterval_
-								 ? (Interval < (std::uint64_t)TelemetryInterval_ ? Interval : (std::uint64_t )TelemetryInterval_)
+								 ? (Interval < TelemetryInterval_ ? Interval : TelemetryInterval_)
 								 : Interval;
 		auto TelemetryWebSocketTimer = LifeTime + Utils::Now();
-		TelemetryWebSocketTimer_ = TelemetryWebSocketTimer > (std::uint64_t)TelemetryWebSocketTimer_
-									   ? (std::uint64_t)TelemetryWebSocketTimer
-									   : (std::uint64_t)TelemetryWebSocketTimer_;
+		TelemetryWebSocketTimer_ = TelemetryWebSocketTimer > TelemetryWebSocketTimer_
+									   ? TelemetryWebSocketTimer
+									   : TelemetryWebSocketTimer_;
 		UpdateCounts();
 		if (!TelemetryReporting_) {
 			TelemetryReporting_ = true;
@@ -529,11 +606,11 @@ namespace OpenWifi {
 		std::unique_lock Lock(TelemetryMutex_);
 		TelemetryKafkaRefCount_++;
 		TelemetryInterval_ = TelemetryInterval_
-								 ? (Interval < (std::uint64_t)TelemetryInterval_ ? (std::uint64_t)Interval : (std::uint64_t)TelemetryInterval_)
+								 ? (Interval < TelemetryInterval_ ? Interval : TelemetryInterval_)
 								 : Interval;
 		auto TelemetryKafkaTimer = LifeTime + Utils::Now();
 		TelemetryKafkaTimer_ =
-			TelemetryKafkaTimer > (std::uint64_t)TelemetryKafkaTimer_ ? (std::uint64_t)TelemetryKafkaTimer : (std::uint64_t)TelemetryKafkaTimer_;
+			TelemetryKafkaTimer > TelemetryKafkaTimer_ ? TelemetryKafkaTimer : TelemetryKafkaTimer_;
 		UpdateCounts();
 		if (!TelemetryReporting_) {
 			TelemetryReporting_ = true;
@@ -569,50 +646,49 @@ namespace OpenWifi {
 	void AP_WS_Connection::OnSocketShutdown(
 		[[maybe_unused]] const Poco::AutoPtr<Poco::Net::ShutdownNotification> &pNf) {
 		poco_trace(Logger_, fmt::format("SOCKET-SHUTDOWN({}): Closing.", CId_));
-		std::lock_guard	G(ConnectionMutex_);
 		return EndConnection();
 	}

 	void AP_WS_Connection::OnSocketError(
 		[[maybe_unused]] const Poco::AutoPtr<Poco::Net::ErrorNotification> &pNf) {
 		poco_trace(Logger_, fmt::format("SOCKET-ERROR({}): Closing.", CId_));
-		std::lock_guard	G(ConnectionMutex_);
 		return EndConnection();
 	}

 	void AP_WS_Connection::OnSocketReadable(
 		[[maybe_unused]] const Poco::AutoPtr<Poco::Net::ReadableNotification> &pNf) {

-		if (Dead_) //	we are dead, so we do not process anything.
+		if (!Valid_)
 			return;

-		std::lock_guard	DeviceLock(ConnectionMutex_);
+		if (!AP_WS_Server()->Running())
+			return EndConnection();

-		State_.LastContact = LastContact_ = Utils::Now();
-		if (AP_WS_Server()->Running() && (DeviceValidated_ || ValidatedDevice())) {
-			try {
-				return ProcessIncomingFrame();
-			} catch (const Poco::Exception &E) {
-				Logger_.log(E);
-			} catch (const std::exception &E) {
-				std::string W = E.what();
-				poco_information(
-					Logger_, fmt::format("std::exception caught: {}. Connection terminated with {}",
-										 W, CId_));
-			} catch (...) {
-				poco_information(
-					Logger_, fmt::format("Unknown exception for {}. Connection terminated.", CId_));
-			}
+		if (!ValidatedDevice())
+			return;
+
+		try {
+			return ProcessIncomingFrame();
+		} catch (const Poco::Exception &E) {
+			Logger_.log(E);
+			return EndConnection();
+		} catch (const std::exception &E) {
+			std::string W = E.what();
+			poco_information(
+				Logger_,
+				fmt::format("std::exception caught: {}. Connection terminated with {}", W, CId_));
+			return EndConnection();
+		} catch (...) {
+			poco_information(Logger_,
+							 fmt::format("Unknown exception for {}. Connection terminated.", CId_));
+			return EndConnection();
 		}
-		EndConnection();
 	}

 	void AP_WS_Connection::ProcessIncomingFrame() {
 		Poco::Buffer<char> IncomingFrame(0);
-
-		bool	KillConnection=false;
 		try {
-			int 	Op, flags;
+			int Op, flags;
 			auto IncomingSize = WS_->receiveFrame(IncomingFrame, flags);

 			Op = flags & Poco::Net::WebSocket::FRAME_OP_BITMASK;
@@ -632,81 +708,85 @@ namespace OpenWifi {
 			State_.LastContact = Utils::Now();

 			switch (Op) {
-				case Poco::Net::WebSocket::FRAME_OP_PING: {
-					poco_trace(Logger_, fmt::format("WS-PING({}): received. PONG sent back.", CId_));
-					WS_->sendFrame("", 0,
-								   (int)Poco::Net::WebSocket::FRAME_OP_PONG |
-									   (int)Poco::Net::WebSocket::FRAME_FLAG_FIN);
+			case Poco::Net::WebSocket::FRAME_OP_PING: {
+				poco_trace(Logger_, fmt::format("WS-PING({}): received. PONG sent back.", CId_));
+				WS_->sendFrame("", 0,
+							   (int)Poco::Net::WebSocket::FRAME_OP_PONG |
+								   (int)Poco::Net::WebSocket::FRAME_FLAG_FIN);

-					if (KafkaManager()->Enabled()) {
-						Poco::JSON::Object PingObject;
-						Poco::JSON::Object PingDetails;
-						PingDetails.set(uCentralProtocol::FIRMWARE, State_.Firmware);
-						PingDetails.set(uCentralProtocol::SERIALNUMBER, SerialNumber_);
-						PingDetails.set(uCentralProtocol::COMPATIBLE, Compatible_);
-						PingDetails.set(uCentralProtocol::CONNECTIONIP, CId_);
-						PingDetails.set(uCentralProtocol::TIMESTAMP, Utils::Now());
-						PingDetails.set(uCentralProtocol::UUID, uuid_);
-						PingDetails.set("locale", State_.locale);
-						PingObject.set(uCentralProtocol::PING, PingDetails);
-						poco_trace(Logger_,fmt::format("Sending PING for {}", SerialNumber_));
-						KafkaManager()->PostMessage(KafkaTopics::CONNECTION, SerialNumber_,PingObject);
-					}
-				} break;
+				if (KafkaManager()->Enabled()) {
+					Poco::JSON::Object PingObject;
+					Poco::JSON::Object PingDetails;
+					PingDetails.set(uCentralProtocol::FIRMWARE, State_.Firmware);
+					PingDetails.set(uCentralProtocol::SERIALNUMBER, SerialNumber_);
+					PingDetails.set(uCentralProtocol::COMPATIBLE, Compatible_);
+					PingDetails.set(uCentralProtocol::CONNECTIONIP, CId_);
+					PingDetails.set(uCentralProtocol::TIMESTAMP, Utils::Now());
+					PingDetails.set(uCentralProtocol::UUID, uuid_);
+					PingDetails.set("locale", State_.locale);
+					PingObject.set(uCentralProtocol::PING, PingDetails);
+					Poco::JSON::Stringifier Stringify;
+					std::ostringstream OS;
+					Stringify.condense(PingObject, OS);
+					KafkaManager()->PostMessage(KafkaTopics::CONNECTION, SerialNumber_, std::make_shared<std::string>(OS.str()));
+				}
+				return;
+			} break;

-				case Poco::Net::WebSocket::FRAME_OP_PONG: {
-					poco_trace(Logger_, fmt::format("PONG({}): received and ignored.", CId_));
-				} break;
+			case Poco::Net::WebSocket::FRAME_OP_PONG: {
+				poco_trace(Logger_, fmt::format("PONG({}): received and ignored.", CId_));
+				return;
+			} break;

-				case Poco::Net::WebSocket::FRAME_OP_TEXT: {
-					poco_trace(Logger_,
-							   fmt::format("FRAME({}): Frame received (length={}, flags={}). Msg={}",
-										   CId_, IncomingSize, flags, IncomingFrame.begin()));
+			case Poco::Net::WebSocket::FRAME_OP_TEXT: {
+				poco_trace(Logger_,
+						   fmt::format("FRAME({}): Frame received (length={}, flags={}). Msg={}",
+									   CId_, IncomingSize, flags, IncomingFrame.begin()));

-					Poco::JSON::Parser parser;
-					auto ParsedMessage = parser.parse(IncomingFrame.begin());
-					auto IncomingJSON = ParsedMessage.extract<Poco::JSON::Object::Ptr>();
+				Poco::JSON::Parser parser;
+				auto ParsedMessage = parser.parse(IncomingFrame.begin());
+				auto IncomingJSON = ParsedMessage.extract<Poco::JSON::Object::Ptr>();

-					if (IncomingJSON->has(uCentralProtocol::JSONRPC)) {
-						if (IncomingJSON->has(uCentralProtocol::METHOD) &&
-							IncomingJSON->has(uCentralProtocol::PARAMS)) {
-							ProcessJSONRPCEvent(IncomingJSON);
-						} else if (IncomingJSON->has(uCentralProtocol::RESULT) &&
-								   IncomingJSON->has(uCentralProtocol::ID)) {
-							poco_trace(Logger_, fmt::format("RPC-RESULT({}): payload: {}", CId_,
-															IncomingFrame.begin()));
-							ProcessJSONRPCResult(IncomingJSON);
-						} else {
-							poco_warning(
-								Logger_,
-								fmt::format("INVALID-PAYLOAD({}): Payload is not JSON-RPC 2.0: {}",
-											CId_, IncomingFrame.begin()));
-						}
-					} else if (IncomingJSON->has(uCentralProtocol::RADIUS)) {
-						ProcessIncomingRadiusData(IncomingJSON);
+				if (IncomingJSON->has(uCentralProtocol::JSONRPC)) {
+					if (IncomingJSON->has(uCentralProtocol::METHOD) &&
+						IncomingJSON->has(uCentralProtocol::PARAMS)) {
+						ProcessJSONRPCEvent(IncomingJSON);
+					} else if (IncomingJSON->has(uCentralProtocol::RESULT) &&
+							   IncomingJSON->has(uCentralProtocol::ID)) {
+						poco_trace(Logger_, fmt::format("RPC-RESULT({}): payload: {}", CId_,
+														IncomingFrame.begin()));
+						ProcessJSONRPCResult(IncomingJSON);
 					} else {
-						std::ostringstream iS;
-						IncomingJSON->stringify(iS);
 						poco_warning(
 							Logger_,
-							fmt::format("FRAME({}): illegal transaction header, missing 'jsonrpc': {}",
-										CId_, iS.str()));
-						Errors_++;
+							fmt::format("INVALID-PAYLOAD({}): Payload is not JSON-RPC 2.0: {}",
+										CId_, IncomingFrame.begin()));
 					}
-				} break;
-
-				case Poco::Net::WebSocket::FRAME_OP_CLOSE: {
-					poco_information(Logger_,
-									 fmt::format("CLOSE({}): Device is closing its connection.", CId_));
-					KillConnection=true;
-				} break;
-
-				default: {
-					poco_warning(Logger_, fmt::format("UNKNOWN({}): unknown WS Frame operation: {}",
-													  CId_, std::to_string(Op)));
+				} else if (IncomingJSON->has(uCentralProtocol::RADIUS)) {
+					ProcessIncomingRadiusData(IncomingJSON);
+				} else {
+					std::ostringstream iS;
+					IncomingJSON->stringify(iS);
+					std::cout << iS.str() << std::endl;
+					poco_warning(
+						Logger_,
+						fmt::format("FRAME({}): illegal transaction header, missing 'jsonrpc'",
+									CId_));
 					Errors_++;
-					return;
 				}
+				return;
+			} break;
+
+			case Poco::Net::WebSocket::FRAME_OP_CLOSE: {
+				poco_information(Logger_,
+								 fmt::format("CLOSE({}): Device is closing its connection.", CId_));
+				return EndConnection();
+			} break;
+
+			default: {
+				poco_warning(Logger_, fmt::format("UNKNOWN({}): unknown WS Frame operation: {}",
+												  CId_, std::to_string(Op)));
+			} break;
 			}
 		} catch (const Poco::Net::ConnectionResetException &E) {
 			poco_warning(Logger_,
@@ -714,21 +794,21 @@ namespace OpenWifi {
 									 CId_, E.displayText(),
 									 IncomingFrame.begin() == nullptr ? "" : IncomingFrame.begin(),
 									 State_.sessionId));
-			KillConnection=true;
+			return EndConnection();
 		} catch (const Poco::JSON::JSONException &E) {
 			poco_warning(Logger_,
 						 fmt::format("JSONException({}): Text:{} Payload:{} Session:{}", CId_,
 									 E.displayText(),
 									 IncomingFrame.begin() == nullptr ? "" : IncomingFrame.begin(),
 									 State_.sessionId));
-			KillConnection=true;
+			return EndConnection();
 		} catch (const Poco::Net::WebSocketException &E) {
 			poco_warning(Logger_,
 						 fmt::format("WebSocketException({}): Text:{} Payload:{} Session:{}", CId_,
 									 E.displayText(),
 									 IncomingFrame.begin() == nullptr ? "" : IncomingFrame.begin(),
 									 State_.sessionId));
-			KillConnection=true;
+			return EndConnection();
 		} catch (const Poco::Net::SSLConnectionUnexpectedlyClosedException &E) {
 			poco_warning(
 				Logger_,
@@ -737,54 +817,54 @@ namespace OpenWifi {
 					CId_, E.displayText(),
 					IncomingFrame.begin() == nullptr ? "" : IncomingFrame.begin(),
 					State_.sessionId));
-			KillConnection=true;
+			return EndConnection();
 		} catch (const Poco::Net::SSLException &E) {
 			poco_warning(Logger_,
 						 fmt::format("SSLException({}): Text:{} Payload:{} Session:{}", CId_,
 									 E.displayText(),
 									 IncomingFrame.begin() == nullptr ? "" : IncomingFrame.begin(),
 									 State_.sessionId));
-			KillConnection=true;
+			return EndConnection();
 		} catch (const Poco::Net::NetException &E) {
 			poco_warning(Logger_,
 						 fmt::format("NetException({}): Text:{} Payload:{} Session:{}", CId_,
 									 E.displayText(),
 									 IncomingFrame.begin() == nullptr ? "" : IncomingFrame.begin(),
 									 State_.sessionId));
-			KillConnection=true;
+			return EndConnection();
 		} catch (const Poco::IOException &E) {
 			poco_warning(Logger_,
 						 fmt::format("IOException({}): Text:{} Payload:{} Session:{}", CId_,
 									 E.displayText(),
 									 IncomingFrame.begin() == nullptr ? "" : IncomingFrame.begin(),
 									 State_.sessionId));
-			KillConnection=true;
+			return EndConnection();
 		} catch (const Poco::Exception &E) {
 			poco_warning(Logger_,
 						 fmt::format("Exception({}): Text:{} Payload:{} Session:{}", CId_,
 									 E.displayText(),
 									 IncomingFrame.begin() == nullptr ? "" : IncomingFrame.begin(),
 									 State_.sessionId));
-			KillConnection=true;
+			return EndConnection();
 		} catch (const std::exception &E) {
 			poco_warning(Logger_,
 						 fmt::format("std::exception({}): Text:{} Payload:{} Session:{}", CId_,
 									 E.what(),
 									 IncomingFrame.begin() == nullptr ? "" : IncomingFrame.begin(),
 									 State_.sessionId));
-			KillConnection=true;
+			return EndConnection();
 		} catch (...) {
 			poco_error(Logger_, fmt::format("UnknownException({}): Device must be disconnected. "
 											"Unknown exception.  Session:{}",
 											CId_, State_.sessionId));
-			KillConnection=true;
+			return EndConnection();
 		}

-		if (!KillConnection && Errors_ < 10)
+		if (Errors_ < 10)
 			return;

-		poco_warning(Logger_, fmt::format("DISCONNECTING({}): ConnectionException: {} Errors: {}", CId_, KillConnection, Errors_ ));
-		EndConnection();
+		poco_warning(Logger_, fmt::format("DISCONNECTING({}): Too many errors", CId_));
+		return EndConnection();
 	}

 	bool AP_WS_Connection::Send(const std::string &Payload) {
@@ -877,55 +957,24 @@ namespace OpenWifi {

 	void AP_WS_Connection::ProcessIncomingRadiusData(const Poco::JSON::Object::Ptr &Doc) {
 		if (Doc->has(uCentralProtocol::RADIUSDATA)) {
+			std::string secret;
 			auto Type = Doc->get(uCentralProtocol::RADIUS).toString();
 			if (Type == uCentralProtocol::RADIUSACCT) {
 				auto Data = Doc->get(uCentralProtocol::RADIUSDATA).toString();
 				auto DecodedData = Base64Decode(Data);
 				RADIUS_proxy_server()->SendAccountingData(SerialNumber_, DecodedData.c_str(),
-														  DecodedData.size());
+														  DecodedData.size(),secret);
 			} else if (Type == uCentralProtocol::RADIUSAUTH) {
 				auto Data = Doc->get(uCentralProtocol::RADIUSDATA).toString();
 				auto DecodedData = Base64Decode(Data);
 				RADIUS_proxy_server()->SendAuthenticationData(SerialNumber_, DecodedData.c_str(),
-															  DecodedData.size());
+															  DecodedData.size(), secret);
 			} else if (Type == uCentralProtocol::RADIUSCOA) {
 				auto Data = Doc->get(uCentralProtocol::RADIUSDATA).toString();
 				auto DecodedData = Base64Decode(Data);
 				RADIUS_proxy_server()->SendCoAData(SerialNumber_, DecodedData.c_str(),
-												   DecodedData.size());
+												   DecodedData.size(), secret);
 			}
 		}
 	}
-
-	void AP_WS_Connection::SetLastStats(const std::string &LastStats) {
-		RawLastStats_ = LastStats;
-		try {
-			Poco::JSON::Parser P;
-			auto Stats = P.parse(LastStats).extract<Poco::JSON::Object::Ptr>();
-			hasGPS_ = Stats->isObject("gps");
-			auto Unit = Stats->getObject("unit");
-			auto Memory = Unit->getObject("memory");
-			std::uint64_t TotalMemory = Memory->get("total");
-			std::uint64_t FreeMemory = Memory->get("free");
-			if (TotalMemory > 0) {
-				memory_used_ =
-					(100.0 * ((double)TotalMemory - (double)FreeMemory)) / (double)TotalMemory;
-			}
-			if (Unit->isArray("load")) {
-				Poco::JSON::Array::Ptr Load = Unit->getArray("load");
-				if (Load->size() > 1) {
-					cpu_load_ = Load->get(1);
-				}
-			}
-			if (Unit->isArray("temperature")) {
-				Poco::JSON::Array::Ptr Temperature = Unit->getArray("temperature");
-				if (Temperature->size() > 1) {
-					temperature_ = Temperature->get(0);
-				}
-			}
-		} catch (const Poco::Exception &E) {
-			poco_error(Logger_, "Failed to parse last stats: " + E.displayText());
-		}
-	}
-
 } // namespace OpenWifi
--- a/src/AP_WS_Connection.h
+++ b/src/AP_WS_Connection.h
@@ -4,7 +4,7 @@

 #pragma once

-#include <mutex>
+#include <shared_mutex>
 #include <string>

 #include "Poco/JSON/Object.h"
@@ -14,10 +14,8 @@
 #include "Poco/Net/SocketReactor.h"
 #include "Poco/Net/StreamSocket.h"
 #include "Poco/Net/WebSocket.h"
-#include <Poco/Data/Session.h>

 #include "RESTObjects/RESTAPI_GWobjects.h"
-#include <AP_WS_Reactor_Pool.h>

 namespace OpenWifi {

@@ -27,17 +25,16 @@ namespace OpenWifi {
 	  public:
 		explicit AP_WS_Connection(Poco::Net::HTTPServerRequest &request,
 								  Poco::Net::HTTPServerResponse &response, uint64_t connection_id,
-								  Poco::Logger &L, std::pair<std::shared_ptr<Poco::Net::SocketReactor>, std::shared_ptr<LockedDbSession>> R);
+								  Poco::Logger &L, Poco::Net::SocketReactor &R);
 		~AP_WS_Connection();

-		void EndConnection(bool Clean = true);
+		void EndConnection(bool DeleteSession=true);
 		void ProcessJSONRPCEvent(Poco::JSON::Object::Ptr &Doc);
 		void ProcessJSONRPCResult(Poco::JSON::Object::Ptr Doc);
 		void ProcessIncomingFrame();
 		void ProcessIncomingRadiusData(const Poco::JSON::Object::Ptr &Doc);

 		[[nodiscard]] bool Send(const std::string &Payload);
-		[[nodiscard]] inline bool MustBeSecureRTTY() const { return RTTYMustBeSecure_; }

 		bool SendRadiusAuthenticationData(const unsigned char *buffer, std::size_t size);
 		bool SendRadiusAccountingData(const unsigned char *buffer, std::size_t size);
@@ -46,7 +43,10 @@ namespace OpenWifi {
 		void OnSocketReadable(const Poco::AutoPtr<Poco::Net::ReadableNotification> &pNf);
 		void OnSocketShutdown(const Poco::AutoPtr<Poco::Net::ShutdownNotification> &pNf);
 		void OnSocketError(const Poco::AutoPtr<Poco::Net::ErrorNotification> &pNf);
-		bool LookForUpgrade(Poco::Data::Session &Session, uint64_t UUID, uint64_t &UpgradedUUID);
+		bool LookForUpgrade(uint64_t UUID, uint64_t &UpgradedUUID);
+		static bool ExtractBase64CompressedData(const std::string &CompressedData,
+												std::string &UnCompressedData,
+												uint64_t compress_sz);
 		void LogException(const Poco::Exception &E);
 		inline Poco::Logger &Logger() { return Logger_; }
 		bool SetWebSocketTelemetryReporting(uint64_t RPCID, uint64_t interval,
@@ -59,34 +59,82 @@ namespace OpenWifi {
 		bool StopKafkaTelemetry(uint64_t RPCID);

 		inline void GetLastStats(std::string &LastStats) {
-			if(!Dead_) {
-				std::lock_guard G(ConnectionMutex_);
-				LastStats = RawLastStats_;
+			std::shared_lock G(ConnectionMutex_);
+			LastStats = RawLastStats_;
+		}
+
+		inline void SetLastStats(const std::string &LastStats) {
+			std::unique_lock G(ConnectionMutex_);
+			RawLastStats_ = LastStats;
+			try {
+				Poco::JSON::Parser P;
+				auto Stats = P.parse(LastStats).extract<Poco::JSON::Object::Ptr>();
+				hasGPS = Stats->isObject("gps");
+				auto Unit = Stats->getObject("unit");
+				auto Memory = Unit->getObject("memory");
+				std::uint64_t TotalMemory = Memory->get("total");
+				std::uint64_t FreeMemory = Memory->get("free");
+				if(TotalMemory>0) {
+					memory_used_ =
+						(100.0 * ((double)TotalMemory - (double)FreeMemory)) / (double)TotalMemory;
+				}
+				if(Unit->isArray("load")) {
+					Poco::JSON::Array::Ptr Load = Unit->getArray("load");
+					if(Load->size()>1) {
+						cpu_load_ = Load->get(1);
+					}
+				}
+				if(Unit->isArray("temperature")) {
+					Poco::JSON::Array::Ptr Temperature = Unit->getArray("temperature");
+					if(Temperature->size()>1) {
+						temperature_ = Temperature->get(0);
+					}
+				}
+			} catch (...) {
+
 			}
 		}

+		inline void SetLastHealthCheck(const GWObjects::HealthCheck &H) {
+			std::unique_lock G(ConnectionMutex_);
+			RawLastHealthcheck_ = H;
+		}
+
 		inline void GetLastHealthCheck(GWObjects::HealthCheck &H) {
-			if(!Dead_) {
-				std::lock_guard G(ConnectionMutex_);
-				H = RawLastHealthcheck_;
-			}
+			std::shared_lock G(ConnectionMutex_);
+			H = RawLastHealthcheck_;
 		}

-		inline void GetState(GWObjects::ConnectionState &State) {
-			if(!Dead_) {
-				std::lock_guard G(ConnectionMutex_);
-				State = State_;
-			}
+		inline void GetState(GWObjects::ConnectionState &State) const {
+			std::shared_lock G(ConnectionMutex_);
+			State = State_;
 		}

-		[[nodiscard]] inline bool HasGPS() const { return hasGPS_; }
-		[[nodiscard]] bool ValidatedDevice();
+		inline bool HasGPS() { return hasGPS; }

-		inline void GetRestrictions(GWObjects::DeviceRestrictions &R) {
-			std::lock_guard G(ConnectionMutex_);
+		inline void GetRestrictions(GWObjects::DeviceRestrictions &R) const {
+			std::shared_lock G(ConnectionMutex_);
 			R = Restrictions_;
 		}

+		void Process_connect(Poco::JSON::Object::Ptr ParamsObj, const std::string &Serial);
+		void Process_state(Poco::JSON::Object::Ptr ParamsObj);
+		void Process_healthcheck(Poco::JSON::Object::Ptr ParamsObj);
+		void Process_log(Poco::JSON::Object::Ptr ParamsObj);
+		void Process_crashlog(Poco::JSON::Object::Ptr ParamsObj);
+		void Process_ping(Poco::JSON::Object::Ptr ParamsObj);
+		void Process_cfgpending(Poco::JSON::Object::Ptr ParamsObj);
+		void Process_recovery(Poco::JSON::Object::Ptr ParamsObj);
+		void Process_deviceupdate(Poco::JSON::Object::Ptr ParamsObj, std::string &Serial);
+		void Process_telemetry(Poco::JSON::Object::Ptr ParamsObj);
+		void Process_venuebroadcast(Poco::JSON::Object::Ptr ParamsObj);
+		void Process_event(Poco::JSON::Object::Ptr ParamsObj);
+		void Process_wifiscan(Poco::JSON::Object::Ptr ParamsObj);
+		void Process_alarm(Poco::JSON::Object::Ptr ParamsObj);
+		void Process_rebootLog(Poco::JSON::Object::Ptr ParamsObj);
+
+		bool ValidatedDevice();
+
 		inline bool GetTelemetryParameters(bool &Reporting, uint64_t &Interval,
 										   uint64_t &WebSocketTimer, uint64_t &KafkaTimer,
 										   uint64_t &WebSocketCount, uint64_t &KafkaCount,
@@ -105,18 +153,18 @@ namespace OpenWifi {

 		friend class AP_WS_Server;

-		inline GWObjects::DeviceRestrictions Restrictions() {
-			std::lock_guard G(ConnectionMutex_);
+		inline GWObjects::DeviceRestrictions Restrictions() const {
+			std::shared_lock G(ConnectionMutex_);
 			return Restrictions_;
 		}
-		void Start();
+
+		inline bool MustBeSecureRtty() const { return RttyMustBeSecure_; }

 	  private:
-		std::recursive_mutex ConnectionMutex_;
-		std::mutex TelemetryMutex_;
+		mutable std::shared_mutex ConnectionMutex_;
+		std::shared_mutex TelemetryMutex_;
 		Poco::Logger &Logger_;
-		std::shared_ptr<Poco::Net::SocketReactor> 	Reactor_;
-		std::shared_ptr<LockedDbSession> 	DbSession_;
+		Poco::Net::SocketReactor &Reactor_;
 		std::unique_ptr<Poco::Net::WebSocket> WS_;
 		std::string SerialNumber_;
 		uint64_t SerialNumberInt_ = 0;
@@ -127,56 +175,33 @@ namespace OpenWifi {
 		uint64_t Errors_ = 0;
 		Poco::Net::IPAddress PeerAddress_;
 		volatile bool TelemetryReporting_ = false;
-		std::atomic_uint64_t TelemetryWebSocketRefCount_ = 0;
-		std::atomic_uint64_t TelemetryKafkaRefCount_ = 0;
-		std::atomic_uint64_t TelemetryWebSocketTimer_ = 0;
-		std::atomic_uint64_t TelemetryKafkaTimer_ = 0;
-		std::atomic_uint64_t TelemetryInterval_ = 0;
-		std::atomic_uint64_t TelemetryWebSocketPackets_ = 0;
-		std::atomic_uint64_t TelemetryKafkaPackets_ = 0;
+		volatile uint64_t TelemetryWebSocketRefCount_ = 0;
+		volatile uint64_t TelemetryKafkaRefCount_ = 0;
+		volatile uint64_t TelemetryWebSocketTimer_ = 0;
+		volatile uint64_t TelemetryKafkaTimer_ = 0;
+		volatile uint64_t TelemetryInterval_ = 0;
+		volatile uint64_t TelemetryWebSocketPackets_ = 0;
+		volatile uint64_t TelemetryKafkaPackets_ = 0;
 		GWObjects::ConnectionState State_;
-		Utils::CompressedString RawLastStats_;
+		std::string RawLastStats_;
 		GWObjects::HealthCheck RawLastHealthcheck_;
 		std::chrono::time_point<std::chrono::high_resolution_clock> ConnectionStart_ =
 			std::chrono::high_resolution_clock::now();
 		std::chrono::duration<double, std::milli> ConnectionCompletionTime_{0.0};
-		std::atomic<bool> 	Dead_ = false;
+		std::atomic_flag Dead_ = false;
 		std::atomic_bool DeviceValidated_ = false;
+		std::atomic_bool Valid_ = false;
 		OpenWifi::GWObjects::DeviceRestrictions Restrictions_;
-		bool 			RTTYMustBeSecure_ = false;
-		bool hasGPS_=false;
-		std::double_t 	memory_used_=0.0, cpu_load_ = 0.0, temperature_ = 0.0;
-		std::uint64_t 	uuid_=0;
-		bool	Simulated_=false;
-		std::uint64_t 	LastContact_=0;
+		bool 			RttyMustBeSecure_ = false;

 		static inline std::atomic_uint64_t ConcurrentStartingDevices_ = 0;

 		bool StartTelemetry(uint64_t RPCID, const std::vector<std::string> &TelemetryTypes);
 		bool StopTelemetry(uint64_t RPCID);
 		void UpdateCounts();
-		static void DeviceDisconnectionCleanup(const std::string &SerialNumber, std::uint64_t uuid);
-		void SetLastStats(const std::string &LastStats);
-		void Process_connect(Poco::JSON::Object::Ptr ParamsObj, const std::string &Serial);
-		void Process_state(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_healthcheck(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_log(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_crashlog(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_ping(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_cfgpending(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_recovery(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_deviceupdate(Poco::JSON::Object::Ptr ParamsObj, std::string &Serial);
-		void Process_telemetry(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_venuebroadcast(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_event(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_wifiscan(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_alarm(Poco::JSON::Object::Ptr ParamsObj);
-		void Process_rebootLog(Poco::JSON::Object::Ptr ParamsObj);
-
-		inline void SetLastHealthCheck(const GWObjects::HealthCheck &H) {
-			RawLastHealthcheck_ = H;
-		}
-
+		bool hasGPS=false;
+		std::double_t 	memory_used_=0.0, cpu_load_ = 0.0, temperature_ = 0.0;
+		std::uint64_t 	uuid_=0;
 	};

 } // namespace OpenWifi
--- a/src/AP_WS_LookForUpgrade.cpp
+++ b/src/AP_WS_LookForUpgrade.cpp
@@ -1,88 +0,0 @@
-
-#include <AP_WS_Connection.h>
-#include "ConfigurationCache.h"
-#include "UI_GW_WebSocketNotifications.h"
-#include "CommandManager.h"
-
-namespace OpenWifi {
-	bool AP_WS_Connection::LookForUpgrade(Poco::Data::Session &Session, const uint64_t UUID, uint64_t &UpgradedUUID) {
-
-		//	A UUID of zero means ignore updates for that connection.
-		if (UUID == 0)
-			return false;
-
-		uint64_t GoodConfig = ConfigurationCache().CurrentConfig(SerialNumberInt_);
-		if (GoodConfig && (GoodConfig == UUID || GoodConfig == State_.PendingUUID)) {
-			UpgradedUUID = UUID;
-			return false;
-		}
-
-		GWObjects::Device D;
-		if (StorageService()->GetDevice(Session,SerialNumber_, D)) {
-			if(D.pendingUUID!=0 && UUID==D.pendingUUID) {
-				//	so we sent an upgrade to a device, and now it is completing now...
-				UpgradedUUID = D.pendingUUID;
-				StorageService()->CompleteDeviceConfigurationChange(Session, SerialNumber_);
-				return true;
-			}
-
-			//	This is the case where the cache is empty after a restart. So GoodConfig will 0. If
-			// the device already 	has the right UUID, we just return.
-			if (D.UUID == UUID) {
-				UpgradedUUID = UUID;
-				ConfigurationCache().Add(SerialNumberInt_, UUID);
-				return false;
-			}
-
-			Config::Config Cfg(D.Configuration);
-			if (UUID > D.UUID) {
-				//	so we have a problem, the device has a newer config than we have. So we need to
-				// make sure our config 	is newer.
-				D.UUID = UUID + 2;
-				UpgradedUUID = D.UUID;
-			}
-
-			Cfg.SetUUID(D.UUID);
-			D.Configuration = Cfg.get();
-			State_.PendingUUID = UpgradedUUID = D.UUID;
-
-			GWObjects::CommandDetails Cmd;
-			Cmd.SerialNumber = SerialNumber_;
-			Cmd.UUID = MicroServiceCreateUUID();
-			Cmd.SubmittedBy = uCentralProtocol::SUBMITTED_BY_SYSTEM;
-			Cmd.Status = uCentralProtocol::PENDING;
-			Cmd.Command = uCentralProtocol::CONFIGURE;
-			Poco::JSON::Parser P;
-			auto ParsedConfig = P.parse(D.Configuration).extract<Poco::JSON::Object::Ptr>();
-			Poco::JSON::Object Params;
-			Params.set(uCentralProtocol::SERIAL, SerialNumber_);
-			Params.set(uCentralProtocol::UUID, D.UUID);
-			Params.set(uCentralProtocol::WHEN, 0);
-			Params.set(uCentralProtocol::CONFIG, ParsedConfig);
-
-			std::ostringstream O;
-			Poco::JSON::Stringifier::stringify(Params, O);
-			Cmd.Details = O.str();
-			poco_information(Logger_,
-							 fmt::format("CFG-UPGRADE({}): Current ID: {}, newer configuration {}.",
-										 CId_, UUID, D.UUID));
-			bool Sent;
-
-			StorageService()->AddCommand(SerialNumber_, Cmd,
-										 Storage::CommandExecutionType::COMMAND_EXECUTED);
-			CommandManager()->PostCommand(
-				CommandManager()->Next_RPC_ID(), APCommands::to_apcommand(Cmd.Command.c_str()),
-				SerialNumber_, Cmd.Command, Params, Cmd.UUID, Sent, false, false);
-
-			GWWebSocketNotifications::SingleDeviceConfigurationChange_t Notification;
-			Notification.content.serialNumber = D.SerialNumber;
-			Notification.content.oldUUID = UUID;
-			Notification.content.newUUID = UpgradedUUID;
-			GWWebSocketNotifications::DeviceConfigurationChange(Notification);
-
-			return true;
-		}
-		return false;
-	}
-
-}
--- a/src/AP_WS_Process_alarm.cpp
+++ b/src/AP_WS_Process_alarm.cpp
@@ -21,7 +21,11 @@ namespace OpenWifi {

 		if (ParamsObj->has(uCentralProtocol::SERIAL) && ParamsObj->has(uCentralProtocol::DATA)) {
 			if (KafkaManager()->Enabled()) {
-				KafkaManager()->PostMessage(KafkaTopics::ALERTS, SerialNumber_, *ParamsObj);
+				auto Data = ParamsObj->get(uCentralProtocol::DATA);
+				Poco::JSON::Stringifier Stringify;
+				std::ostringstream OS;
+				Stringify.condense(ParamsObj, OS);
+				KafkaManager()->PostMessage(KafkaTopics::ALERTS, SerialNumber_, std::make_shared<std::string>(OS.str()));
 			}
 		}
 	}
--- a/src/AP_WS_Process_connect.cpp
+++ b/src/AP_WS_Process_connect.cpp
@@ -32,7 +32,9 @@ namespace OpenWifi {
 			Event.set("type", "device.firmware_change");
 			Event.set("timestamp", Utils::Now());
 			Event.set("payload", EventDetails);
-			KafkaManager()->PostMessage(KafkaTopics::DEVICE_EVENT_QUEUE, SerialNumber, Event);
+			std::ostringstream OS;
+			Event.stringify(OS);
+			KafkaManager()->PostMessage(KafkaTopics::DEVICE_EVENT_QUEUE, SerialNumber, std::make_shared<std::string>(OS.str()));
 		}
 	}

@@ -49,7 +51,9 @@ namespace OpenWifi {
 			Event.set("type", "device.not_provisioned");
 			Event.set("timestamp", Utils::Now());
 			Event.set("payload", EventDetails);
-			KafkaManager()->PostMessage(KafkaTopics::DEVICE_EVENT_QUEUE, SerialNumber, Event);
+			std::ostringstream OS;
+			Event.stringify(OS);
+			KafkaManager()->PostMessage(KafkaTopics::DEVICE_EVENT_QUEUE, SerialNumber, std::make_shared<std::string>(OS.str()));
 		}
 	}

@@ -71,8 +75,9 @@ namespace OpenWifi {

 			CommandManager()->ClearQueue(SerialNumberInt_);

-			AP_WS_Server()->StartSession(State_.sessionId, SerialNumberInt_);
+			AP_WS_Server()->SetSessionDetails(State_.sessionId, SerialNumberInt_);

+			std::lock_guard Lock(ConnectionMutex_);
 			Config::Capabilities Caps(Capabilities);

 			Compatible_ = Caps.Compatible();
@@ -99,24 +104,36 @@ namespace OpenWifi {
 				Restrictions_.from_json(RestrictionObject);
 			}

-			if (Capabilities->has("developer") && !Capabilities->isNull("developer")) {
+			if (Capabilities->has("developer")) {
 				Restrictions_.developer = Capabilities->getValue<bool>("developer");
 			}

 			if(Capabilities->has("secure-rtty")) {
-				RTTYMustBeSecure_ = Capabilities->getValue<bool>("secure-rtty");
+				RttyMustBeSecure_ = Capabilities->getValue<bool>("secure-rtty");
 			}

 			State_.locale = FindCountryFromIP()->Get(IP);
 			GWObjects::Device DeviceInfo;
-			std::lock_guard DbSessionLock(DbSession_->Mutex());
-
-			auto DeviceExists = StorageService()->GetDevice(DbSession_->Session(), SerialNumber_, DeviceInfo);
+			auto DeviceExists = StorageService()->GetDevice(SerialNumber_, DeviceInfo);
 			if (Daemon()->AutoProvisioning() && !DeviceExists) {
 				//	check the firmware version. if this is too old, we cannot let that device connect yet, we must
 				//	force a firmware upgrade
 				GWObjects::DefaultFirmware	MinimumFirmware;
 				if(FirmwareRevisionCache()->DeviceMustUpgrade(Compatible_, Firmware, MinimumFirmware)) {
+/*
+
+					{    "jsonrpc" : "2.0" ,
+						 "method" : "upgrade" ,
+						 "params" : {
+								"serial" : <serial number> ,
+								"when"  : Optional - <UTC time when to upgrade the firmware, 0 mean immediate, this is a suggestion>,
+								"uri"   : <URI to download the firmware>,
+								"FWsignature" : <string representation of the signature for the FW> (optional)
+						 },
+						 "id" : <some number>
+					}
+
+ */
 					Poco::JSON::Object	UpgradeCommand, Params;
 					UpgradeCommand.set(uCentralProtocol::JSONRPC,uCentralProtocol::JSONRPC_VERSION);
 					UpgradeCommand.set(uCentralProtocol::METHOD,uCentralProtocol::UPGRADE);
@@ -144,7 +161,7 @@ namespace OpenWifi {
 					}
 					return;
 				} else {
-					StorageService()->CreateDefaultDevice( DbSession_->Session(),
+					StorageService()->CreateDefaultDevice(
 						SerialNumber_, Caps, Firmware, PeerAddress_,
 						State_.VerifiedCertificate == GWObjects::SIMULATED);
 				}
@@ -153,7 +170,7 @@ namespace OpenWifi {
 				poco_warning(Logger(),fmt::format("Device {} is a {} from {} and cannot be provisioned.",SerialNumber_,Compatible_, CId_));
 				return EndConnection();
 			} else if (DeviceExists) {
-				StorageService()->UpdateDeviceCapabilities(DbSession_->Session(), SerialNumber_, Caps);
+				StorageService()->UpdateDeviceCapabilities(SerialNumber_, Caps);
 				int Updated{0};
 				if (!Firmware.empty()) {
 					if (Firmware != DeviceInfo.Firmware) {
@@ -173,12 +190,6 @@ namespace OpenWifi {
 					}
 				}

-				if(ParamsObj->has("reason")) {
-					State_.connectReason = ParamsObj->get("reason").toString();
-					DeviceInfo.connectReason = State_.connectReason;
-					++Updated;
-				}
-
 				if(DeviceInfo.DevicePassword!=DevicePassword) {
 					DeviceInfo.DevicePassword = DevicePassword.empty() ? "openwifi" : DevicePassword ;
 					++Updated;
@@ -219,20 +230,13 @@ namespace OpenWifi {
 					++Updated;
 				}

-				if(DeviceInfo.certificateExpiryDate!=State_.certificateExpiryDate) {
-					DeviceInfo.certificateExpiryDate = State_.certificateExpiryDate;
-					++Updated;
-				}
-
 				if (Updated) {
-					StorageService()->UpdateDevice(DbSession_->Session(), DeviceInfo);
+					StorageService()->UpdateDevice(DeviceInfo);
 				}

-				if(!Simulated_) {
-					uint64_t UpgradedUUID = 0;
-					LookForUpgrade(DbSession_->Session(), UUID, UpgradedUUID);
-					State_.UUID = UpgradedUUID;
-				}
+				uint64_t UpgradedUUID = 0;
+				LookForUpgrade(UUID, UpgradedUUID);
+				State_.UUID = UpgradedUUID;
 			}

 			State_.Compatible = Compatible_;
@@ -281,11 +285,15 @@ namespace OpenWifi {
 			GWWebSocketNotifications::DeviceConnected(Notification);

 			if (KafkaManager()->Enabled()) {
+				Poco::JSON::Stringifier Stringify;
+
 				ParamsObj->set(uCentralProtocol::CONNECTIONIP, CId_);
 				ParamsObj->set("locale", State_.locale);
 				ParamsObj->set(uCentralProtocol::TIMESTAMP, Utils::Now());
 				ParamsObj->set(uCentralProtocol::UUID, uuid_);
-				KafkaManager()->PostMessage(KafkaTopics::CONNECTION, SerialNumber_, *ParamsObj);
+				std::ostringstream OS;
+				Stringify.condense(ParamsObj, OS);
+				KafkaManager()->PostMessage(KafkaTopics::CONNECTION, SerialNumber_, std::make_shared<std::string>(OS.str()));
 			}
 		} else {
 			poco_warning(
--- a/src/AP_WS_Process_crashlog.cpp
+++ b/src/AP_WS_Process_crashlog.cpp
@@ -29,7 +29,7 @@ namespace OpenWifi {
 										   .Recorded = Utils::Now(),
 										   .LogType = 1,
 										   .UUID = ParamsObj->get(uCentralProtocol::UUID)};
-			StorageService()->AddLog(*DbSession_, DeviceLog);
+			StorageService()->AddLog(DeviceLog);
 			DeviceLogKafkaEvent	E(DeviceLog);
 		} else {
 			poco_warning(Logger_, fmt::format("LOG({}): Missing parameters.", CId_));
--- a/src/AP_WS_Process_deviceupdate.cpp
+++ b/src/AP_WS_Process_deviceupdate.cpp
@@ -21,7 +21,7 @@ namespace OpenWifi {
 		if (ParamsObj->has("currentPassword")) {
 			auto Password = ParamsObj->get("currentPassword").toString();

-			StorageService()->SetDevicePassword(*DbSession_,Serial, Password);
+			StorageService()->SetDevicePassword(Serial, Password);
 			poco_trace(
 				Logger_,
 				fmt::format("DEVICE-UPDATE({}): Device is updating its login password.", Serial));
--- a/src/AP_WS_Process_event.cpp
+++ b/src/AP_WS_Process_event.cpp
@@ -34,13 +34,11 @@ namespace OpenWifi {
 					FullEvent.set("type", EventType);
 					FullEvent.set("timestamp", EventTimeStamp);
 					FullEvent.set("payload", EventPayload);
-					if(strncmp(EventType.c_str(),"rrm.",4) == 0 ) {
-						KafkaManager()->PostMessage(KafkaTopics::RRM, SerialNumber_,
-													FullEvent);
-					} else {
-						KafkaManager()->PostMessage(KafkaTopics::DEVICE_EVENT_QUEUE, SerialNumber_,
-													FullEvent);
-					}
+
+					std::ostringstream OS;
+					FullEvent.stringify(OS);
+					KafkaManager()->PostMessage(KafkaTopics::DEVICE_EVENT_QUEUE, SerialNumber_,
+												std::make_shared<std::string>(OS.str()));
 				}
 			}
 		} catch (const Poco::Exception &E) {
--- a/src/AP_WS_Process_healthcheck.cpp
+++ b/src/AP_WS_Process_healthcheck.cpp
@@ -3,7 +3,6 @@
 //

 #include "AP_WS_Connection.h"
-#include "AP_WS_Server.h"
 #include "StorageService.h"

 #include "fmt/format.h"
@@ -41,6 +40,10 @@ namespace OpenWifi {
 												CId_, UUID, request_uuid));
 			}

+			uint64_t UpgradedUUID;
+			LookForUpgrade(UUID, UpgradedUUID);
+			State_.UUID = UpgradedUUID;
+
 			GWObjects::HealthCheck Check;

 			Check.SerialNumber = SerialNumber_;
@@ -49,15 +52,19 @@ namespace OpenWifi {
 			Check.Data = CheckData;
 			Check.Sanity = Sanity;

-			StorageService()->AddHealthCheckData(*DbSession_, Check);
+			StorageService()->AddHealthCheckData(Check);

 			if (!request_uuid.empty()) {
 				StorageService()->SetCommandResult(request_uuid, CheckData);
 			}

 			SetLastHealthCheck(Check);
-			if (KafkaManager()->Enabled() && !AP_WS_Server()->KafkaDisableHealthChecks()) {
-				KafkaManager()->PostMessage(KafkaTopics::HEALTHCHECK, SerialNumber_, *ParamsObj);
+			if (KafkaManager()->Enabled()) {
+				Poco::JSON::Stringifier Stringify;
+				std::ostringstream OS;
+				ParamsObj->set("timestamp", Utils::Now());
+				Stringify.condense(ParamsObj, OS);
+				KafkaManager()->PostMessage(KafkaTopics::HEALTHCHECK, SerialNumber_, std::make_shared<std::string>(OS.str()));
 			}
 		} else {
 			poco_warning(Logger_, fmt::format("HEALTHCHECK({}): Missing parameter", CId_));
--- a/src/AP_WS_Process_log.cpp
+++ b/src/AP_WS_Process_log.cpp
@@ -36,7 +36,7 @@ namespace OpenWifi {
 										   .Recorded = (uint64_t)time(nullptr),
 										   .LogType = 0,
 										   .UUID = State_.UUID};
-			StorageService()->AddLog(*DbSession_, DeviceLog);
+			StorageService()->AddLog(DeviceLog);
 			DeviceLogKafkaEvent	E(DeviceLog);
 		} else {
 			poco_warning(Logger_, fmt::format("LOG({}): Missing parameters.", CId_));
--- a/src/AP_WS_Process_rebootLog.cpp
+++ b/src/AP_WS_Process_rebootLog.cpp
@@ -35,7 +35,7 @@ namespace OpenWifi {
 										   .Recorded = ParamsObj->get(uCentralProtocol::DATE),
 										   .LogType = 2,
 										   .UUID = ParamsObj->get(uCentralProtocol::UUID)};
-			StorageService()->AddLog(*DbSession_, DeviceLog);
+			StorageService()->AddLog(DeviceLog);
 			DeviceLogKafkaEvent	E(DeviceLog);
 		} else {
 			poco_warning(Logger_, fmt::format("REBOOT-LOG({}): Missing parameters.", CId_));
--- a/src/AP_WS_Process_recovery.cpp
+++ b/src/AP_WS_Process_recovery.cpp
@@ -35,7 +35,7 @@ namespace OpenWifi {
 										   .LogType = 1,
 										   .UUID = 0};

-			StorageService()->AddLog(*DbSession_, DeviceLog);
+			StorageService()->AddLog(DeviceLog);

 			if (ParamsObj->get(uCentralProtocol::REBOOT).toString() == "true") {
 				GWObjects::CommandDetails Cmd;
--- a/src/AP_WS_Process_state.cpp
+++ b/src/AP_WS_Process_state.cpp
@@ -3,7 +3,6 @@
 //

 #include "AP_WS_Connection.h"
-#include "AP_WS_Server.h"
 #include "StateUtils.h"
 #include "StorageService.h"

@@ -40,19 +39,15 @@ namespace OpenWifi {
 												UUID, request_uuid));
 			}

-			std::lock_guard	Guard(DbSession_->Mutex());
-			if(!Simulated_) {
-				uint64_t UpgradedUUID;
-				LookForUpgrade(DbSession_->Session(), UUID, UpgradedUUID);
-				State_.UUID = UpgradedUUID;
-			}
-
+			uint64_t UpgradedUUID;
+			LookForUpgrade(UUID, UpgradedUUID);
+			State_.UUID = UpgradedUUID;
 			SetLastStats(StateStr);

 			GWObjects::Statistics Stats{
 				.SerialNumber = SerialNumber_, .UUID = UUID, .Data = StateStr};
 			Stats.Recorded = Utils::Now();
-			StorageService()->AddStatisticsData(DbSession_->Session(),Stats);
+			StorageService()->AddStatisticsData(Stats);
 			if (!request_uuid.empty()) {
 				StorageService()->SetCommandResult(request_uuid, StateStr);
 			}
@@ -60,8 +55,11 @@ namespace OpenWifi {
 			StateUtils::ComputeAssociations(StateObj, State_.Associations_2G,
 											State_.Associations_5G, State_.Associations_6G);

-			if (KafkaManager()->Enabled() && !AP_WS_Server()->KafkaDisableState()) {
-				KafkaManager()->PostMessage(KafkaTopics::STATE, SerialNumber_, *ParamsObj);
+			if (KafkaManager()->Enabled()) {
+				Poco::JSON::Stringifier Stringify;
+				std::ostringstream OS;
+				Stringify.condense(ParamsObj, OS);
+				KafkaManager()->PostMessage(KafkaTopics::STATE, SerialNumber_, std::make_shared<std::string>(OS.str()));
 			}

 			GWWebSocketNotifications::SingleDevice_t N;
--- a/src/AP_WS_Process_telemetry.cpp
+++ b/src/AP_WS_Process_telemetry.cpp
@@ -27,7 +27,7 @@ namespace OpenWifi {
 				std::ostringstream SS;
 				Payload->stringify(SS);
 				auto now = Utils::Now();
-				auto KafkaPayload = SS.str();
+				auto KafkaPayload = std::make_shared<std::string>(SS.str());
 				if (ParamsObj->has("adhoc")) {
 					KafkaManager()->PostMessage(KafkaTopics::DEVICE_TELEMETRY, SerialNumber_,
 												KafkaPayload);
@@ -35,16 +35,18 @@ namespace OpenWifi {
 				}
 				if (TelemetryWebSocketRefCount_) {
 					if (now < TelemetryWebSocketTimer_) {
-
+						// std::cout << SerialNumber_ << ": Updating WebSocket telemetry" <<
+						// std::endl;
 						TelemetryWebSocketPackets_++;
 						State_.websocketPackets = TelemetryWebSocketPackets_;
-						TelemetryStream()->NotifyEndPoint(SerialNumberInt_, KafkaPayload);
+						TelemetryStream()->NotifyEndPoint(SerialNumberInt_, *KafkaPayload);
 					} else {
 						StopWebSocketTelemetry(CommandManager()->Next_RPC_ID());
 					}
 				}
 				if (TelemetryKafkaRefCount_) {
 					if (KafkaManager()->Enabled() && now < TelemetryKafkaTimer_) {
+						// std::cout << SerialNumber_ << ": Updating Kafka telemetry" << std::endl;
 						TelemetryKafkaPackets_++;
 						State_.kafkaPackets = TelemetryKafkaPackets_;
 						KafkaManager()->PostMessage(KafkaTopics::DEVICE_TELEMETRY, SerialNumber_,
--- a/src/AP_WS_Process_wifiscan.cpp
+++ b/src/AP_WS_Process_wifiscan.cpp
@@ -21,7 +21,11 @@ namespace OpenWifi {

 		if (ParamsObj->has(uCentralProtocol::SERIAL) && ParamsObj->has(uCentralProtocol::DATA)) {
 			if (KafkaManager()->Enabled()) {
-				KafkaManager()->PostMessage(KafkaTopics::WIFISCAN, SerialNumber_, *ParamsObj);
+				auto Data = ParamsObj->get(uCentralProtocol::DATA);
+				Poco::JSON::Stringifier Stringify;
+				std::ostringstream OS;
+				Stringify.condense(ParamsObj, OS);
+				KafkaManager()->PostMessage(KafkaTopics::WIFISCAN, SerialNumber_, std::make_shared<std::string>(OS.str()));
 			}
 		}
 	}
--- a/src/AP_WS_ReactorPool.h
+++ b/src/AP_WS_ReactorPool.h
@@ -0,0 +1,62 @@
+//
+// Created by stephane bourque on 2022-02-03.
+//
+
+#pragma once
+
+#include <shared_mutex>
+#include <string>
+
+#include "Poco/Environment.h"
+#include "Poco/Net/SocketAcceptor.h"
+
+#include "framework/utils.h"
+
+namespace OpenWifi {
+	class AP_WS_ReactorThreadPool {
+	  public:
+		explicit AP_WS_ReactorThreadPool() {
+			NumberOfThreads_ = Poco::Environment::processorCount() * 2;
+			if (NumberOfThreads_ == 0)
+				NumberOfThreads_ = 4;
+		}
+
+		~AP_WS_ReactorThreadPool() { Stop(); }
+
+		void Start() {
+			for (uint64_t i = 0; i < NumberOfThreads_; ++i) {
+				auto NewReactor = std::make_unique<Poco::Net::SocketReactor>();
+				auto NewThread = std::make_unique<Poco::Thread>();
+				NewThread->start(*NewReactor);
+				std::string ThreadName{"ap:react:" + std::to_string(i)};
+				Utils::SetThreadName(*NewThread, ThreadName.c_str());
+				Reactors_.emplace_back(std::move(NewReactor));
+				Threads_.emplace_back(std::move(NewThread));
+			}
+		}
+
+		void Stop() {
+			for (auto &i : Reactors_)
+				i->stop();
+			for (auto &i : Threads_) {
+				i->join();
+			}
+			Reactors_.clear();
+			Threads_.clear();
+		}
+
+		Poco::Net::SocketReactor &NextReactor() {
+			std::shared_lock Lock(Mutex_);
+			NextReactor_++;
+			NextReactor_ %= NumberOfThreads_;
+			return *Reactors_[NextReactor_];
+		}
+
+	  private:
+		std::shared_mutex Mutex_;
+		uint64_t NumberOfThreads_;
+		uint64_t NextReactor_ = 0;
+		std::vector<std::unique_ptr<Poco::Net::SocketReactor>> Reactors_;
+		std::vector<std::unique_ptr<Poco::Thread>> Threads_;
+	};
+} // namespace OpenWifi
--- a/src/AP_WS_Reactor_Pool.h
+++ b/src/AP_WS_Reactor_Pool.h
@@ -1,75 +0,0 @@
-//
-// Created by stephane bourque on 2022-02-03.
-//
-
-#pragma once
-
-#include <mutex>
-#include <string>
-
-#include "Poco/Environment.h"
-#include "Poco/Net/SocketAcceptor.h"
-#include <Poco/Data/SessionPool.h>
-#include "framework/utils.h"
-#include <StorageService.h>
-
-namespace OpenWifi {
-
-	class AP_WS_ReactorThreadPool {
-	  public:
-		explicit AP_WS_ReactorThreadPool(Poco::Logger &Logger) : Logger_(Logger) {
-			NumberOfThreads_ = Poco::Environment::processorCount() * 4;
-			if (NumberOfThreads_ == 0)
-				NumberOfThreads_ = 8;
-			NumberOfThreads_ = std::min(NumberOfThreads_, (std::uint64_t) 128);
-		}
-
-		~AP_WS_ReactorThreadPool() { Stop(); }
-
-		void Start() {
-			Reactors_.reserve(NumberOfThreads_);
-			DbSessions_.reserve(NumberOfThreads_);
-			Threads_.reserve(NumberOfThreads_);
-			Logger_.information(fmt::format("WebSocket Processor: starting {} threads.", NumberOfThreads_));
-			for (uint64_t i = 0; i < NumberOfThreads_; ++i) {
-				auto NewReactor = std::make_shared<Poco::Net::SocketReactor>();
-				auto NewThread = std::make_unique<Poco::Thread>();
-				NewThread->start(*NewReactor);
-				std::string ThreadName{"ap:react:" + std::to_string(i)};
-				Utils::SetThreadName(*NewThread, ThreadName.c_str());
-				Reactors_.emplace_back(std::move(NewReactor));
-				Threads_.emplace_back(std::move(NewThread));
-				DbSessions_.emplace_back(std::make_shared<LockedDbSession>());
-			}
-			Logger_.information(fmt::format("WebSocket Processor: {} threads started.", NumberOfThreads_));
-		}
-
-		void Stop() {
-			for (auto &i : Reactors_)
-				i->stop();
-			for (auto &i : Threads_) {
-				i->join();
-			}
-			Reactors_.clear();
-			Threads_.clear();
-			DbSessions_.clear();
-		}
-
-		std::pair<std::shared_ptr<Poco::Net::SocketReactor>, std::shared_ptr<LockedDbSession> > NextReactor() {
-			std::lock_guard Lock(Mutex_);
-			NextReactor_++;
-			NextReactor_ %= NumberOfThreads_;
-			return std::make_pair(Reactors_[NextReactor_], DbSessions_[NextReactor_]);
-		}
-
-	  private:
-		std::mutex Mutex_;
-		uint64_t NumberOfThreads_;
-		uint64_t NextReactor_ = 0;
-		std::vector<std::shared_ptr<Poco::Net::SocketReactor>> 	Reactors_;
-		std::vector<std::unique_ptr<Poco::Thread>> 				Threads_;
-		std::vector<std::shared_ptr<LockedDbSession>>			DbSessions_;
-		Poco::Logger &Logger_;
-
-	};
-} // namespace OpenWifi
--- a/src/AP_WS_Server.cpp
+++ b/src/AP_WS_Server.cpp
@@ -23,47 +23,15 @@

 namespace OpenWifi {

-	class AP_WS_RequestHandler : public Poco::Net::HTTPRequestHandler {
-	  public:
-		explicit AP_WS_RequestHandler(Poco::Logger &L, std::uint64_t session_id) : Logger_(L),
-								   		session_id_(session_id) {
-		 };
-
-		void handleRequest(	Poco::Net::HTTPServerRequest &request,
-						 	Poco::Net::HTTPServerResponse &response) override {
-			try {
-				auto NewConnection = std::make_shared<AP_WS_Connection>(request, response, session_id_, Logger_,
-																		AP_WS_Server()->NextReactor());
-				AP_WS_Server()->AddConnection(NewConnection);
-				NewConnection->Start();
-			} catch (...) {
-				poco_warning(Logger_, "Exception during WS creation");
-			}
-		};
-
-	  private:
-		Poco::Logger &Logger_;
-		std::uint64_t session_id_;
-	};
-
-	class AP_WS_RequestHandlerFactory : public Poco::Net::HTTPRequestHandlerFactory {
-	  public:
-		inline explicit AP_WS_RequestHandlerFactory(Poco::Logger &L) : Logger_(L) {}
-
-		inline Poco::Net::HTTPRequestHandler *
-		createRequestHandler(const Poco::Net::HTTPServerRequest &request) override {
-			if (request.find("Upgrade") != request.end() &&
-				Poco::icompare(request["Upgrade"], "websocket") == 0) {
-				Utils::SetThreadName("ws:conn-init");
-				session_id_++;
-				return new AP_WS_RequestHandler(Logger_, session_id_);
-			} else {
-				return nullptr;
-			}
+	void AP_WS_RequestHandler::handleRequest(Poco::Net::HTTPServerRequest &request,
+											 Poco::Net::HTTPServerResponse &response) {
+		try {
+			AP_WS_Server()->AddConnection(
+				id_, std::make_shared<AP_WS_Connection>(request, response, id_, Logger_,
+														AP_WS_Server()->NextReactor()));
+		} catch (...) {
+			poco_warning(Logger_, "Exception during WS creation");
 		}
-	  private:
-		Poco::Logger &Logger_;
-		inline static std::atomic_uint64_t session_id_ = 0;
 	};

 	bool AP_WS_Server::ValidateCertificate(const std::string &ConnectionId,
@@ -89,7 +57,7 @@ namespace OpenWifi {

 		SessionTimeOut_ = MicroServiceConfigGetInt("openwifi.session.timeout", 10*60);

-		Reactor_pool_ = std::make_unique<AP_WS_ReactorThreadPool>(Logger());
+		Reactor_pool_ = std::make_unique<AP_WS_ReactorThreadPool>();
 		Reactor_pool_->Start();

 		for (const auto &Svr : ConfigServersList_) {
@@ -139,6 +107,7 @@ namespace OpenWifi {
 			Context->flushSessionCache();
 			Context->enableSessionCache(true);
 			Context->enableExtendedCertificateVerification(false);
+			// Context->disableStatelessSessionResumption();
 			Context->disableProtocols(Poco::Net::Context::PROTO_TLSV1 |
 									  Poco::Net::Context::PROTO_TLSV1_1);

@@ -167,9 +136,6 @@ namespace OpenWifi {
 					WebServerHttpParams);
 				WebServers_.push_back(std::move(NewWebServer));
 			}
-
-			KafkaDisableState_ = MicroServiceConfigGetBool("openwifi.kafka.disablestate", false);
-			KafkaDisableHealthChecks_ = MicroServiceConfigGetBool("openwifi.kafka.disablehealthchecks", false);
 		}

 		for (auto &server : WebServers_) {
@@ -191,345 +157,252 @@ namespace OpenWifi {
 			UseDefaultConfig_ = true;
 		}

-		SimulatorId_ = Poco::toLower(MicroServiceConfigGetString("simulatorid", ""));
+		SimulatorId_ = MicroServiceConfigGetString("simulatorid", "");
 		SimulatorEnabled_ = !SimulatorId_.empty();
 		Utils::SetThreadName(ReactorThread_, "dev:react:head");

+		GarbageCollectorCallback_ = std::make_unique<Poco::TimerCallback<AP_WS_Server>>(
+			*this, &AP_WS_Server::onGarbageCollecting);
+		Timer_.setStartInterval(10 * 1000);
+		Timer_.setPeriodicInterval(10 * 1000); // every minute
+		Timer_.start(*GarbageCollectorCallback_, MicroServiceTimerPool());
+
 		Running_ = true;
-		GarbageCollector_.setName("ws:garbage");
-		GarbageCollector_.start(*this);
 		return 0;
 	}

-	void AP_WS_Server::run() {
-		uint64_t last_log = Utils::Now(),
-				 last_zombie_run = 0,
-				 last_garbage_run = 0;
+	void AP_WS_Server::onGarbageCollecting([[maybe_unused]] Poco::Timer &timer) {
+		static uint64_t last_log = Utils::Now();
+		auto now = Utils::Now();

-		Poco::Logger &LocalLogger = Poco::Logger::create(
-			"WS-Session-Janitor", Poco::Logger::root().getChannel(), Poco::Logger::root().getLevel());
-
-		while(Running_) {
-
-			if(!Poco::Thread::trySleep(30000)) {
-				break;
+		{
+			std::lock_guard Lock(WSServerMutex_);
+			if (!Garbage_.empty()) {
+				Garbage_.clear();
 			}

-			LocalLogger.information(fmt::format("Garbage collecting starting run."	));
+			NumberOfConnectedDevices_ = 0;
+			NumberOfConnectingDevices_ = 0;
+			AverageDeviceConnectionTime_ = 0;
+			uint64_t total_connected_time = 0;

-			uint64_t total_connected_time = 0, now = Utils::Now();
-
-			if(now-last_zombie_run > 60) {
-				try {
-					poco_information(LocalLogger,
-									 fmt::format("Garbage collecting zombies... (step 1)"));
-					NumberOfConnectedDevices_ = 0;
-					NumberOfConnectingDevices_ = 0;
-					AverageDeviceConnectionTime_ = 0;
-					int waits = 0;
-					for (int hashIndex = 0; hashIndex < MACHash::HashMax(); hashIndex++) {
-						last_zombie_run = now;
-						waits = 0;
-						while (true) {
-							if (SerialNumbersMutex_[hashIndex].try_lock()) {
-								waits = 0;
-								auto hint = SerialNumbers_[hashIndex].begin();
-								while (hint != end(SerialNumbers_[hashIndex])) {
-
-									if (hint->second == nullptr) {
-										poco_information(
-											LocalLogger,
-											fmt::format("Dead device found in hash index {}", hashIndex));
-										// hint = SerialNumbers_[hashIndex].erase(hint);
-										hint++;
-										continue;
-									}
-									auto Device = hint->second;
-									if(Device->ConnectionMutex_.try_lock()) {
-										auto RightNow = Utils::Now();
-										if (RightNow > Device->LastContact_ &&
-											(RightNow - Device->LastContact_) > SessionTimeOut_) {
-											poco_information(
-												LocalLogger,
-												fmt::format("{}: Session seems idle. Controller disconnecting device.",
-															Device->SerialNumber_));
-											hint = SerialNumbers_[hashIndex].erase(hint);
-										} else if (Device->State_.Connected) {
-											NumberOfConnectedDevices_++;
-											total_connected_time +=
-												(RightNow - Device->State_.started);
-											++hint;
-										} else {
-											++hint;
-										}
-										Device->ConnectionMutex_.unlock();
-										continue;
-									} else {
-										poco_warning(LocalLogger, fmt::format("Could not lock device mutex for {}",
-																			   Device->SerialNumber_));
-									}
-									++NumberOfConnectingDevices_;
-									++hint;
-								}
-								SerialNumbersMutex_[hashIndex].unlock();
-								break;
-							} else if (waits < 5) {
-								waits++;
-								std::this_thread::sleep_for(std::chrono::milliseconds(10));
-							} else {
-								break;
-							}
-						}
-					}
-
-					poco_information(LocalLogger,
-									 fmt::format("Garbage collecting zombies... (step 2)"));
-					LeftOverSessions_ = 0;
-					for (int i = 0; i < SessionHash::HashMax(); i++) {
-						waits = 0;
-						while (true) {
-							if (SessionMutex_[i].try_lock()) {
-								waits = 0;
-								auto hint = Sessions_[i].begin();
-								auto RightNow = Utils::Now();
-								while (hint != end(Sessions_[i])) {
-									if (hint->second == nullptr) {
-										hint = Sessions_[i].erase(hint);
-									} else if (RightNow > hint->second->LastContact_ &&
-											   (RightNow - hint->second->LastContact_) >
-												   SessionTimeOut_) {
-										poco_information(
-											LocalLogger,
-											fmt::format("{}: Session seems idle. Controller disconnecting device.",
-														hint->second->SerialNumber_));
-										hint = Sessions_[i].erase(hint);
-									} else {
-										++LeftOverSessions_;
-										++hint;
-									}
-								}
-								SessionMutex_[i].unlock();
-								break;
-							} else if (waits < 5) {
-								std::this_thread::sleep_for(std::chrono::milliseconds(10));
-								waits++;
-							} else {
-								break;
-							}
-						}
-					}
-
-					AverageDeviceConnectionTime_ =
-						NumberOfConnectedDevices_ > 0
-							? total_connected_time / NumberOfConnectedDevices_
-							: 0;
-					poco_information(LocalLogger, fmt::format("Garbage collecting zombies done..."));
-				} catch (const Poco::Exception &E) {
-					poco_error(LocalLogger, fmt::format("Poco::Exception: Garbage collecting zombies failed: {}", E.displayText()));
-				} catch (const std::exception &E) {
-					poco_error(LocalLogger, fmt::format("std::exception: Garbage collecting zombies failed: {}", E.what()));
-				} catch (...) {
-					poco_error(LocalLogger, fmt::format("exception:Garbage collecting zombies failed: {}", "unknown"));
-				}
-
-			} else {
-				NumberOfConnectedDevices_=0;
-				for(int i=0;i<MACHash::HashMax();i++) {
-					std::lock_guard Lock(SerialNumbersMutex_[i]);
-					NumberOfConnectedDevices_ += SerialNumbers_[i].size();
-				}
-				if(NumberOfConnectedDevices_) {
-					if (last_garbage_run > 0) {
-						AverageDeviceConnectionTime_ += (now - last_garbage_run);
-					}
+			auto hint = SerialNumbers_.begin();
+			while (hint != end(SerialNumbers_)) {
+				if (hint->second.second == nullptr) {
+					hint = SerialNumbers_.erase(hint);
+				} else if ((now - hint->second.second->State_.LastContact) > SessionTimeOut_) {
+					hint->second.second->EndConnection(false);
+					poco_information(Logger(),fmt::format("{}: Session seems idle. Controller disconnecting device.", hint->second.second->SerialNumber_));
+					Sessions_.erase(hint->second.second->State_.sessionId);
+					Garbage_.push_back(hint->second.second);
+					hint = SerialNumbers_.erase(hint);
+				} else if (hint->second.second->State_.Connected) {
+					NumberOfConnectedDevices_++;
+					total_connected_time += (now - hint->second.second->State_.started);
+					hint++;
 				} else {
-					AverageDeviceConnectionTime_ = 0;
+					NumberOfConnectingDevices_++;
+					hint++;
 				}
 			}

-			if ((now - last_log) > 60) {
+			AverageDeviceConnectionTime_ = NumberOfConnectedDevices_ > 0
+											   ? total_connected_time / NumberOfConnectedDevices_
+											   : 0;
+			if ((now - last_log) > 120) {
 				last_log = now;
-				poco_information(LocalLogger,
-								 fmt::format("Active AP connections: {} Connecting: {} Average connection time: {} seconds. Left Over Sessions: {}",
+				poco_information(Logger(),
+								 fmt::format("Active AP connections: {} Connecting: {} Average connection time: {} seconds",
 											 NumberOfConnectedDevices_, NumberOfConnectingDevices_,
-											 AverageDeviceConnectionTime_, LeftOverSessions_));
+											 AverageDeviceConnectionTime_));
 			}
-
-			GWWebSocketNotifications::NumberOfConnection_t Notification;
-			Notification.content.numberOfConnectingDevices = NumberOfConnectingDevices_;
-			Notification.content.numberOfDevices = NumberOfConnectedDevices_;
-			Notification.content.averageConnectedTime = AverageDeviceConnectionTime_;
-			GetTotalDataStatistics(Notification.content.tx,Notification.content.rx);
-			GWWebSocketNotifications::NumberOfConnections(Notification);
-
-			Poco::JSON::Object	KafkaNotification;
-			Notification.to_json(KafkaNotification);
-
-			Poco::JSON::Object FullEvent;
-			FullEvent.set("type", "load-update");
-			FullEvent.set("timestamp", now);
-			FullEvent.set("payload", KafkaNotification);
-
-			KafkaManager()->PostMessage(KafkaTopics::DEVICE_EVENT_QUEUE, "system", FullEvent);
-			LocalLogger.information(fmt::format("Garbage collection finished run."	));
-			last_garbage_run = now;
 		}
-		LocalLogger.information(fmt::format("Garbage collector done for the day."	));
+
+		GWWebSocketNotifications::NumberOfConnection_t Notification;
+		Notification.content.numberOfConnectingDevices = NumberOfConnectingDevices_;
+		Notification.content.numberOfDevices = NumberOfConnectedDevices_;
+		Notification.content.averageConnectedTime = AverageDeviceConnectionTime_;
+		GetTotalDataStatistics(Notification.content.tx,Notification.content.rx);
+		GWWebSocketNotifications::NumberOfConnections(Notification);
+
+		Poco::JSON::Object	KafkaNotification;
+		Notification.to_json(KafkaNotification);
+
+		Poco::JSON::Object FullEvent;
+		FullEvent.set("type", "load-update");
+		FullEvent.set("timestamp", now);
+		FullEvent.set("payload", KafkaNotification);
+
+		std::ostringstream OS;
+		FullEvent.stringify(OS);
+		KafkaManager()->PostMessage(KafkaTopics::DEVICE_EVENT_QUEUE, "system",
+									std::make_shared<std::string>(OS.str()));
 	}

 	void AP_WS_Server::Stop() {
 		poco_information(Logger(), "Stopping...");
 		Running_ = false;

-		GarbageCollector_.wakeUp();
-		GarbageCollector_.join();
+		Timer_.stop();

 		for (auto &server : WebServers_) {
 			server->stopAll();
 		}
-
 		Reactor_pool_->Stop();
 		Reactor_.stop();
 		ReactorThread_.join();
 		poco_information(Logger(), "Stopped...");
 	}

-	bool AP_WS_Server::GetHealthDevices(std::uint64_t lowLimit, std::uint64_t  highLimit, std::vector<std::string> & SerialNumbers) {
-		SerialNumbers.clear();
-		for(int i=0;i<SessionHash::HashMax();i++) {
-			std::lock_guard Lock(SessionMutex_[i]);
-			for (const auto &connection : Sessions_[i]) {
-				if (connection.second->RawLastHealthcheck_.Sanity >= lowLimit &&
-					connection.second->RawLastHealthcheck_.Sanity <= highLimit) {
-					SerialNumbers.push_back(connection.second->SerialNumber_);
-				}
-			}
-		}
-		return true;
-	}
-
 	bool AP_WS_Server::GetStatistics(uint64_t SerialNumber, std::string &Statistics) const {
-
-		auto hashIndex = MACHash::Hash(SerialNumber);
-		std::lock_guard Lock(SerialNumbersMutex_[hashIndex]);
-		auto Device = SerialNumbers_[hashIndex].find(SerialNumber);
-		if (Device == SerialNumbers_[hashIndex].end() || Device->second == nullptr) {
-			return false;
+		std::shared_ptr<AP_WS_Connection> DevicePtr;
+		{
+			std::lock_guard Lock(WSServerMutex_);
+			auto Device = SerialNumbers_.find(SerialNumber);
+			if (Device == SerialNumbers_.end() || Device->second.second == nullptr) {
+				return false;
+			}
+			DevicePtr = Device->second.second;
 		}
-		Device->second->GetLastStats(Statistics);
-
+		DevicePtr->GetLastStats(Statistics);
 		return true;
 	}

 	bool AP_WS_Server::GetState(uint64_t SerialNumber, GWObjects::ConnectionState &State) const {
-		std::shared_ptr<AP_WS_Connection> Connection;
+		std::shared_ptr<AP_WS_Connection> DevicePtr;
 		{
-			auto hashIndex = MACHash::Hash(SerialNumber);
-			std::lock_guard DeviceLock(SerialNumbersMutex_[hashIndex]);
-			auto DeviceHint = SerialNumbers_[hashIndex].find(SerialNumber);
-			if (DeviceHint == SerialNumbers_[hashIndex].end() ||
-				DeviceHint->second == nullptr) {
+			std::lock_guard Lock(WSServerMutex_);
+			auto Device = SerialNumbers_.find(SerialNumber);
+			if (Device == SerialNumbers_.end() || Device->second.second == nullptr) {
 				return false;
 			}
-			Connection = DeviceHint->second;
+			DevicePtr = Device->second.second;
 		}
-		Connection->GetState(State);
+		DevicePtr->GetState(State);
 		return true;
 	}

 	bool AP_WS_Server::GetHealthcheck(uint64_t SerialNumber,
 									  GWObjects::HealthCheck &CheckData) const {
-
-		auto hashIndex = MACHash::Hash(SerialNumber);
-		std::lock_guard Lock(SerialNumbersMutex_[hashIndex]);
-		auto Device = SerialNumbers_[hashIndex].find(SerialNumber);
-		if (Device == SerialNumbers_[hashIndex].end() || Device->second == nullptr) {
-			return false;
-		}
-		Device->second->GetLastHealthCheck(CheckData);
-		return true;
-
-	}
-
-	void AP_WS_Server::StartSession(uint64_t session_id, uint64_t SerialNumber) {
-		auto deviceHash = MACHash::Hash(SerialNumber);
-		auto sessionHash = SessionHash::Hash(session_id);
-		std::lock_guard SessionLock(SessionMutex_[sessionHash]);
-		auto SessionHint = Sessions_[sessionHash].find(session_id);
-		if (SessionHint != end(Sessions_[sessionHash])) {
-			std::lock_guard Lock(SerialNumbersMutex_[deviceHash]);
-			SerialNumbers_[deviceHash][SerialNumber] = SessionHint->second;
-			Sessions_[sessionHash].erase(SessionHint);
-		} else {
-			poco_error(Logger(), fmt::format("StartSession: Could not find session '{}'", session_id));
-		}
-	}
-
-	bool AP_WS_Server::EndSession(uint64_t session_id, uint64_t SerialNumber) {
+		std::shared_ptr<AP_WS_Connection> DevicePtr;
 		{
-			auto sessionHash = SessionHash::Hash(session_id);
-			std::lock_guard SessionLock(SessionMutex_[sessionHash]);
-			Sessions_[sessionHash].erase(session_id);
-		}
-
-		{
-			auto hashIndex = MACHash::Hash(SerialNumber);
-			std::lock_guard DeviceLock(SerialNumbersMutex_[hashIndex]);
-			auto DeviceHint = SerialNumbers_[hashIndex].find(SerialNumber);
-			if (DeviceHint == SerialNumbers_[hashIndex].end()
-				|| DeviceHint->second == nullptr
-				|| DeviceHint->second->State_.sessionId != session_id) {
+			std::lock_guard Lock(WSServerMutex_);
+			auto Device = SerialNumbers_.find(SerialNumber);
+			if (Device == SerialNumbers_.end() || Device->second.second == nullptr) {
 				return false;
 			}
-			SerialNumbers_[hashIndex].erase(DeviceHint);
+			DevicePtr = Device->second.second;
 		}
+		DevicePtr->GetLastHealthCheck(CheckData);
 		return true;
 	}

+	void AP_WS_Server::SetSessionDetails(uint64_t connection_id, uint64_t SerialNumber) {
+		std::lock_guard Lock(WSServerMutex_);
+
+		auto Conn = Sessions_.find(connection_id);
+		if (Conn == end(Sessions_))
+			return;
+
+		auto CurrentSerialNumber = SerialNumbers_.find(SerialNumber);
+		if ((CurrentSerialNumber == SerialNumbers_.end()) ||
+			(CurrentSerialNumber->second.first < connection_id)) {
+			SerialNumbers_[SerialNumber] = std::make_pair(connection_id, Conn->second);
+			return;
+		}
+	}
+
+	bool AP_WS_Server::EndSession(uint64_t session_id, uint64_t serial_number) {
+		std::lock_guard G(WSServerMutex_);
+
+		auto Session = Sessions_.find(session_id);
+		if (Session == end(Sessions_))
+			return false;
+
+		Garbage_.push_back(Session->second);
+
+		auto Device = SerialNumbers_.find(serial_number);
+		if (Device == end(SerialNumbers_)) {
+			Sessions_.erase(Session);
+			return false;
+		}
+
+		if (Device->second.first == session_id) {
+			Sessions_.erase(Session);
+			SerialNumbers_.erase(Device);
+			return true;
+		}
+
+		Sessions_.erase(Session);
+
+		return false;
+	}
+
+	bool AP_WS_Server::EndSessionUnSafe(uint64_t session_id, uint64_t serial_number) {
+
+		auto Session = Sessions_.find(session_id);
+		if (Session == end(Sessions_))
+			return false;
+
+		Garbage_.push_back(Session->second);
+
+		auto Device = SerialNumbers_.find(serial_number);
+		if (Device == end(SerialNumbers_)) {
+			Sessions_.erase(Session);
+			return false;
+		}
+
+		if (Device->second.first == session_id) {
+			Sessions_.erase(Session);
+			SerialNumbers_.erase(Device);
+			return true;
+		}
+
+		Sessions_.erase(Session);
+
+		return false;
+	}

 	bool AP_WS_Server::Connected(uint64_t SerialNumber,
 								 GWObjects::DeviceRestrictions &Restrictions) const {
-		auto hashIndex = MACHash::Hash(SerialNumber);
-		std::lock_guard DeviceLock(SerialNumbersMutex_[hashIndex]);
-		auto DeviceHint = SerialNumbers_[hashIndex].find(SerialNumber);
-		if (DeviceHint == end(SerialNumbers_[hashIndex]) || DeviceHint->second == nullptr) {
-			return false;
+		std::shared_ptr<AP_WS_Connection> DevicePtr;
+		{
+			std::lock_guard Lock(WSServerMutex_);
+			auto Device = SerialNumbers_.find(SerialNumber);
+			if (Device == end(SerialNumbers_) || Device->second.second == nullptr) {
+				return false;
+			}
+			DevicePtr = Device->second.second;
 		}
-		if(!DeviceHint->second->Dead_) {
-			DeviceHint->second->GetRestrictions(Restrictions);
-			return DeviceHint->second->State_.Connected;
-		}
-		return false;
+		DevicePtr->GetRestrictions(Restrictions);
+		return DevicePtr->State_.Connected;
 	}

-
 	bool AP_WS_Server::Connected(uint64_t SerialNumber) const {
-		auto hashIndex = MACHash::Hash(SerialNumber);
-		std::lock_guard Lock(SerialNumbersMutex_[hashIndex]);
-		auto DeviceHint = SerialNumbers_[hashIndex].find(SerialNumber);
-		if (DeviceHint == end(SerialNumbers_[hashIndex]) || DeviceHint->second == nullptr) {
-			return false;
+		std::shared_ptr<AP_WS_Connection> DevicePtr;
+		{
+			std::lock_guard Lock(WSServerMutex_);
+			auto Device = SerialNumbers_.find(SerialNumber);
+			if (Device == end(SerialNumbers_) || Device->second.second == nullptr) {
+				return false;
+			}
+			DevicePtr = Device->second.second;
 		}
-		if(!DeviceHint->second->Dead_) {
-			return DeviceHint->second->State_.Connected;
-		}
-		return false;
+		return DevicePtr->State_.Connected;
 	}

 	bool AP_WS_Server::SendFrame(uint64_t SerialNumber, const std::string &Payload) const {
-		auto hashIndex = MACHash::Hash(SerialNumber);
-		std::lock_guard Lock(SerialNumbersMutex_[hashIndex]);
-		auto DeviceHint = SerialNumbers_[hashIndex].find(SerialNumber);
-		if (DeviceHint == end(SerialNumbers_[hashIndex]) || DeviceHint->second == nullptr) {
-			return false;
+		std::shared_ptr<AP_WS_Connection> DevicePtr;
+		{
+			std::lock_guard Lock(WSServerMutex_);
+			auto Device = SerialNumbers_.find(SerialNumber);
+			if (Device == SerialNumbers_.end() || Device->second.second == nullptr) {
+				return false;
+			}
+			DevicePtr = Device->second.second;
 		}
-
-		if(DeviceHint->second->Dead_) {
-			return false;
-		}
-
 		try {
-			return DeviceHint->second->Send(Payload);
+			return DevicePtr->Send(Payload);
 		} catch (...) {
 			poco_debug(Logger(), fmt::format(": SendFrame: Could not send data to device '{}'",
 											 Utils::IntToSerialNumber(SerialNumber)));
@@ -538,48 +411,61 @@ namespace OpenWifi {
 	}

 	void AP_WS_Server::StopWebSocketTelemetry(uint64_t RPCID, uint64_t SerialNumber) {
-		auto hashIndex = MACHash::Hash(SerialNumber);
-		std::lock_guard Lock(SerialNumbersMutex_[hashIndex]);
-		auto Device = SerialNumbers_[hashIndex].find(SerialNumber);
-		if (Device == end(SerialNumbers_[hashIndex]) || Device->second == nullptr) {
-			return;
+		std::shared_ptr<AP_WS_Connection> DevicePtr;
+		{
+			std::lock_guard Lock(WSServerMutex_);
+
+			auto Device = SerialNumbers_.find(SerialNumber);
+			if (Device == end(SerialNumbers_) || Device->second.second == nullptr) {
+				return;
+			}
+			DevicePtr = Device->second.second;
 		}
-		Device->second->StopWebSocketTelemetry(RPCID);
+		DevicePtr->StopWebSocketTelemetry(RPCID);
 	}

 	void
 	AP_WS_Server::SetWebSocketTelemetryReporting(uint64_t RPCID, uint64_t SerialNumber,
 												 uint64_t Interval, uint64_t Lifetime,
 												 const std::vector<std::string> &TelemetryTypes) {
-		auto hashIndex = MACHash::Hash(SerialNumber);
-		std::lock_guard DeviceLock(SerialNumbersMutex_[hashIndex]);
-		auto DeviceHint = SerialNumbers_[hashIndex].find(SerialNumber);
-		if (DeviceHint == end(SerialNumbers_[hashIndex]) || DeviceHint->second == nullptr) {
-			return;
+		std::shared_ptr<AP_WS_Connection> DevicePtr;
+		{
+			std::lock_guard Lock(WSServerMutex_);
+			auto Device = SerialNumbers_.find(SerialNumber);
+			if (Device == end(SerialNumbers_) || Device->second.second == nullptr) {
+				return;
+			}
+			DevicePtr = Device->second.second;
 		}
-		DeviceHint->second->SetWebSocketTelemetryReporting(RPCID, Interval, Lifetime, TelemetryTypes);
+		DevicePtr->SetWebSocketTelemetryReporting(RPCID, Interval, Lifetime, TelemetryTypes);
 	}

 	void AP_WS_Server::SetKafkaTelemetryReporting(uint64_t RPCID, uint64_t SerialNumber,
 												  uint64_t Interval, uint64_t Lifetime,
 												  const std::vector<std::string> &TelemetryTypes) {
-		auto hashIndex = MACHash::Hash(SerialNumber);
-		std::lock_guard Lock(SerialNumbersMutex_[hashIndex]);
-		auto DeviceHint = SerialNumbers_[hashIndex].find(SerialNumber);
-		if (DeviceHint == end(SerialNumbers_[hashIndex]) || DeviceHint->second == nullptr) {
-			return;
+		std::shared_ptr<AP_WS_Connection> DevicePtr;
+		{
+			std::lock_guard Lock(WSServerMutex_);
+			auto Device = SerialNumbers_.find(SerialNumber);
+			if (Device == end(SerialNumbers_) || Device->second.second == nullptr) {
+				return;
+			}
+			DevicePtr = Device->second.second;
 		}
-		DeviceHint->second->SetKafkaTelemetryReporting(RPCID, Interval, Lifetime, TelemetryTypes);
+		DevicePtr->SetKafkaTelemetryReporting(RPCID, Interval, Lifetime, TelemetryTypes);
 	}

 	void AP_WS_Server::StopKafkaTelemetry(uint64_t RPCID, uint64_t SerialNumber) {
-		auto hashIndex = MACHash::Hash(SerialNumber);
-		std::lock_guard DevicesLock(SerialNumbersMutex_[hashIndex]);
-		auto DeviceHint = SerialNumbers_[hashIndex].find(SerialNumber);
-		if (DeviceHint == end(SerialNumbers_[hashIndex]) || DeviceHint->second == nullptr) {
-			return;
+		std::shared_ptr<AP_WS_Connection> DevicePtr;
+		{
+			std::lock_guard Lock(WSServerMutex_);
+			auto Device = SerialNumbers_.find(SerialNumber);
+			if (Device == end(SerialNumbers_) || Device->second.second == nullptr) {
+				return;
+			}
+			DevicePtr = Device->second.second;
 		}
-		DeviceHint->second->StopKafkaTelemetry(RPCID);
+		DevicePtr->StopKafkaTelemetry(RPCID);
 	}

 	void AP_WS_Server::GetTelemetryParameters(
@@ -587,15 +473,16 @@ namespace OpenWifi {
 		uint64_t &TelemetryWebSocketTimer, uint64_t &TelemetryKafkaTimer,
 		uint64_t &TelemetryWebSocketCount, uint64_t &TelemetryKafkaCount,
 		uint64_t &TelemetryWebSocketPackets, uint64_t &TelemetryKafkaPackets) {
-
-		auto hashIndex = MACHash::Hash(SerialNumber);
-		std::lock_guard DevicesLock(SerialNumbersMutex_[hashIndex]);
-		auto DeviceHint = SerialNumbers_[hashIndex].find(SerialNumber);
-		if (DeviceHint == end(SerialNumbers_[hashIndex]) || DeviceHint->second == nullptr) {
-			return;
+		std::shared_ptr<AP_WS_Connection> DevicePtr;
+		{
+			std::lock_guard Lock(WSServerMutex_);
+			auto Device = SerialNumbers_.find(SerialNumber);
+			if (Device == end(SerialNumbers_) || Device->second.second == nullptr) {
+				return;
+			}
+			DevicePtr = Device->second.second;
 		}
-
-		DeviceHint->second->GetTelemetryParameters(TelemetryRunning, TelemetryInterval,
+		DevicePtr->GetTelemetryParameters(TelemetryRunning, TelemetryInterval,
 										  TelemetryWebSocketTimer, TelemetryKafkaTimer,
 										  TelemetryWebSocketCount, TelemetryKafkaCount,
 										  TelemetryWebSocketPackets, TelemetryKafkaPackets);
@@ -603,21 +490,18 @@ namespace OpenWifi {

 	bool AP_WS_Server::SendRadiusAccountingData(const std::string &SerialNumber,
 												const unsigned char *buffer, std::size_t size) {
-
-		auto IntSerialNumber = Utils::SerialNumberToInt(SerialNumber);
-		auto hashIndex = MACHash::Hash(IntSerialNumber);
-		std::lock_guard DevicesLock(SerialNumbersMutex_[hashIndex]);
-		auto DeviceHint = SerialNumbers_[hashIndex].find(IntSerialNumber);
-		if (DeviceHint == end(SerialNumbers_[hashIndex]) || DeviceHint->second == nullptr) {
-			return false;
-		}
-
-		if(DeviceHint->second->Dead_) {
-			return false;
+		std::shared_ptr<AP_WS_Connection> DevicePtr;
+		{
+			std::lock_guard Lock(WSServerMutex_);
+			auto Device = SerialNumbers_.find(Utils::SerialNumberToInt(SerialNumber));
+			if (Device == SerialNumbers_.end() || Device->second.second == nullptr) {
+				return false;
+			}
+			DevicePtr = Device->second.second;
 		}

 		try {
-			return DeviceHint->second->SendRadiusAccountingData(buffer, size);
+			return DevicePtr->SendRadiusAccountingData(buffer, size);
 		} catch (...) {
 			poco_debug(
 				Logger(),
@@ -629,20 +513,18 @@ namespace OpenWifi {

 	bool AP_WS_Server::SendRadiusAuthenticationData(const std::string &SerialNumber,
 													const unsigned char *buffer, std::size_t size) {
-		auto IntSerialNumber = Utils::SerialNumberToInt(SerialNumber);
-		auto hashIndex = MACHash::Hash(IntSerialNumber);
-		std::lock_guard DevicesLock(SerialNumbersMutex_[hashIndex]);
-		auto DeviceHint = SerialNumbers_[hashIndex].find(IntSerialNumber);
-		if (DeviceHint == end(SerialNumbers_[hashIndex]) || DeviceHint->second == nullptr) {
-			return false;
-		}
-
-		if(DeviceHint->second->Dead_) {
-			return false;
+		std::shared_ptr<AP_WS_Connection> DevicePtr;
+		{
+			std::lock_guard Lock(WSServerMutex_);
+			auto Device = SerialNumbers_.find(Utils::SerialNumberToInt(SerialNumber));
+			if (Device == SerialNumbers_.end() || Device->second.second == nullptr) {
+				return false;
+			}
+			DevicePtr = Device->second.second;
 		}

 		try {
-			return DeviceHint->second->SendRadiusAuthenticationData(buffer, size);
+			return DevicePtr->SendRadiusAuthenticationData(buffer, size);
 		} catch (...) {
 			poco_debug(
 				Logger(),
@@ -654,19 +536,18 @@ namespace OpenWifi {

 	bool AP_WS_Server::SendRadiusCoAData(const std::string &SerialNumber,
 										 const unsigned char *buffer, std::size_t size) {
-		auto IntSerialNumber = Utils::SerialNumberToInt(SerialNumber);
-		auto hashIndex = MACHash::Hash(IntSerialNumber);
-		std::lock_guard DevicesGuard(SerialNumbersMutex_[hashIndex]);
-		auto DeviceHint = SerialNumbers_[hashIndex].find(IntSerialNumber);
-		if (DeviceHint == end(SerialNumbers_[hashIndex]) || DeviceHint->second == nullptr) {
-			return false;
+		std::shared_ptr<AP_WS_Connection> DevicePtr;
+		{
+			std::lock_guard Lock(WSServerMutex_);
+			auto Device = SerialNumbers_.find(Utils::SerialNumberToInt(SerialNumber));
+			if (Device == SerialNumbers_.end() || Device->second.second == nullptr) {
+				return false;
+			}
+			DevicePtr = Device->second.second;
 		}

-		if(DeviceHint->second->Dead_) {
-			return false;
-		}
 		try {
-			return DeviceHint->second->SendRadiusCoAData(buffer, size);
+			return DevicePtr->SendRadiusCoAData(buffer, size);
 		} catch (...) {
 			poco_debug(Logger(),
 					   fmt::format(": SendRadiusCoAData: Could not send data to device '{}'",
@@ -675,32 +556,4 @@ namespace OpenWifi {
 		return false;
 	}

-	bool AP_WS_Server::ExtendedAttributes(const std::string &serialNumber,
-								   bool & hasGPS,
-								   std::uint64_t &Sanity,
-								   std::double_t &MemoryUsed,
-								   std::double_t &Load,
-								   std::double_t &Temperature
-	) {
-
-		auto serialNumberInt = Utils::SerialNumberToInt(serialNumber);
-		auto hashIndex = MACHash::Hash(serialNumberInt);
-		std::lock_guard	DevicesGuard(SerialNumbersMutex_[hashIndex]);
-		auto DeviceHint = SerialNumbers_[hashIndex].find(Utils::SerialNumberToInt(serialNumber));
-		if(DeviceHint==end(SerialNumbers_[hashIndex])) {
-			return false;
-		}
-		if(DeviceHint->second->Dead_) {
-			return false;
-		}
-		std::lock_guard DeviceGuard(DeviceHint->second->ConnectionMutex_);
-		hasGPS = DeviceHint->second->hasGPS_;
-		Sanity = DeviceHint->second->RawLastHealthcheck_.Sanity;
-		MemoryUsed = DeviceHint->second->memory_used_;
-		Load = DeviceHint->second->cpu_load_;
-		Temperature = DeviceHint->second->temperature_;
-		return true;
-	}
-
-
 } // namespace OpenWifi
--- a/src/AP_WS_Server.h
+++ b/src/AP_WS_Server.h
@@ -24,51 +24,46 @@
 #include "Poco/Timer.h"

 #include "AP_WS_Connection.h"
-#include "AP_WS_Reactor_Pool.h"
+#include "AP_WS_ReactorPool.h"

 #include "framework/SubSystemServer.h"
 #include "framework/utils.h"

 namespace OpenWifi {

-	constexpr uint MACHashMax = 256;
-	constexpr uint MACHashMask = MACHashMax-1;
-	class MACHash {
+	class AP_WS_RequestHandler : public Poco::Net::HTTPRequestHandler {
 	  public:
-		[[nodiscard]] static inline uint16_t Hash(std::uint64_t value) {
-			uint8_t hash = 0, i=6;
-			while(i) {
-				hash ^= (value & MACHashMask) + 1;
-				value >>= 8;
-				--i;
+		explicit AP_WS_RequestHandler(Poco::Logger &L, uint64_t id) : Logger_(L), id_(id){};
+
+		void handleRequest(Poco::Net::HTTPServerRequest &request,
+						   Poco::Net::HTTPServerResponse &response) override;
+
+	  private:
+		Poco::Logger &Logger_;
+		uint64_t id_ = 0;
+	};
+
+	class AP_WS_RequestHandlerFactory : public Poco::Net::HTTPRequestHandlerFactory {
+	  public:
+		inline explicit AP_WS_RequestHandlerFactory(Poco::Logger &L) : Logger_(L) {}
+
+		inline Poco::Net::HTTPRequestHandler *
+		createRequestHandler(const Poco::Net::HTTPServerRequest &request) override {
+			if (request.find("Upgrade") != request.end() &&
+				Poco::icompare(request["Upgrade"], "websocket") == 0) {
+				Utils::SetThreadName("ws:conn-init");
+				return new AP_WS_RequestHandler(Logger_, id_++);
+			} else {
+				return nullptr;
 			}
-			return hash;
 		}

-		[[nodiscard]] static inline uint16_t Hash(const std::string & value) {
-			return Hash(Utils::MACToInt(value));
-		}
-
-		[[nodiscard]] static inline uint16_t HashMax() {
-			return MACHashMax;
-		}
+	  private:
+		Poco::Logger &Logger_;
+		inline static uint64_t id_ = 1;
 	};

-	constexpr uint SessionHashMax = 256;
-	constexpr uint SessionHashMask = SessionHashMax-1;
-	class SessionHash {
-	  public:
-		[[nodiscard]] static inline uint16_t Hash(std::uint64_t value) {
-			return (value & SessionHashMask);
-		}
-
-		[[nodiscard]] static inline uint16_t HashMax() {
-			return SessionHashMax;
-		}
-	};
-
-
-	class AP_WS_Server : public SubSystemServer, public Poco::Runnable {
+	class AP_WS_Server : public SubSystemServer {
 	  public:
 		static auto instance() {
 			static auto instance_ = new AP_WS_Server;
@@ -80,49 +75,59 @@ namespace OpenWifi {
 		bool IsCertOk() { return IssuerCert_ != nullptr; }
 		bool ValidateCertificate(const std::string &ConnectionId,
 								 const Poco::Crypto::X509Certificate &Certificate);
+		// Poco::Net::SocketReactor & GetNextReactor() { return ReactorPool_.NextReactor(); }

 		inline bool IsSimSerialNumber(const std::string &SerialNumber) const {
-			return IsSim(SerialNumber) &&
-				   SerialNumber == SimulatorId_;
+			return IsSim(Poco::toLower(SerialNumber)) &&
+				   Poco::toLower(SerialNumber) == Poco::toLower(SimulatorId_);
 		}

 		inline static bool IsSim(const std::string &SerialNumber) {
 			return SerialNumber.substr(0, 6) == "53494d";
 		}

-		void run() override;		//	Garbage collector thread.
-		[[nodiscard]] inline bool IsSimEnabled() const { return SimulatorEnabled_; }
-		[[nodiscard]] inline bool AllowSerialNumberMismatch() const { return AllowSerialNumberMismatch_; }
-		[[nodiscard]] inline uint64_t MismatchDepth() const { return MismatchDepth_; }
-		[[nodiscard]] inline bool UseProvisioning() const { return LookAtProvisioning_; }
-		[[nodiscard]] inline bool UseDefaults() const { return UseDefaultConfig_; }
-		[[nodiscard]] inline bool Running() const { return Running_; }
-		[[nodiscard]] inline std::pair<std::shared_ptr<Poco::Net::SocketReactor>, std::shared_ptr<LockedDbSession>> NextReactor() {
+		inline bool IsSimEnabled() const { return SimulatorEnabled_; }
+
+		inline bool AllowSerialNumberMismatch() const { return AllowSerialNumberMismatch_; }
+
+		inline uint64_t MismatchDepth() const { return MismatchDepth_; }
+
+		inline bool UseProvisioning() const { return LookAtProvisioning_; }
+		inline bool UseDefaults() const { return UseDefaultConfig_; }
+
+		[[nodiscard]] inline Poco::Net::SocketReactor &NextReactor() {
 			return Reactor_pool_->NextReactor();
 		}
+		[[nodiscard]] inline bool Running() const { return Running_; }

-		inline void AddConnection(std::shared_ptr<AP_WS_Connection> Connection) {
-			std::uint64_t sessionHash = SessionHash::Hash(Connection->State_.sessionId);
-			std::lock_guard Lock(SessionMutex_[sessionHash]);
-			if(Sessions_[sessionHash].find(Connection->State_.sessionId)==end(Sessions_[sessionHash])) {
-				Sessions_[sessionHash][Connection->State_.sessionId] = std::move(Connection);
-			}
+		inline void AddConnection(uint64_t session_id,
+								  std::shared_ptr<AP_WS_Connection> Connection) {
+			std::lock_guard Lock(WSServerMutex_);
+			Sessions_[session_id] = std::move(Connection);
 		}

-		[[nodiscard]] inline bool DeviceRequiresSecureRTTY(uint64_t serialNumber) const {
-			auto hashIndex = MACHash::Hash(serialNumber);
-			std::lock_guard	G(SerialNumbersMutex_[hashIndex]);
+		inline std::shared_ptr<AP_WS_Connection> FindConnection(uint64_t session_id) const {
+			std::lock_guard Lock(WSServerMutex_);

-			auto Connection = SerialNumbers_[hashIndex].find(serialNumber);
-			if (Connection==end(SerialNumbers_[hashIndex]) || Connection->second==nullptr)
+			auto Connection = Sessions_.find(session_id);
+			if (Connection != end(Sessions_))
+				return Connection->second;
+			return nullptr;
+		}
+
+		inline bool DeviceRequiresSecureRtty(uint64_t serialNumber) const {
+			std::lock_guard Lock(WSServerMutex_);
+
+			auto Connection = SerialNumbers_.find(serialNumber);
+			if (Connection==end(SerialNumbers_) || Connection->second.second==nullptr)
 				return false;
-			return Connection->second->RTTYMustBeSecure_;
+			return Connection->second.second->RttyMustBeSecure_;
 		}

 		inline bool GetStatistics(const std::string &SerialNumber, std::string &Statistics) const {
 			return GetStatistics(Utils::SerialNumberToInt(SerialNumber), Statistics);
 		}
-		[[nodiscard]] bool GetStatistics(uint64_t SerialNumber, std::string &Statistics) const;
+		bool GetStatistics(uint64_t SerialNumber, std::string &Statistics) const;

 		inline bool GetState(const std::string &SerialNumber,
 							 GWObjects::ConnectionState &State) const {
@@ -138,7 +143,13 @@ namespace OpenWifi {

 		bool Connected(uint64_t SerialNumber, GWObjects::DeviceRestrictions &Restrictions) const;
 		bool Connected(uint64_t SerialNumber) const;
+
+		inline bool SendFrame(const std::string &SerialNumber, const std::string &Payload) const {
+			return SendFrame(Utils::SerialNumberToInt(SerialNumber), Payload);
+		}
+
 		bool SendFrame(uint64_t SerialNumber, const std::string &Payload) const;
+
 		bool SendRadiusAuthenticationData(const std::string &SerialNumber,
 										  const unsigned char *buffer, std::size_t size);
 		bool SendRadiusAccountingData(const std::string &SerialNumber, const unsigned char *buffer,
@@ -146,8 +157,9 @@ namespace OpenWifi {
 		bool SendRadiusCoAData(const std::string &SerialNumber, const unsigned char *buffer,
 							   std::size_t size);

-		void StartSession(uint64_t session_id, uint64_t SerialNumber);
-		bool EndSession(uint64_t session_id, uint64_t SerialNumber);
+		void SetSessionDetails(uint64_t connection_id, uint64_t SerialNumber);
+		bool EndSession(uint64_t connection_id, uint64_t serial_number);
+		bool EndSessionUnSafe(uint64_t session_id, uint64_t serial_number);
 		void SetWebSocketTelemetryReporting(uint64_t RPCID, uint64_t SerialNumber,
 											uint64_t Interval, uint64_t Lifetime,
 											const std::vector<std::string> &TelemetryTypes);
@@ -164,9 +176,7 @@ namespace OpenWifi {
 									uint64_t &TelemetryWebSocketPackets,
 									uint64_t &TelemetryKafkaPackets);

-		bool GetHealthDevices(std::uint64_t lowLimit, std::uint64_t  highLimit, std::vector<std::string> & SerialNumbers);
-		bool ExtendedAttributes(const std::string &serialNumber, bool & hasGPS, std::uint64_t &Sanity,
-								std::double_t &MemoryUsed, std::double_t &Load, std::double_t &Temperature);
+		void onGarbageCollecting(Poco::Timer &timer);

 		inline void AverageDeviceStatistics(uint64_t &Connections, uint64_t &AverageConnectionTime,
 											uint64_t &NumberOfConnectingDevices) const {
@@ -175,60 +185,84 @@ namespace OpenWifi {
 			NumberOfConnectingDevices = NumberOfConnectingDevices_;
 		}

-		inline bool SendFrame(const std::string &SerialNumber, const std::string &Payload) const {
-			return SendFrame(Utils::SerialNumberToInt(SerialNumber), Payload);
-		}
-
 		inline void AddRX(std::uint64_t bytes) {
+			std::lock_guard		G(StatsMutex_);
 			RX_ += bytes;
 		}

 		inline void AddTX(std::uint64_t bytes) {
+			std::lock_guard		G(StatsMutex_);
 			TX_ += bytes;
 		}

 		inline void GetTotalDataStatistics(std::uint64_t &TX, std::uint64_t &RX) const {
+			std::lock_guard		G(StatsMutex_);
 			TX = TX_;
 			RX = RX_;
 		}

-		bool KafkaDisableState() const { return KafkaDisableState_; }
-		bool KafkaDisableHealthChecks() const { return KafkaDisableHealthChecks_; }
+		inline bool GetHealthDevices(std::uint64_t lowLimit, std::uint64_t  highLimit, std::vector<std::string> & SerialNumbers) {
+			std::lock_guard		G(WSServerMutex_);
+
+			for(const auto &connection:Sessions_) {
+				if(	connection.second->RawLastHealthcheck_.Sanity>=lowLimit 	&&
+					connection.second->RawLastHealthcheck_.Sanity<=highLimit) {
+					SerialNumbers.push_back(connection.second->SerialNumber_);
+				}
+			}
+			return true;
+		}
+
+		inline bool ExtendedAttributes(const std::string &serialNumber,
+			bool & hasGPS,
+			std::uint64_t &Sanity,
+			std::double_t &MemoryUsed,
+			std::double_t &Load,
+			std::double_t &Temperature
+			) {
+			std::lock_guard	G(WSServerMutex_);
+			auto session_hint = SerialNumbers_.find(Utils::SerialNumberToInt(serialNumber));
+			if(session_hint==end(SerialNumbers_)) {
+				return false;
+			}
+			hasGPS = session_hint->second.second->hasGPS;
+			Sanity = session_hint->second.second->RawLastHealthcheck_.Sanity;
+			MemoryUsed = session_hint->second.second->memory_used_;
+			Load = session_hint->second.second->cpu_load_;
+			Temperature = session_hint->second.second->temperature_;
+			return true;
+		}

 	  private:
-		std::array<std::mutex,SessionHashMax> 			SessionMutex_;
-		std::array<std::map<std::uint64_t, std::shared_ptr<AP_WS_Connection>>,SessionHashMax> Sessions_;
-		using SerialNumberMap = std::map<uint64_t /* serial number */,
-										 std::shared_ptr<AP_WS_Connection>>;
-		std::array<SerialNumberMap,MACHashMax>			SerialNumbers_;
-		mutable std::array<std::recursive_mutex,MACHashMax>		SerialNumbersMutex_;
-
+		mutable std::recursive_mutex WSServerMutex_;
 		std::unique_ptr<Poco::Crypto::X509Certificate> IssuerCert_;
 		std::list<std::unique_ptr<Poco::Net::HTTPServer>> WebServers_;
-		Poco::ThreadPool DeviceConnectionPool_{"ws:dev-pool", 4, 256};
 		Poco::Net::SocketReactor Reactor_;
 		Poco::Thread ReactorThread_;
 		std::string SimulatorId_;
+		Poco::ThreadPool DeviceConnectionPool_{"ws:dev-pool", 2, 64};
 		bool LookAtProvisioning_ = false;
 		bool UseDefaultConfig_ = true;
 		bool SimulatorEnabled_ = false;
-		bool AllowSerialNumberMismatch_ = true;
-
 		std::unique_ptr<AP_WS_ReactorThreadPool> Reactor_pool_;
 		std::atomic_bool Running_ = false;
+		std::map<std::uint64_t, std::shared_ptr<AP_WS_Connection>> Sessions_;
+		std::map<uint64_t, std::pair<uint64_t, std::shared_ptr<AP_WS_Connection>>> SerialNumbers_;
+		std::atomic_bool AllowSerialNumberMismatch_ = true;
+		std::atomic_uint64_t MismatchDepth_ = 2;

-		std::uint64_t 			MismatchDepth_ = 2;
 		std::uint64_t 			NumberOfConnectedDevices_ = 0;
 		std::uint64_t 			AverageDeviceConnectionTime_ = 0;
 		std::uint64_t 			NumberOfConnectingDevices_ = 0;
 		std::uint64_t 			SessionTimeOut_ = 10*60;
-		std::uint64_t 			LeftOverSessions_ = 0;
+		mutable std::mutex		StatsMutex_;
 		std::atomic_uint64_t 	TX_=0,RX_=0;

-		std::atomic_bool 		KafkaDisableState_=false,
-						 		KafkaDisableHealthChecks_=false;
+		std::vector<std::shared_ptr<AP_WS_Connection>> Garbage_;

-		Poco::Thread 			GarbageCollector_;
+		std::unique_ptr<Poco::TimerCallback<AP_WS_Server>> GarbageCollectorCallback_;
+		Poco::Timer Timer_;
+		Poco::Thread GarbageCollector_;

 		AP_WS_Server() noexcept
 			: SubSystemServer("WebSocketServer", "WS-SVR", "ucentral.websocket") {}
--- a/src/CommandManager.cpp
+++ b/src/CommandManager.cpp
@@ -45,9 +45,11 @@ namespace OpenWifi {
 							std::lock_guard Lock(LocalMutex_);
 							auto RPC = OutStandingRequests_.find(ID);
 							if (RPC == OutStandingRequests_.end()) {
+								//								std::cout << __LINE__ << std::endl;
 								poco_debug(Logger(), fmt::format("({}): RPC {} cannot be found.",
 																 SerialNumberStr, ID));
 							} else if (RPC->second.SerialNumber != Resp->SerialNumber_) {
+								//								std::cout << __LINE__ << std::endl;
 								poco_debug(
 									Logger(),
 									fmt::format("({}): RPC {} serial number mismatch {}!={}.",
@@ -58,6 +60,7 @@ namespace OpenWifi {
 								std::chrono::duration<double, std::milli> rpc_execution_time =
 									std::chrono::high_resolution_clock::now() -
 									RPC->second.submitted;
+								//								std::cout << __LINE__ << std::endl;
 								poco_debug(Logger(),
 										   fmt::format("({}): Received RPC answer {}. Command={}",
 													   SerialNumberStr, ID,
@@ -137,6 +140,7 @@ namespace OpenWifi {
 				}
 			}
 		} else {
+			//				std::cout << __LINE__ << std::endl;
 		}
 		Command.State = 0;

@@ -159,6 +163,7 @@ namespace OpenWifi {
 		if (Command.rpc_entry) {
 			TmpRpcEntry = Command.rpc_entry;
 		}
+		//		std::cout << __LINE__ << "  State=" << Command.State << std::endl;
 		if (Command.State == 2) {
 			//	 look at the payload to see if we should continue or not...
 			if (Payload->has("result")) {
@@ -168,10 +173,12 @@ namespace OpenWifi {

 					std::uint64_t Error = Status->get("error");
 					if (Error == 0) {
+						//						std::cout << __LINE__ << std::endl;
 						StorageService()->CommandCompleted(Command.UUID, Payload,
 														   rpc_execution_time, true);
 						Command.State = 1;
 					} else {
+						//						std::cout << __LINE__ << std::endl;
 						StorageService()->CommandCompleted(Command.UUID, Payload,
 														   rpc_execution_time, true);
 						std::string ErrorTxt = Status->get("result");
@@ -179,11 +186,14 @@ namespace OpenWifi {
 						Command.State = 0;
 					}
 				} else {
+					//					std::cout << __LINE__ << std::endl;
 				}
 			} else {
+				//				std::cout << __LINE__ << std::endl;
 				Command.State = 0;
 			}
 		} else if (Command.State == 1) {
+			//			std::cout << "Completing script 2 phase commit." << std::endl;
 			StorageService()->CommandCompleted(Command.UUID, Payload, rpc_execution_time, true);
 			if (Command.Deferred) {
 				Reply = false;
@@ -192,6 +202,7 @@ namespace OpenWifi {
 		}

 		if (Command.State == 0) {
+			//			std::cout << __LINE__ << "  State=" << Command.State << std::endl;
 			OutStandingRequests_.erase(Command.Id);
 		}
 		if (Reply && TmpRpcEntry != nullptr)
@@ -251,6 +262,8 @@ namespace OpenWifi {
 		for (auto request = OutStandingRequests_.begin(); request != OutStandingRequests_.end();) {
 			std::chrono::duration<double, std::milli> delta = now - request->second.submitted;
 			if (delta > 10min) {
+				//				std::cout << __LINE__ << "  -->> " << request->second.Id <<
+				// std::endl;
 				MyLogger.debug(fmt::format("{}: Command={} for {} Timed out.", request->second.UUID,
 										   APCommands::to_string(request->second.Command),
 										   Utils::IntToSerialNumber(request->second.SerialNumber)));
@@ -262,6 +275,8 @@ namespace OpenWifi {
 				StorageService()->SetCommandTimedOut(request->second.UUID);
 				request = OutStandingRequests_.erase(request);
 			} else {
+				//				std::cout << __LINE__ << "  -->> " << request->second.Id <<
+				// std::endl;
 				++request;
 			}
 		}
@@ -452,16 +467,4 @@ namespace OpenWifi {
 		poco_warning(Logger(), fmt::format("{}: Failed to send command. ID: {}", UUID, RPC_ID));
 		return nullptr;
 	}
-
-	bool CommandManager::FireAndForget(const std::string &SerialNumber, const std::string &Method, const Poco::JSON::Object &Params) {
-		Poco::JSON::Object CompleteRPC;
-		CompleteRPC.set(uCentralProtocol::JSONRPC, uCentralProtocol::JSONRPC_VERSION);
-		CompleteRPC.set(uCentralProtocol::ID, 0);
-		CompleteRPC.set(uCentralProtocol::METHOD, Method);
-		CompleteRPC.set(uCentralProtocol::PARAMS, Params);
-		std::stringstream ToSend;
-		CompleteRPC.stringify(ToSend);
-		poco_debug(Logger(), fmt::format("{}: Fire and forget command {}.", SerialNumber, Method));
-		return AP_WS_Server()->SendFrame(SerialNumber, ToSend.str())>0;
-	}
 } // namespace OpenWifi
--- a/src/CommandManager.h
+++ b/src/CommandManager.h
@@ -12,7 +12,7 @@
 #include <functional>
 #include <future>
 #include <map>
-#include <mutex>
+#include <shared_mutex>
 #include <utility>

 #include "Poco/JSON/Object.h"
@@ -162,10 +162,8 @@ namespace OpenWifi {
 		inline auto CommandTimeout() const { return commandTimeOut_; }
 		inline auto CommandRetry() const { return commandRetry_; }

-		bool FireAndForget(const std::string &SerialNumber, const std::string &Method,
-						   const Poco::JSON::Object &Params);
 	  private:
-		mutable std::mutex LocalMutex_;
+		mutable std::recursive_mutex LocalMutex_;
 		std::atomic_bool Running_ = false;
 		Poco::Thread ManagerThread;
 		std::atomic_uint64_t Id_ = 3; //	do not start @1. We ignore ID=1 & 0 is illegal..
--- a/src/Dashboard.cpp
+++ b/src/Dashboard.cpp
@@ -21,6 +21,7 @@ namespace OpenWifi {

 	void DeviceDashboard::Generate(GWObjects::Dashboard &D, Poco::Logger &Logger) {
 		if (GeneratingDashboard_.load()) {
+			// std::cout << "Trying to generate dashboard but already being generated" << std::endl;
 			while (GeneratingDashboard_.load()) {
 				Poco::Thread::trySleep(100);
 			}
@@ -30,6 +31,7 @@ namespace OpenWifi {
 			GeneratingDashboard_ = true;
 			ValidDashboard_ = false;
 			try {
+				// std::cout << "Generating dashboard." << std::endl;
 				poco_information(Logger, "DASHBOARD: Generating a new dashboard.");
 				GWObjects::Dashboard NewData;
 				StorageService()->AnalyzeCommands(NewData.commands);
--- a/src/GWKafkaEvents.cpp
+++ b/src/GWKafkaEvents.cpp
@@ -12,7 +12,10 @@ namespace OpenWifi {
 			Event.set("type", type_);
 			Event.set("timestamp", timestamp_);
 			Event.set("payload", payload_);
-			KafkaManager()->PostMessage(KafkaTopics::DEVICE_EVENT_QUEUE, Utils::IntToSerialNumber(serialNumber_), Event);
+			std::ostringstream OS;
+			Event.stringify(OS);
+			auto payload = std::make_shared<std::string>(OS.str());
+			KafkaManager()->PostMessage(KafkaTopics::DEVICE_EVENT_QUEUE, Utils::IntToSerialNumber(serialNumber_), payload);
 		}
 	}

--- a/src/GWKafkaEvents.h
+++ b/src/GWKafkaEvents.h
@@ -50,17 +50,17 @@ namespace OpenWifi {
 	class DeviceConfigurationChangeKafkaEvent : public GWKafkaEvents {
 	  public:
 		DeviceConfigurationChangeKafkaEvent(std::uint64_t serialNumber,
-											std::uint64_t timestamp, const Poco::JSON::Object::Ptr config)
+											std::uint64_t timestamp, const std::string config)
 			: GWKafkaEvents(serialNumber, "unit.configuration_change", timestamp), config_(config) {
 		}

 		~DeviceConfigurationChangeKafkaEvent() {
-			payload_->set("configuration", *config_);
+			payload_->set("configuration", config_);
 			Send();
 		}

 	  private:
-		Poco::JSON::Object::Ptr config_;
+		std::string config_;
 	};

 	class DeviceBlacklistedKafkaEvent : public GWKafkaEvents {
--- a/src/OUIServer.cpp
+++ b/src/OUIServer.cpp
@@ -28,7 +28,7 @@ namespace OpenWifi {
 		bool Recovered = false;
 		Poco::File OuiFile(CurrentOUIFileName_);
 		if (OuiFile.exists()) {
-			std::lock_guard Lock(LocalMutex_);
+			std::unique_lock Lock(LocalMutex_);
 			Recovered = ProcessFile(CurrentOUIFileName_, OUIs_);
 			if (Recovered) {
 				poco_notice(Logger(),
@@ -150,7 +150,7 @@ namespace OpenWifi {

 		OUIMap TmpOUIs;
 		if (GetFile(LatestOUIFileName_) && ProcessFile(LatestOUIFileName_, TmpOUIs)) {
-			std::lock_guard G(LocalMutex_);
+			std::unique_lock G(LocalMutex_);
 			OUIs_ = std::move(TmpOUIs);
 			LastUpdate_ = Utils::Now();
 			Poco::File F1(CurrentOUIFileName_);
@@ -163,7 +163,7 @@ namespace OpenWifi {
 		} else if (OUIs_.empty()) {
 			if (ProcessFile(CurrentOUIFileName_, TmpOUIs)) {
 				LastUpdate_ = Utils::Now();
-				std::lock_guard G(LocalMutex_);
+				std::unique_lock G(LocalMutex_);
 				OUIs_ = std::move(TmpOUIs);
 			}
 		}
@@ -173,7 +173,7 @@ namespace OpenWifi {
 	}

 	std::string OUIServer::GetManufacturer(const std::string &MAC) {
-		std::lock_guard Lock(LocalMutex_);
+		std::shared_lock Lock(LocalMutex_);

 		auto Manufacturer = OUIs_.find(Utils::SerialNumberToOUI(MAC));
 		if (Manufacturer != OUIs_.end())
--- a/src/OUIServer.h
+++ b/src/OUIServer.h
@@ -4,7 +4,7 @@

 #pragma once

-#include <mutex>
+#include <shared_mutex>

 #include "framework/SubSystemServer.h"

@@ -32,7 +32,7 @@ namespace OpenWifi {
 		[[nodiscard]] bool ProcessFile(const std::string &FileName, OUIMap &Map);

 	  private:
-		std::mutex LocalMutex_;
+		std::shared_mutex LocalMutex_;
 		uint64_t LastUpdate_ = 0;
 		bool Initialized_ = false;
 		OUIMap OUIs_;
--- a/src/ParseWifiScan.h
+++ b/src/ParseWifiScan.h
@@ -1753,6 +1753,7 @@ namespace OpenWifi {
 		nlohmann::json new_ie;
 		nlohmann::json content;

+		// std::cout << BufferToHex(&data[0],data.size()) << std::endl;
 		uint offset = 0;
 		auto sub_ie = data[offset++];
 		switch (sub_ie) {
@@ -1787,6 +1788,7 @@ namespace OpenWifi {

 		try {
 			nlohmann::json D = nlohmann::json::parse(ofs.str());
+			// std::cout << "Start of parsing wifi" << std::endl;
 			if (D.contains("status")) {
 				auto Status = D["status"];
 				if (Status.contains("scan") && Status["scan"].is_array()) {
@@ -1801,6 +1803,8 @@ namespace OpenWifi {
 									if (ie.contains("type") && ie.contains("data")) {
 										uint64_t ie_type = ie["type"];
 										std::string ie_data = ie["data"];
+										// std::cout << "TYPE:" << ie_type << "  DATA:" << ie_data
+										// << std::endl;
 										auto data = Base64Decode2Vec(ie_data);
 										if (ie_type == ieee80211_eid::WLAN_EID_COUNTRY) {
 											new_ies.push_back(WFS_WLAN_EID_COUNTRY(data));
@@ -1854,12 +1858,18 @@ namespace OpenWifi {
 										} else if (ie_type == ieee80211_eid::WLAN_EID_EXTENSION) {
 											new_ies.push_back(WFS_WLAN_EID_EXTENSION(data));
 										} else {
+											// std::cout
+											//	<< "Skipping IE: no parsing available: " << ie_type
+											//	<< std::endl;
 											new_ies.push_back(ie);
 										}
 									} else {
+										// std::cout << "Skipping IE: no data and type" <<
+										// std::endl;
 										new_ies.push_back(ie);
 									}
 								} catch (...) {
+									// std::cout << "Skipping IE: exception" << std::endl;
 									Logger.information(fmt::format("Error parsing IEs"));
 									new_ies.push_back(ie);
 								}
@@ -1867,6 +1877,7 @@ namespace OpenWifi {
 							scan_entry["ies"] = new_ies;
 							ParsedScan.push_back(scan_entry);
 						} else {
+							// std::cout << "Skipping scan" << std::endl;
 							ParsedScan.push_back(scan_entry);
 						}
 					}
@@ -1875,6 +1886,7 @@ namespace OpenWifi {
 				}
 			}
 			Result << to_string(D);
+			// std::cout << "End of parsing wifi" << std::endl;
 			return true;
 		} catch (const Poco::Exception &E) {
 			Logger.log(E);
--- a/src/RADIUSSessionTracker.cpp
+++ b/src/RADIUSSessionTracker.cpp
@@ -177,6 +177,15 @@ namespace OpenWifi {
 		} else {
 			session_hint->second->lastTransaction = Utils::Now();
 		}
+
+/*
+		if(ap_hint!=AccountingSessions_.end()) {
+			std::cout << "Auth table:" << std::endl;
+			for(const auto &session:ap_hint->second) {
+				std::cout << Notification.SerialNumber_ << ":  Index: " << session.first << ": ID: " << session.second->accountingSessionId << "  MID:" << session.second->accountingMultiSessionId << std::endl;
+			}
+		}
+*/
 	}

 	std::uint32_t GetUiInt32(const std::uint8_t *buf) {
@@ -414,15 +423,15 @@ namespace OpenWifi {
 	}

 	void RADIUSSessionTracker::DisconnectSession(const std::string &SerialNumber) {
+		poco_information(Logger(),fmt::format("{}: Disconnecting.", SerialNumber));

 		std::lock_guard		Guard(Mutex_);
+
 		auto hint = AccountingSessions_.find(SerialNumber);
 		if(hint==end(AccountingSessions_)) {
 			return;
 		}

-		poco_information(Logger(),fmt::format("{}: Disconnecting.", SerialNumber));
-
 		//	we need to go through all sessions and send an accounting stop
 		for(const auto &session:hint->second) {
 			poco_debug(Logger(), fmt::format("Stopping accounting for {}:{}", SerialNumber, session.first ));
--- a/src/RADIUS_Destination.h
+++ b/src/RADIUS_Destination.h
@@ -1,740 +0,0 @@
-//
-// Created by stephane bourque on 2022-08-15.
-//
-
-#pragma once
-
-#include <fstream>
-#include <iostream>
-
-#include "RESTObjects/RESTAPI_GWobjects.h"
-
-#include "Poco/Crypto/X509Certificate.h"
-#include "Poco/Crypto/RSAKey.h"
-#include "Poco/Net/Context.h"
-#include "Poco/Net/NetException.h"
-#include "Poco/Net/SecureStreamSocket.h"
-#include "Poco/Net/SocketReactor.h"
-#include "Poco/TemporaryFile.h"
-
-#include "framework/MicroServiceFuncs.h"
-
-#include "fmt/format.h"
-
-#include "AP_WS_Server.h"
-#include "RADIUS_helpers.h"
-#include <RESTObjects/RESTAPI_GWobjects.h>
-
-namespace OpenWifi {
-
-	class RADIUS_Destination : public Poco::Runnable {
-	  public:
-		RADIUS_Destination(Poco::Net::SocketReactor &R, const GWObjects::RadiusProxyPool &P)
-			: Reactor_(R),
-			  Logger_(Poco::Logger::get(
-				  fmt::format("RADSEC: {}", P.name))),
-			  Pool_(P)
-		{
-			Type_ = GWObjects::RadiusEndpointType(P.radsecPoolType);
-			Start();
-		}
-
-		~RADIUS_Destination() override { Stop(); }
-
-		const int SMALLEST_RADIUS_PACKET = 20 + 19 + 4;
-		const int DEFAULT_RADIUS_AUTHENTICATION_PORT = 1812;
-		const int DEFAULT_RADIUS_ACCOUNTING_PORT = 1813;
-		const int DEFAULT_RADIUS_CoA_PORT = 3799;
-		
-		inline int Start() {
-			ReconnectThread_.start(*this);
-			return 0;
-		}
-
-		inline void Stop() {
-			TryAgain_ = false;
-			Disconnect();
-			ReconnectThread_.wakeUp();
-			ReconnectThread_.join();
-		}
-
-		inline void run() final {
-			Poco::Thread::trySleep(5000);
-			std::uint64_t CurrentDelay = 10, maxDelay=300, LastTry=0, LastKeepAlive=0;
-			while (TryAgain_) {
-				if (!Connected_) {
-					if(!LastTry || (Utils::Now()-LastTry)>CurrentDelay) {
-						LastTry = Utils::Now();
-						if (!Connect()) {
-							CurrentDelay *= 2;
-							if(CurrentDelay>maxDelay) CurrentDelay=10;
-						} else {
-							CurrentDelay = 10;
-						}
-					}
-				} else if ((Utils::Now() - LastKeepAlive) > Pool_.radsecKeepAlive) {
-					RADIUS::RadiusOutputPacket P(Pool_.authConfig.servers[ServerIndex_].radsecSecret);
-					P.MakeStatusMessage(Pool_.authConfig.servers[ServerIndex_].name);
-					poco_trace(Logger_, fmt::format("{}: Keep-Alive message.", Pool_.authConfig.servers[ServerIndex_].name));
-					Socket_->sendBytes(P.Data(), P.Len());
-					LastKeepAlive = Utils::Now();
-				}
-				Poco::Thread::trySleep(2000);
-			}
-		}
-
-		inline bool SendData(const std::string &serial_number, const unsigned char *buffer,
-							 int length) {
-			try {
-				if (Connected_) {
-					RADIUS::RadiusPacket P(buffer, length);
-					int sent_bytes;
-					if (P.VerifyMessageAuthenticator(Pool_.authConfig.servers[ServerIndex_].radsecSecret)) {
-						poco_trace(Logger_, fmt::format("{}: {} Sending {} bytes", serial_number,
-														P.PacketType(), length));
-						sent_bytes = Socket_->sendBytes(buffer, length);
-					} else {
-						poco_trace(Logger_, fmt::format("{}: {} Sending {} bytes", serial_number,
-														P.PacketType(), length));
-						P.ComputeMessageAuthenticator(Pool_.authConfig.servers[ServerIndex_].radsecSecret);
-						sent_bytes = Socket_->sendBytes(P.Buffer(), length);
-					}
-					return (sent_bytes == length);
-				}
-			} catch (const Poco::Exception &E) {
-				Logger_.log(E);
-			} catch (...) {
-				poco_warning(Logger_, "Exception occurred: while sending data.");
-			}
-			return false;
-		}
-
-		inline void
-		onData([[maybe_unused]] const Poco::AutoPtr<Poco::Net::ReadableNotification> &pNf) {
-			unsigned char Buffer[4096];
-
-			try {
-				auto NumberOfReceivedBytes = Socket_->receiveBytes(Buffer, sizeof(Buffer));
-				std::string ReplySource;
-				if (NumberOfReceivedBytes >= 20) {
-					RADIUS::RadiusPacket P(Buffer, NumberOfReceivedBytes);
-					if (P.IsAuthentication()) {
-						auto SerialNumber = P.ExtractSerialNumberFromProxyState();
-						if (!SerialNumber.empty()) {
-							poco_debug(Logger_,
-									   fmt::format("{}: {}:{} Received {} bytes.", SerialNumber,
-												   P.PacketType(),
-												   P.PacketTypeToString(),
-												   NumberOfReceivedBytes));
-							AP_WS_Server()->SendRadiusAuthenticationData(SerialNumber, Buffer,
-																		 NumberOfReceivedBytes);
-						} else if(P.IsStatusMessageReply(ReplySource)) {
-							poco_debug(Logger_,
-									   fmt::format("{}: Keepalive message received.", ReplySource));
-						} else {
-							poco_debug(Logger_, "AUTH packet dropped.");
-						}
-					} else if (P.IsAccounting()) {
-						auto SerialNumber = P.ExtractSerialNumberFromProxyState();
-						if (!SerialNumber.empty()) {
-							poco_debug(Logger_,
-									   fmt::format("{}: {}:{} Received {} bytes.", SerialNumber,
-												   P.PacketType(),
-												   P.PacketTypeToString(), NumberOfReceivedBytes));
-							AP_WS_Server()->SendRadiusAccountingData(SerialNumber, Buffer,
-																	 NumberOfReceivedBytes);
-						} else {
-							poco_debug(Logger_, "ACCT packet dropped.");
-						}
-					} else if (P.IsAuthority()) {
-						auto SerialNumber = P.ExtractSerialNumberTIP();
-						if (!SerialNumber.empty()) {
-							poco_debug(Logger_,
-									   fmt::format("{}: {}:{} Received {} bytes.", SerialNumber,
-												   P.PacketType(),
-												   P.PacketTypeToString(), NumberOfReceivedBytes));
-							AP_WS_Server()->SendRadiusCoAData(SerialNumber, Buffer,
-															  NumberOfReceivedBytes);
-						} else {
-							poco_debug(Logger_, "CoA/DM packet dropped.");
-						}
-					} else {
-						poco_warning(Logger_,
-									 fmt::format("Unknown packet: Type: {} (type={}) Length={}",
-												 P.PacketType(), P.PacketTypeInt(), P.BufferLen()));
-					}
-				} else {
-					poco_warning(Logger_, "Invalid packet received. Resetting the connection.");
-					Disconnect();
-				}
-			} catch (const Poco::Exception &E) {
-				Logger_.log(E);
-				Disconnect();
-			} catch (...) {
-				Disconnect();
-				poco_warning(Logger_, "Exception occurred. Resetting the connection.");
-			}
-		}
-
-		inline void
-		onError([[maybe_unused]] const Poco::AutoPtr<Poco::Net::ErrorNotification> &pNf) {
-			poco_warning(Logger_, "Socker error. Terminating connection.");
-			Disconnect();
-		}
-
-		inline void
-		onShutdown([[maybe_unused]] const Poco::AutoPtr<Poco::Net::ShutdownNotification> &pNf) {
-			poco_warning(Logger_, "Socker socket shutdown. Terminating connection.");
-			Disconnect();
-		}
-
-		inline void OnAccountingSocketReadable(
-			const Poco::AutoPtr<Poco::Net::ReadableNotification> &pNf) {
-			Poco::Net::SocketAddress Sender;
-			RADIUS::RadiusPacket P;
-
-			auto ReceiveSize = pNf->socket().impl()->receiveBytes(P.Buffer(), P.BufferLen());
-			if (ReceiveSize < SMALLEST_RADIUS_PACKET) {
-				poco_warning(Logger_, "Accounting: bad packet received.");
-				return;
-			}
-			P.Evaluate(ReceiveSize);
-			auto SerialNumber = P.ExtractSerialNumberFromProxyState();
-			if (SerialNumber.empty()) {
-				poco_warning(Logger_, "Accounting: missing serial number. Dropping request.");
-				return;
-			}
-			poco_debug(
-				Logger_,
-				fmt::format(
-					"Accounting Packet Response received for {}", SerialNumber ));
-			AP_WS_Server()->SendRadiusAccountingData(SerialNumber, P.Buffer(), P.Size());
-		}
-
-		inline void OnAuthenticationSocketReadable(
-			const Poco::AutoPtr<Poco::Net::ReadableNotification> &pNf) {
-			Poco::Net::SocketAddress Sender;
-			RADIUS::RadiusPacket P;
-
-			auto ReceiveSize = pNf->socket().impl()->receiveBytes(P.Buffer(), P.BufferLen());
-			if (ReceiveSize < SMALLEST_RADIUS_PACKET) {
-				poco_warning(Logger_, "Authentication: bad packet received.");
-				return;
-			}
-			P.Evaluate(ReceiveSize);
-
-			if(Logger_.trace()) {
-				P.Log(std::cout);
-			}
-			auto SerialNumber = P.ExtractSerialNumberFromProxyState();
-			if (SerialNumber.empty()) {
-				poco_warning(Logger_, "Authentication: missing serial number. Dropping request.");
-				return;
-			}
-			auto CallingStationID = P.ExtractCallingStationID();
-			auto CalledStationID = P.ExtractCalledStationID();
-
-			poco_debug(
-				Logger_,
-				fmt::format(
-					"Authentication Packet received for {}, CalledStationID: {}, CallingStationID:{}",
-					SerialNumber, CalledStationID, CallingStationID));
-			AP_WS_Server()->SendRadiusAuthenticationData(SerialNumber, P.Buffer(), P.Size());
-		}
-
-		inline void OnCoASocketReadable(
-			const Poco::AutoPtr<Poco::Net::ReadableNotification> &pNf) {
-			Poco::Net::SocketAddress Sender;
-			RADIUS::RadiusPacket P;
-
-			auto ReceiveSize = pNf.get()->socket().impl()->receiveBytes(P.Buffer(), P.BufferLen());
-			if (ReceiveSize < SMALLEST_RADIUS_PACKET) {
-				poco_warning(Logger_, "CoA/DM: bad packet received.");
-				return;
-			}
-
-			P.Evaluate(ReceiveSize);
-			auto SerialNumber = P.ExtractSerialNumberTIP();
-			if (SerialNumber.empty()) {
-				poco_warning(Logger_, "CoA/DM: missing serial number. Dropping request.");
-				return;
-			}
-			auto CallingStationID = P.ExtractCallingStationID();
-			auto CalledStationID = P.ExtractCalledStationID();
-
-			poco_debug(
-				Logger_,
-				fmt::format("CoA Packet received for {}, CalledStationID: {}, CallingStationID:{}",
-							SerialNumber, CalledStationID, CallingStationID));
-			AP_WS_Server()->SendRadiusCoAData(SerialNumber, P.Buffer(), P.Size());
-		}
-		
-		static inline bool IsExpired(const Poco::Crypto::X509Certificate &C) {
-			return C.expiresOn().timestamp().epochTime() < (std::time_t)Utils::Now();
-		}
-
-		static inline void Cat(const std::string &F1, const std::string & F2, const std::string &F) {
-			std::ofstream of(F.c_str(),std::ios_base::trunc|std::ios_base::out|std::ios_base::binary);
-			std::ifstream if1(F1.c_str(),std::ios_base::binary|std::ios_base::in);
-			Poco::StreamCopier::copyStream(if1,of);
-			of << std::endl;
-			std::ifstream if2(F2.c_str(),std::ios_base::binary|std::ios_base::in);
-			Poco::StreamCopier::copyStream(if2,of);
-			of << std::endl;
-			of.close();
-		}
-
-		inline bool Connect_GlobalReach() {
-
-			if (TryAgain_) {
-				std::lock_guard G(LocalMutex_);
-
-				Poco::TemporaryFile CertFile_(MicroServiceDataDirectory());
-				Poco::TemporaryFile KeyFile_(MicroServiceDataDirectory());
-				Poco::TemporaryFile OpenRoamingRootCertFile_(MicroServiceDataDirectory());
-				Poco::TemporaryFile Intermediate0(MicroServiceDataDirectory());
-				Poco::TemporaryFile Intermediate1(MicroServiceDataDirectory());
-
-				DecodeFile(KeyFile_.path(), Pool_.acctConfig.servers[ServerIndex_].radsecKey);
-				DecodeFile(CertFile_.path(), Pool_.acctConfig.servers[ServerIndex_].radsecCert);
-				DecodeFile(Intermediate0.path(), Pool_.acctConfig.servers[ServerIndex_].radsecCacerts[0]);
-				DecodeFile(Intermediate1.path(), Pool_.acctConfig.servers[ServerIndex_].radsecCacerts[1]);
-
-				const static std::string OpenRoamingRootCert{
-					"-----BEGIN CERTIFICATE-----\n"
-					"MIIClDCCAhugAwIBAgIUF1f+h+uJNHyr+ZqTpwew8LYRAW0wCgYIKoZIzj0EAwMw\n"
-					"gYkxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRv\n"
-					"bjEsMCoGA1UEChMjR2xvYmFsUmVhY2ggVGVjaG5vbG9neSBFTUVBIExpbWl0ZWQx\n"
-					"KjAoBgNVBAMTIUdsb2JhbFJlYWNoIENlcnRpZmljYXRlIEF1dGhvcml0eTAeFw0y\n"
-					"MzA3MTQwOTMyMDBaFw00MzA3MDkwOTMyMDBaMIGJMQswCQYDVQQGEwJHQjEPMA0G\n"
-					"A1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xLDAqBgNVBAoTI0dsb2JhbFJl\n"
-					"YWNoIFRlY2hub2xvZ3kgRU1FQSBMaW1pdGVkMSowKAYDVQQDEyFHbG9iYWxSZWFj\n"
-					"aCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARy\n"
-					"f02umFNy5W/TtM5nfMaLhRF61vLxhT8iNQHR1mXiRmNdME3ArForBcAm2eolHPcJ\n"
-					"RH9DcXs59d2zzoPEaBjXADTCjUts3F7G6fjqvfki2e/txx/xfUopQO8G54XcFWqj\n"
-					"QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRS\n"
-					"tNe7MgAFwTaMZKUtS1/8pVoBqjAKBggqhkjOPQQDAwNnADBkAjA7VKHTybtSMBcN\n"
-					"717jGYvkWlcj4c9/LzPtkHO053wGsPigaq+1SjY7tDhS/g9oUQACMA6UqH2e8cfn\n"
-					"cZqmBNVNN3DBjIb4anug7F+FnYOQF36ua6MLBeGn3aKxvu1aO+hjPg==\n"
-					"-----END CERTIFICATE-----\n"};
-
-				std::ofstream ofs{OpenRoamingRootCertFile_.path().c_str(),
-								  std::ios_base::trunc | std::ios_base::out |
-									  std::ios_base::binary};
-				ofs << OpenRoamingRootCert;
-				ofs.close();
-
-				Poco::Net::Context::Ptr SecureContext = Poco::AutoPtr<Poco::Net::Context>(
-					new Poco::Net::Context(Poco::Net::Context::TLS_CLIENT_USE, ""));
-
-				if (Pool_.acctConfig.servers[ServerIndex_].allowSelfSigned) {
-					SecureContext->setSecurityLevel(Poco::Net::Context::SECURITY_LEVEL_NONE);
-					SecureContext->enableExtendedCertificateVerification(false);
-				}
-
-				SecureContext->usePrivateKey(Poco::Crypto::RSAKey("", KeyFile_.path(), ""));
-				Poco::Crypto::X509Certificate Cert(CertFile_.path());
-				if (!IsExpired(Cert)) {
-					SecureContext->useCertificate(Poco::Crypto::X509Certificate(CertFile_.path()));
-				} else {
-					poco_error(
-						Logger_,
-						fmt::format(
-							"Certificate for {} has expired. We cannot connect to this server.",
-							Pool_.acctConfig.servers[ServerIndex_].name));
-					return false;
-				}
-
-				SecureContext->addCertificateAuthority(
-					Poco::Crypto::X509Certificate(OpenRoamingRootCertFile_.path()));
-				SecureContext->addChainCertificate(
-					Poco::Crypto::X509Certificate(Intermediate0.path()));
-				SecureContext->addChainCertificate(
-					Poco::Crypto::X509Certificate(Intermediate1.path()));
-				SecureContext->enableExtendedCertificateVerification(false);
-
-				Socket_ = std::make_unique<Poco::Net::SecureStreamSocket>(SecureContext);
-				ServerIndex_ = 0 ;
-				for (const auto &PoolEntryServer : Pool_.acctConfig.servers) {
-					Poco::Net::SocketAddress Destination(PoolEntryServer.ip, PoolEntryServer.port);
-					try {
-						poco_information(Logger_, fmt::format("Attempting to connect to {}", CommonName()));
-						Socket_->connect(Destination, Poco::Timespan(20, 0));
-						Socket_->completeHandshake();
-
-						if (!Pool_.authConfig.servers[ServerIndex_].allowSelfSigned) {
-							Socket_->verifyPeerCertificate();
-						}
-
-						if (Socket_->havePeerCertificate()) {
-							Peer_Cert_ = std::make_unique<Poco::Crypto::X509Certificate>(
-								Socket_->peerCertificate());
-						}
-
-						Socket_->setBlocking(false);
-						Socket_->setNoDelay(true);
-						Socket_->setKeepAlive(true);
-						Socket_->setReceiveTimeout(Poco::Timespan(1 * 60 * 60, 0));
-
-						Reactor_.addEventHandler(
-							*Socket_,
-							Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-								*this, &RADIUS_Destination::onData));
-						Reactor_.addEventHandler(
-							*Socket_, Poco::NObserver<RADIUS_Destination, Poco::Net::ErrorNotification>(
-										  *this, &RADIUS_Destination::onError));
-						Reactor_.addEventHandler(
-							*Socket_,
-							Poco::NObserver<RADIUS_Destination, Poco::Net::ShutdownNotification>(
-								*this, &RADIUS_Destination::onShutdown));
-
-						Connected_ = true;
-						poco_information(Logger_, fmt::format("Connected. CN={}", CommonName()));
-						return true;
-					} catch (const Poco::Net::NetException &E) {
-						poco_warning(Logger_, "NetException: Could not connect.");
-						Logger_.log(E);
-					} catch (const Poco::Exception &E) {
-						poco_warning(Logger_, "Exception: Could not connect.");
-						Logger_.log(E);
-					} catch (...) {
-						poco_warning(Logger_, "Could not connect.");
-					}
-					ServerIndex_++;
-				}
-			}
-			ServerIndex_=0;
-			return false;
-		}
-
-		inline bool Connect_Orion() {
-			if (TryAgain_) {
-				std::lock_guard G(LocalMutex_);
-
-				Poco::TemporaryFile CertFile_(MicroServiceDataDirectory());
-				Poco::TemporaryFile KeyFile_(MicroServiceDataDirectory());
-				std::vector<std::unique_ptr<Poco::TemporaryFile>> CaCertFiles_;
-
-				DecodeFile(CertFile_.path(), Pool_.acctConfig.servers[ServerIndex_].radsecCert);
-				DecodeFile(KeyFile_.path(), Pool_.acctConfig.servers[ServerIndex_].radsecKey);
-
-				Poco::Crypto::X509Certificate	Cert(CertFile_.path());
-				if(IsExpired(Cert)) {
-					poco_error(Logger_, fmt::format("Certificate for {} has expired. We cannot connect to this server.", Pool_.acctConfig.servers[ServerIndex_].name));
-					return false;
-				}
-
-				for (auto &cert : Pool_.acctConfig.servers[ServerIndex_].radsecCacerts) {
-					CaCertFiles_.emplace_back(
-						std::make_unique<Poco::TemporaryFile>(MicroServiceDataDirectory()));
-					DecodeFile(CaCertFiles_[CaCertFiles_.size() - 1]->path(), cert);
-				}
-
-				Poco::Net::Context::Ptr SecureContext =
-					Poco::AutoPtr<Poco::Net::Context>(new Poco::Net::Context(
-						Poco::Net::Context::TLS_CLIENT_USE, KeyFile_.path(), CertFile_.path(), ""));
-				if (Pool_.acctConfig.servers[ServerIndex_].allowSelfSigned) {
-					SecureContext->setSecurityLevel(Poco::Net::Context::SECURITY_LEVEL_NONE);
-					SecureContext->enableExtendedCertificateVerification(false);
-				}
-
-				for (const auto &ca : CaCertFiles_) {
-					Poco::Crypto::X509Certificate cert(ca->path());
-					SecureContext->addCertificateAuthority(cert);
-				}
-
-				Socket_ = std::make_unique<Poco::Net::SecureStreamSocket>(SecureContext);
-				ServerIndex_ = 0 ;
-				for (const auto &PoolEntryServer : Pool_.acctConfig.servers) {
-					Poco::Net::SocketAddress Destination(PoolEntryServer.ip, PoolEntryServer.port);
-					try {
-						poco_information(Logger_, "Attempting to connect");
-						Socket_->connect(Destination, Poco::Timespan(100, 0));
-						Socket_->completeHandshake();
-
-						if (!Pool_.authConfig.servers[ServerIndex_].allowSelfSigned) {
-							Socket_->verifyPeerCertificate();
-						}
-
-						if (Socket_->havePeerCertificate()) {
-							Peer_Cert_ = std::make_unique<Poco::Crypto::X509Certificate>(
-								Socket_->peerCertificate());
-						}
-
-						Socket_->setBlocking(false);
-						Socket_->setNoDelay(true);
-						Socket_->setKeepAlive(true);
-						Socket_->setReceiveTimeout(Poco::Timespan(1 * 60 * 60, 0));
-
-						Reactor_.addEventHandler(
-							*Socket_,
-							Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-								*this, &RADIUS_Destination::onData));
-						Reactor_.addEventHandler(
-							*Socket_, Poco::NObserver<RADIUS_Destination, Poco::Net::ErrorNotification>(
-										  *this, &RADIUS_Destination::onError));
-						Reactor_.addEventHandler(
-							*Socket_,
-							Poco::NObserver<RADIUS_Destination, Poco::Net::ShutdownNotification>(
-								*this, &RADIUS_Destination::onShutdown));
-
-						Connected_ = true;
-						poco_information(Logger_, fmt::format("Connected. CN={}", CommonName()));
-						return true;
-					} catch (const Poco::Net::NetException &E) {
-						poco_information(Logger_, "Could not connect.");
-						Logger_.log(E);
-					} catch (const Poco::Exception &E) {
-						poco_information(Logger_, "Could not connect.");
-						Logger_.log(E);
-					} catch (...) {
-						poco_information(Logger_, "Could not connect.");
-					}
-					ServerIndex_++;
-				}
-			}
-			ServerIndex_=0;
-			return false;
-		}
-
-		inline bool Connect_Generic() {
-			if (TryAgain_) {
-				std::lock_guard G(LocalMutex_);
-
-				Poco::Net::SocketAddress AuthSockAddrV4(
-					Poco::Net::AddressFamily::IPv4,
-					MicroServiceConfigGetInt("radius.proxy.authentication.port",
-											 DEFAULT_RADIUS_AUTHENTICATION_PORT));
-				AuthenticationSocketV4_ =
-					std::make_unique<Poco::Net::DatagramSocket>(AuthSockAddrV4, true, true);
-
-				Poco::Net::SocketAddress AcctSockAddrV4(
-					Poco::Net::AddressFamily::IPv4,
-					MicroServiceConfigGetInt("radius.proxy.accounting.port",
-											 DEFAULT_RADIUS_ACCOUNTING_PORT));
-				AccountingSocketV4_ =
-					std::make_unique<Poco::Net::DatagramSocket>(AcctSockAddrV4, true, true);
-
-				Poco::Net::SocketAddress CoASockAddrV4(
-					Poco::Net::AddressFamily::IPv4,
-					MicroServiceConfigGetInt("radius.proxy.coa.port", DEFAULT_RADIUS_CoA_PORT));
-				CoASocketV4_ = std::make_unique<Poco::Net::DatagramSocket>(CoASockAddrV4, true, true);
-
-/*
-				AuthenticationSocketV6_ =
-					std::make_unique<Poco::Net::DatagramSocket>(AuthSockAddrV6, true, true);
- 				Poco::Net::SocketAddress AuthSockAddrV6(
-					Poco::Net::AddressFamily::IPv6,
-					MicroServiceConfigGetInt("radius.proxy.authentication.port",
-											 DEFAULT_RADIUS_AUTHENTICATION_PORT));
-
-				Poco::Net::SocketAddress AcctSockAddrV6(
-					Poco::Net::AddressFamily::IPv6,
-					MicroServiceConfigGetInt("radius.proxy.accounting.port",
-											 DEFAULT_RADIUS_ACCOUNTING_PORT));
-				AccountingSocketV6_ =
-					std::make_unique<Poco::Net::DatagramSocket>(AcctSockAddrV6, true, true);
-
-				Poco::Net::SocketAddress CoASockAddrV6(
-					Poco::Net::AddressFamily::IPv6,
-					MicroServiceConfigGetInt("radius.proxy.coa.port", DEFAULT_RADIUS_CoA_PORT));
-				CoASocketV6_ = std::make_unique<Poco::Net::DatagramSocket>(CoASockAddrV6, true, true);
-*/
-				Reactor_.addEventHandler(
-					*AuthenticationSocketV4_,
-					Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-						*this, &RADIUS_Destination::OnAuthenticationSocketReadable));
-				Reactor_.addEventHandler(
-					*AccountingSocketV4_,
-					Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-						*this, &RADIUS_Destination::OnAccountingSocketReadable));
-				Reactor_.addEventHandler(
-					*CoASocketV4_, Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-									   *this, &RADIUS_Destination::OnCoASocketReadable));
-/*
-				Reactor_.addEventHandler(
-					*AuthenticationSocketV6_,
-					Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-						*this, &RADIUS_Destination::OnAuthenticationSocketReadable));
-				Reactor_.addEventHandler(
-					*AccountingSocketV6_,
-					Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-						*this, &RADIUS_Destination::OnAccountingSocketReadable));
-
-				Reactor_.addEventHandler(
-					*CoASocketV6_, Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-									   *this, &RADIUS_Destination::OnCoASocketReadable));
-*/
-			}
-			return true;
-		}
-
-		inline bool Connect_Radsec() {
-			if (TryAgain_) {
-				std::lock_guard G(LocalMutex_);
-			}
-			return true;
-		}
-
-		inline bool Connect() {
-			switch(Type_) {
-			case GWObjects::RadiusEndpointType::orion: return Connect_Orion();
-			case GWObjects::RadiusEndpointType::globalreach: return Connect_GlobalReach();
-			case GWObjects::RadiusEndpointType::radsec: return Connect_Radsec();
-			default:
-				return Connect_Generic();
-			}
-		}
-
-		inline void Disconnect() {
-			if (Connected_) {
-				std::lock_guard G(LocalMutex_);
-				if(Type_==GWObjects::RadiusEndpointType::generic) {
-					if(AuthenticationSocketV4_) {
-						Reactor_.removeEventHandler(
-							*AuthenticationSocketV4_,
-							Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-								*this, &RADIUS_Destination::OnAuthenticationSocketReadable));
-						AuthenticationSocketV4_->close();
-						AuthenticationSocketV4_.reset();
-					}
-
-					if(AccountingSocketV4_) {
-						Reactor_.removeEventHandler(
-							*AccountingSocketV4_,
-							Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-								*this, &RADIUS_Destination::OnAccountingSocketReadable));
-						AccountingSocketV4_->close();
-						AccountingSocketV4_.reset();
-					}
-
-					if(CoASocketV4_) {
-						Reactor_.removeEventHandler(
-							*CoASocketV4_,
-							Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-								*this, &RADIUS_Destination::OnCoASocketReadable));
-						CoASocketV4_->close();
-						CoASocketV4_.reset();
-					}
-
-/*					if(AuthenticationSocketV6_) {
-						Reactor_.removeEventHandler(
-							*AuthenticationSocketV6_,
-							Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-								*this, &RADIUS_Destination::OnAuthenticationSocketReadable));
-						AuthenticationSocketV6_->close();
-						AuthenticationSocketV6_.reset();
-					}
-
-					if(AccountingSocketV6_) {
-						Reactor_.removeEventHandler(
-							*AccountingSocketV6_,
-							Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-								*this, &RADIUS_Destination::OnAccountingSocketReadable));
-						AccountingSocketV6_->close();
-						AccountingSocketV6_.reset();
-					}
-
-					if(CoASocketV6_) {
-						Reactor_.removeEventHandler(
-							*CoASocketV6_,
-							Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-								*this, &RADIUS_Destination::OnCoASocketReadable));
-						CoASocketV6_->close();
-						CoASocketV6_.reset();
-					}
-*/
-				} else {
-					if(Socket_!=nullptr) {
-						std::lock_guard G(LocalMutex_);
-						Reactor_.removeEventHandler(
-							*Socket_, Poco::NObserver<RADIUS_Destination, Poco::Net::ReadableNotification>(
-										  *this, &RADIUS_Destination::onData));
-						Reactor_.removeEventHandler(
-							*Socket_, Poco::NObserver<RADIUS_Destination, Poco::Net::ErrorNotification>(
-										  *this, &RADIUS_Destination::onError));
-						Reactor_.removeEventHandler(
-							*Socket_,
-							Poco::NObserver<RADIUS_Destination, Poco::Net::ShutdownNotification>(
-								*this, &RADIUS_Destination::onShutdown));
-						Socket_->close();
-					}
-				}
-			}
-			Connected_ = false;
-			poco_information(Logger_, "Disconnecting.");
-		}
-
-		static void DecodeFile(const std::string &filename, const std::string &s) {
-			std::ofstream sec_file(filename, std::ios_base::out | std::ios_base::trunc |
-												 std::ios_base::binary);
-			std::stringstream is(s);
-			Poco::Base64Decoder ds(is);
-			Poco::StreamCopier::copyStream(ds, sec_file);
-			sec_file.close();
-		}
-
-		[[nodiscard]] inline std::string CommonName() {
-			if (Peer_Cert_)
-				return Peer_Cert_->commonName();
-			return "";
-		}
-
-		[[nodiscard]] inline std::string IssuerName() {
-			if (Peer_Cert_)
-				return Peer_Cert_->issuerName();
-			return "";
-		}
-
-		[[nodiscard]] inline std::string SubjectName() {
-			if (Peer_Cert_)
-				return Peer_Cert_->subjectName();
-			return "";
-		}
-
-		const auto &Pool() const { return Pool_; }
-		auto ServerType() const { return Type_; }
-
-		inline bool SendRadiusDataAuthData(const std::string &serialNumber, const unsigned char *buffer, std::size_t  size) {
-			poco_trace(Logger_, fmt::format("{}: Sending RADIUS Auth {} bytes.", serialNumber, size));
-			AuthenticationSocketV4_->sendTo(buffer, size, Poco::Net::SocketAddress(Pool_.authConfig.servers[0].ip, Pool_.authConfig.servers[0].port));
-			return true;
-		}
-
-		inline bool SendRadiusDataAcctData(const std::string &serialNumber, const unsigned char *buffer, std::size_t  size) {
-			poco_trace(Logger_, fmt::format("{}: Sending RADIUS Acct {} bytes.", serialNumber, size));
-			AccountingSocketV4_->sendTo(buffer, size, Poco::Net::SocketAddress(Pool_.acctConfig.servers[0].ip, Pool_.acctConfig.servers[0].port));
-			return true;
-		}
-
-		inline bool SendRadiusDataCoAData(const std::string &serialNumber, const unsigned char *buffer, std::size_t  size) {
-			poco_trace(Logger_, fmt::format("{}: Sending RADIUS CoA {} bytes.", serialNumber, size));
-			CoASocketV4_->sendTo(buffer, size, Poco::Net::SocketAddress(Pool_.coaConfig.servers[0].ip, Pool_.coaConfig.servers[0].port));
-			return true;
-		}
-
-	  private:
-		std::recursive_mutex 							LocalMutex_;
-		Poco::Net::SocketReactor 						&Reactor_;
-		Poco::Logger 									&Logger_;
-
-		std::unique_ptr<Poco::Net::SecureStreamSocket> 	Socket_;
-
-		std::unique_ptr<Poco::Net::DatagramSocket> 		AccountingSocketV4_;
-		std::unique_ptr<Poco::Net::DatagramSocket> 		AuthenticationSocketV4_;
-		std::unique_ptr<Poco::Net::DatagramSocket> 		CoASocketV4_;
-
-/*		std::unique_ptr<Poco::Net::DatagramSocket> 		CoASocketV6_;
-		std::unique_ptr<Poco::Net::DatagramSocket> 		AccountingSocketV6_;
-		std::unique_ptr<Poco::Net::DatagramSocket> 		AuthenticationSocketV6_;
-*/
-
-		Poco::Thread 									ReconnectThread_;
-		std::unique_ptr<Poco::Crypto::X509Certificate> 	Peer_Cert_;
-		volatile bool 									Connected_ = false;
-		volatile bool 									TryAgain_ = true;
-		enum GWObjects::RadiusEndpointType				Type_{GWObjects::RadiusEndpointType::unknown};
-		GWObjects::RadiusProxyPool						Pool_;
-		uint64_t 										ServerIndex_=0;
-	};
-} // namespace OpenWifi
--- a/src/RADIUS_helpers.h
+++ b/src/RADIUS_helpers.h
@@ -14,8 +14,6 @@
 #include "Poco/Net/SocketAddress.h"
 #include "Poco/StringTokenizer.h"

-#include <framework/utils.h>
-
 namespace OpenWifi::RADIUS {

 	//	Packet types
@@ -409,15 +407,6 @@ namespace OpenWifi::RADIUS {

 		friend std::ostream &operator<<(std::ostream &os, RadiusPacket const &P);

-		[[nodiscard]] inline std::string PacketTypeToString() const {
-
-			for(auto const &Name:radius_command_values) {
-				if(Name.cmd == P_.code)
-					return Name.name;
-			}
-			return "Unknown";
-		}
-
 		inline bool IsAuthentication() {
 			return (P_.code == RADIUS::Access_Request || P_.code == RADIUS::Access_Accept ||
 					P_.code == RADIUS::Access_Challenge || P_.code == RADIUS::Access_Reject ||
@@ -438,25 +427,6 @@ namespace OpenWifi::RADIUS {
 					P_.code == RADIUS::CoA_ACK || P_.code == RADIUS::CoA_NAK);
 		}

-		inline bool IsStatusMessageReply(std::string &ReplySource) {
-			std::string Result;
-			for (const auto &attribute : Attrs_) {
-				if (attribute.type == RADIUS::Attributes::PROXY_STATE) {
-					std::string Attr33;
-					// format is statis:server name
-					Attr33.assign((const char *)(const char *)&P_.attributes[attribute.pos],
-								  attribute.len);
-					auto Parts = Poco::StringTokenizer(Attr33, ":");
-					if(Parts.count() == 2 && Parts[0] == "status") {
-						ReplySource = Parts[1];
-						return true;
-					}
-					return false;
-				}
-			}
-			DBGLINE
-			return false;
-		}
 		void Log(std::ostream &os) {
 			uint16_t p = 0;

@@ -693,29 +663,6 @@ namespace OpenWifi::RADIUS {
 			return Result;
 		}

-		std::uint32_t ExtractProxyStateDestinationIPint() const {
-			std::string Result;
-			for (const auto &attribute : Attrs_) {
-				if (attribute.type == RADIUS::Attributes::PROXY_STATE && attribute.len > 2) {
-					std::string Attr33;
-					// format is
-
-					Attr33.assign((const char *)(const char *)&P_.attributes[attribute.pos],
-								  attribute.len);
-					auto Parts = Poco::StringTokenizer(Attr33, "|");
-					if (Parts.count() == 4) {
-						return Utils::IPtoInt(Parts[1]);
-					}
-					Parts = Poco::StringTokenizer(Attr33, ":");
-					if (Parts.count() == 4) {
-						return Utils::IPtoInt(Parts[1]);
-					}
-					return 0;
-				}
-			}
-			return 0;
-		}
-
 		std::string ExtractCallingStationID() const {
 			std::string Result;
 			for (const auto &attribute : Attrs_) {
@@ -1015,30 +962,27 @@ namespace OpenWifi::RADIUS {
 	  public:
 		explicit RadiusOutputPacket(const std::string &Secret) : Secret_(Secret) {}

-		inline void MakeStatusMessage(const std::string &Source) {
+		inline void MakeStatusMessage() {
 			P_.code = RADIUS::Status_Server;
 			P_.identifier = std::rand() & 0x00ff;
 			MakeRadiusAuthenticator(P_.authenticator);
 			unsigned char MessageAuthenticator[16]{0};
-			std::string FullSource = "status:" + Source;
-			AddAttribute(RADIUS::Attributes::PROXY_STATE, FullSource.size(), (const unsigned char *)FullSource.c_str());
 			AddAttribute(RADIUS::Attributes::MESSAGE_AUTHENTICATOR, sizeof(MessageAuthenticator),
 						 MessageAuthenticator);
-            // int PktLen = 1 + 1 + 2 + 16 + 1 + 1 + 16 ;
-			int PktLen = 1 + 1 + 2 + 16 + AttributesLen_;
+            int PktLen = 1 + 1 + 2 + 16 + 1 + 1 + 16;
 			P_.rawlen = htons(PktLen);

 			Poco::HMACEngine<Poco::MD5Engine> H(Secret_);
 			H.update((const unsigned char *)&P_, PktLen);
 			auto digest = H.digest();
-			int p = 0, offset = (int)FullSource.size() + 2 ;
+			int p = 0;
 			for (const auto &i : digest)
-				P_.attributes[offset + 1 + 1 + p++] = i;
+				P_.attributes[1 + 1 + p++] = i;
 		}

 		inline void AddAttribute(unsigned char attr, uint8_t len, const unsigned char *data) {
 			P_.attributes[AttributesLen_++] = attr;
-			P_.attributes[AttributesLen_++] = len+2;
+			P_.attributes[AttributesLen_++] = len;
 			memcpy(&P_.attributes[AttributesLen_], data, len);
 			AttributesLen_ += len;
 		}
--- a/src/RADIUS_proxy_server.cpp
+++ b/src/RADIUS_proxy_server.cpp
@@ -13,12 +13,10 @@

 namespace OpenWifi {

-/*
- 	const int SMALLEST_RADIUS_PACKET = 20 + 19 + 4;
+	const int SMALLEST_RADIUS_PACKET = 20 + 19 + 4;
 	const int DEFAULT_RADIUS_AUTHENTICATION_PORT = 1812;
 	const int DEFAULT_RADIUS_ACCOUNTING_PORT = 1813;
 	const int DEFAULT_RADIUS_CoA_PORT = 3799;
-*/

 	int RADIUS_proxy_server::Start() {

@@ -27,7 +25,7 @@ namespace OpenWifi {

 		Enabled_ = MicroServiceConfigGetBool("radius.proxy.enable", false);
 		if (!Enabled_ && !Config.exists()) {
-			StopRADIUSDestinations();
+			StopRADSECServers();
 			return 0;
 		}

@@ -35,81 +33,275 @@ namespace OpenWifi {

 		Enabled_ = true;

+		Poco::Net::SocketAddress AuthSockAddrV4(
+			Poco::Net::AddressFamily::IPv4,
+			MicroServiceConfigGetInt("radius.proxy.authentication.port",
+									 DEFAULT_RADIUS_AUTHENTICATION_PORT));
+		AuthenticationSocketV4_ =
+			std::make_unique<Poco::Net::DatagramSocket>(AuthSockAddrV4, true, true);
+		Poco::Net::SocketAddress AuthSockAddrV6(
+			Poco::Net::AddressFamily::IPv6,
+			MicroServiceConfigGetInt("radius.proxy.authentication.port",
+									 DEFAULT_RADIUS_AUTHENTICATION_PORT));
+		AuthenticationSocketV6_ =
+			std::make_unique<Poco::Net::DatagramSocket>(AuthSockAddrV6, true, true);
+
+		Poco::Net::SocketAddress AcctSockAddrV4(
+			Poco::Net::AddressFamily::IPv4,
+			MicroServiceConfigGetInt("radius.proxy.accounting.port",
+									 DEFAULT_RADIUS_ACCOUNTING_PORT));
+		AccountingSocketV4_ =
+			std::make_unique<Poco::Net::DatagramSocket>(AcctSockAddrV4, true, true);
+		Poco::Net::SocketAddress AcctSockAddrV6(
+			Poco::Net::AddressFamily::IPv6,
+			MicroServiceConfigGetInt("radius.proxy.accounting.port",
+									 DEFAULT_RADIUS_ACCOUNTING_PORT));
+		AccountingSocketV6_ =
+			std::make_unique<Poco::Net::DatagramSocket>(AcctSockAddrV6, true, true);
+
+		Poco::Net::SocketAddress CoASockAddrV4(
+			Poco::Net::AddressFamily::IPv4,
+			MicroServiceConfigGetInt("radius.proxy.coa.port", DEFAULT_RADIUS_CoA_PORT));
+		CoASocketV4_ = std::make_unique<Poco::Net::DatagramSocket>(CoASockAddrV4, true, true);
+		Poco::Net::SocketAddress CoASockAddrV6(
+			Poco::Net::AddressFamily::IPv6,
+			MicroServiceConfigGetInt("radius.proxy.coa.port", DEFAULT_RADIUS_CoA_PORT));
+		CoASocketV6_ = std::make_unique<Poco::Net::DatagramSocket>(CoASockAddrV6, true, true);
+
+		RadiusReactor_.reset();
+		RadiusReactor_ = std::make_unique<Poco::Net::SocketReactor>();
+		RadiusReactor_->addEventHandler(
+			*AuthenticationSocketV4_,
+			Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+				*this, &RADIUS_proxy_server::OnAuthenticationSocketReadable));
+		RadiusReactor_->addEventHandler(
+			*AuthenticationSocketV6_,
+			Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+				*this, &RADIUS_proxy_server::OnAuthenticationSocketReadable));
+
+		RadiusReactor_->addEventHandler(
+			*AccountingSocketV4_,
+			Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+				*this, &RADIUS_proxy_server::OnAccountingSocketReadable));
+		RadiusReactor_->addEventHandler(
+			*AccountingSocketV6_,
+			Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+				*this, &RADIUS_proxy_server::OnAccountingSocketReadable));
+
+		RadiusReactor_->addEventHandler(
+			*CoASocketV4_, Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+							   *this, &RADIUS_proxy_server::OnCoASocketReadable));
+		RadiusReactor_->addEventHandler(
+			*CoASocketV6_, Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+							   *this, &RADIUS_proxy_server::OnCoASocketReadable));
+
 		ParseConfig();
-		StartRADIUSDestinations();
-		RadiusReactorThread_.start(RadiusReactor_);
+		StartRADSECServers();
+		RadiusReactorThread_.start(*RadiusReactor_);
 		Utils::SetThreadName(RadiusReactorThread_, "rad:reactor");
 		Running_ = true;
+
 		return 0;
 	}

 	void RADIUS_proxy_server::Stop() {
 		if (Enabled_ && Running_) {
 			poco_information(Logger(), "Stopping...");
+			RadiusReactor_->removeEventHandler(
+				*AuthenticationSocketV4_,
+				Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+					*this, &RADIUS_proxy_server::OnAuthenticationSocketReadable));
+			RadiusReactor_->removeEventHandler(
+				*AuthenticationSocketV6_,
+				Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+					*this, &RADIUS_proxy_server::OnAuthenticationSocketReadable));

-			StopRADIUSDestinations();
-			RadiusReactor_.stop();
+			RadiusReactor_->removeEventHandler(
+				*AccountingSocketV4_,
+				Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+					*this, &RADIUS_proxy_server::OnAccountingSocketReadable));
+			RadiusReactor_->removeEventHandler(
+				*AccountingSocketV6_,
+				Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+					*this, &RADIUS_proxy_server::OnAccountingSocketReadable));
+
+			RadiusReactor_->removeEventHandler(
+				*CoASocketV4_,
+				Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+					*this, &RADIUS_proxy_server::OnCoASocketReadable));
+			RadiusReactor_->removeEventHandler(
+				*CoASocketV6_,
+				Poco::NObserver<RADIUS_proxy_server, Poco::Net::ReadableNotification>(
+					*this, &RADIUS_proxy_server::OnCoASocketReadable));
+
+			AuthenticationSocketV4_->close();
+			AuthenticationSocketV6_->close();
+			AccountingSocketV4_->close();
+			AccountingSocketV6_->close();
+			CoASocketV4_->close();
+			CoASocketV6_->close();
+
+			AuthenticationSocketV4_.reset();
+			AuthenticationSocketV6_.reset();
+			AccountingSocketV4_.reset();
+			AccountingSocketV6_.reset();
+			CoASocketV4_.reset();
+			CoASocketV6_.reset();
+
+			StopRADSECServers();
+			RadiusReactor_->stop();
 			RadiusReactorThread_.join();
 			Running_ = false;
 			poco_information(Logger(), "Stopped...");
 		}
 	}

-/*	inline static bool isRadsec(const GWObjects::RadiusProxyPool &Cfg) {
-		return Cfg.radsecPoolType=="orion" || Cfg.radsecPoolType=="globalreach" || Cfg.radsecPoolType=="radsec";
-	}
- */
-
-	void RADIUS_proxy_server::StartRADIUSDestinations() {
+	void RADIUS_proxy_server::StartRADSECServers() {
 		std::lock_guard G(Mutex_);
 		for (const auto &pool : PoolList_.pools) {
-			if(pool.enabled) {
-				RADIUS_Destinations_[Utils::IPtoInt(pool.poolProxyIp)] =
-						std::make_unique<RADIUS_Destination>(RadiusReactor_, pool);
-			} else {
-				poco_information(Logger(),fmt::format("Pool {} is not enabled.", pool.name));
+			for (const auto &entry : pool.authConfig.servers) {
+				if (entry.radsec) {
+					RADSECservers_[Poco::Net::SocketAddress(entry.ip, 0)] =
+						std::make_unique<RADSEC_server>(*RadiusReactor_, entry);
+				}
 			}
 		}
 	}

-	void RADIUS_proxy_server::StopRADIUSDestinations() {
+	void RADIUS_proxy_server::StopRADSECServers() {
 		std::lock_guard G(Mutex_);
-		RADIUS_Destinations_.clear();
+		RADSECservers_.clear();
 	}

-	void RADIUS_proxy_server::RouteAndSendAccountingPacket(const std::string &Destination,const std::string &serialNumber, RADIUS::RadiusPacket &P, bool RecomputeAuthenticator, std::string &Secret) {
-		try{
+	void RADIUS_proxy_server::OnAccountingSocketReadable(
+		const Poco::AutoPtr<Poco::Net::ReadableNotification> &pNf) {
+		Poco::Net::SocketAddress Sender;
+		RADIUS::RadiusPacket P;

-			//	are we sending this to a pool?
-			auto DstParts = Utils::Split(Destination, ':');
-			std::uint32_t DtsIp = Utils::IPtoInt(DstParts[0]);
+		auto ReceiveSize = pNf->socket().impl()->receiveBytes(P.Buffer(), P.BufferLen());
+		if (ReceiveSize < SMALLEST_RADIUS_PACKET) {
+			poco_warning(Logger(), "Accounting: bad packet received.");
+			return;
+		}
+		P.Evaluate(ReceiveSize);
+		auto SerialNumber = P.ExtractSerialNumberFromProxyState();
+		if (SerialNumber.empty()) {
+			poco_warning(Logger(), "Accounting: missing serial number. Dropping request.");
+			return;
+		}
+		poco_debug(
+			Logger(),
+			fmt::format(
+				"Accounting Packet Response received for {}", SerialNumber ));
+		AP_WS_Server()->SendRadiusAccountingData(SerialNumber, P.Buffer(), P.Size());
+	}
+
+	void RADIUS_proxy_server::OnAuthenticationSocketReadable(
+		const Poco::AutoPtr<Poco::Net::ReadableNotification> &pNf) {
+		Poco::Net::SocketAddress Sender;
+		RADIUS::RadiusPacket P;
+
+		auto ReceiveSize = pNf->socket().impl()->receiveBytes(P.Buffer(), P.BufferLen());
+		if (ReceiveSize < SMALLEST_RADIUS_PACKET) {
+			poco_warning(Logger(), "Authentication: bad packet received.");
+			return;
+		}
+		P.Evaluate(ReceiveSize);
+
+		if(P.PacketTypeInt()==OpenWifi::RADIUS::Access_Accept) {
+			P.Log(std::cout);
+		}
+		auto SerialNumber = P.ExtractSerialNumberFromProxyState();
+		if (SerialNumber.empty()) {
+			poco_warning(Logger(), "Authentication: missing serial number. Dropping request.");
+			return;
+		}
+		auto CallingStationID = P.ExtractCallingStationID();
+		auto CalledStationID = P.ExtractCalledStationID();
+
+		poco_debug(
+			Logger(),
+			fmt::format(
+				"Authentication Packet received for {}, CalledStationID: {}, CallingStationID:{}",
+				SerialNumber, CalledStationID, CallingStationID));
+		AP_WS_Server()->SendRadiusAuthenticationData(SerialNumber, P.Buffer(), P.Size());
+	}
+
+	void RADIUS_proxy_server::OnCoASocketReadable(
+		const Poco::AutoPtr<Poco::Net::ReadableNotification> &pNf) {
+		Poco::Net::SocketAddress Sender;
+		RADIUS::RadiusPacket P;
+
+		auto ReceiveSize = pNf.get()->socket().impl()->receiveBytes(P.Buffer(), P.BufferLen());
+		if (ReceiveSize < SMALLEST_RADIUS_PACKET) {
+			poco_warning(Logger(), "CoA/DM: bad packet received.");
+			return;
+		}
+
+		P.Evaluate(ReceiveSize);
+		auto SerialNumber = P.ExtractSerialNumberTIP();
+		if (SerialNumber.empty()) {
+			poco_warning(Logger(), "CoA/DM: missing serial number. Dropping request.");
+			return;
+		}
+		auto CallingStationID = P.ExtractCallingStationID();
+		auto CalledStationID = P.ExtractCalledStationID();
+
+		poco_debug(
+			Logger(),
+			fmt::format("CoA Packet received for {}, CalledStationID: {}, CallingStationID:{}",
+						SerialNumber, CalledStationID, CallingStationID));
+		AP_WS_Server()->SendRadiusCoAData(SerialNumber, P.Buffer(), P.Size());
+	}
+
+	void RADIUS_proxy_server::RouteAndSendAccountingPacket(const std::string &Destination, const std::string &serialNumber, RADIUS::RadiusPacket &P, bool RecomputeAuthenticator, std::string & secret) {
+		try{
+			auto CallingStationID = P.ExtractCallingStationID();
+			auto CalledStationID = P.ExtractCalledStationID();
+			Poco::Net::SocketAddress Dst(Destination);

 			std::lock_guard G(Mutex_);
-
-			auto DestinationServer = RADIUS_Destinations_.find(DtsIp);
-			if (DestinationServer != end(RADIUS_Destinations_)) {
-				if(Logger().trace()) {
-					auto CallingStationID = P.ExtractCallingStationID();
-					auto CalledStationID = P.ExtractCalledStationID();
-					auto SessionID = P.ExtractAccountingSessionID();
-					auto MultiSessionID = P.ExtractAccountingMultiSessionID();
-					Logger().trace(
-						fmt::format("{}: Sending Accounting {} bytes to {}. CalledStationID={} CallingStationID={} SessionID={}:{}",
-									serialNumber, P.Size(),
-									DestinationServer->second->Pool().authConfig.servers[0].ip,
-									CalledStationID, CallingStationID, SessionID, MultiSessionID));
-				}
-				if(DestinationServer->second->ServerType()!=GWObjects::RadiusEndpointType::generic) {
-					Secret = DestinationServer->second->Pool().acctConfig.servers[0].secret;
+			bool UseRADSEC = false;
+			auto FinalDestination = Route(radius_type::acct, Dst, P, UseRADSEC, secret);
+			if (UseRADSEC) {
+				Poco::Net::SocketAddress RSP(FinalDestination.host(), 0);
+				auto DestinationServer = RADSECservers_.find(RSP);
+				if (DestinationServer != end(RADSECservers_)) {
 					if(RecomputeAuthenticator) {
-						P.RecomputeAuthenticator(Secret);
+						P.RecomputeAuthenticator("radsec");
 					}
-					DestinationServer->second->SendData(serialNumber, (const unsigned char *)P.Buffer(),
-														P.Size());
-				} else {
-					DestinationServer->second->SendRadiusDataAcctData(
-						serialNumber, (const unsigned char *)P.Buffer(), P.Size());
+					DestinationServer->second->SendData(serialNumber, P.Buffer(), P.Size());
 				}
+			} else {
+				if ((Dst.family() == Poco::Net::SocketAddress::IPv4 &&
+					 AccountingSocketV4_ == nullptr) ||
+					(Dst.family() == Poco::Net::SocketAddress::IPv6 &&
+					 AccountingSocketV6_ == nullptr)) {
+					poco_debug(
+						Logger(),
+						fmt::format(
+							"ACCT: Trying to use RADIUS GW PROXY but not configured. Device={}",
+							serialNumber));
+					return;
+				}
+
+				if(RecomputeAuthenticator) {
+					P.RecomputeAuthenticator(secret);
+				}
+
+				auto AllSent =
+					SendData(Dst.family() == Poco::Net::SocketAddress::IPv4 ? *AccountingSocketV4_
+																			: *AccountingSocketV6_
+							 , P.Buffer(), P.Size(), FinalDestination);
+				if (!AllSent)
+					poco_error(Logger(),
+							   fmt::format("{}: Could not send Accounting packet packet to {}.",
+										   serialNumber, Destination));
+				else
+					poco_debug(Logger(), fmt::format("{}: Sending Accounting Packet to {}, "
+													 "CalledStationID: {}, CallingStationID:{}",
+													 serialNumber, FinalDestination.toString(),
+													 CalledStationID, CallingStationID));
 			}
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
@@ -129,8 +321,8 @@ namespace OpenWifi {
 		ofs.close();
 	}

-	void RADIUS_proxy_server::SendAccountingData( const std::string &serialNumber,
-												 const char *buffer, std::size_t size) {
+	void RADIUS_proxy_server::SendAccountingData(const std::string &serialNumber,
+												 const char *buffer, std::size_t size, std::string & secret) {

 		if (!Continue())
 			return;
@@ -138,9 +330,9 @@ namespace OpenWifi {
 		try {
 			RADIUS::RadiusPacket P((unsigned char *)buffer, size);
 			auto Destination = P.ExtractProxyStateDestination();
-			std::string Secret;
-			RouteAndSendAccountingPacket(Destination, serialNumber, P, false, Secret);
-			RADIUSSessionTracker()->AddAccountingSession(Destination, serialNumber, P, Secret);
+			RouteAndSendAccountingPacket(Destination, serialNumber, P, false, secret);
+			RADIUSSessionTracker()->AddAccountingSession(Destination, serialNumber, P, secret);
+
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
 		} catch (...) {
@@ -155,38 +347,55 @@ namespace OpenWifi {
 	}

 	void RADIUS_proxy_server::SendAuthenticationData(const std::string &serialNumber,
-													 const char *buffer, std::size_t size) {
+													 const char *buffer, std::size_t size, std::string & secret) {

 		if (!Continue())
 			return;

 		try {
 			RADIUS::RadiusPacket P((unsigned char *)buffer, size);
+			auto Destination = P.ExtractProxyStateDestination();
+			auto CallingStationID = P.ExtractCallingStationID();
+			auto CalledStationID = P.ExtractCalledStationID();
+			Poco::Net::SocketAddress Dst(Destination);

 			std::lock_guard G(Mutex_);
+			bool UseRADSEC = false;
+			auto FinalDestination = Route(radius_type::auth, Dst, P, UseRADSEC, secret);
+			RADIUSSessionTracker()->AddAuthenticationSession(Destination, serialNumber, P, secret);

-			std::uint32_t 	DstIp = P.ExtractProxyStateDestinationIPint();
-			auto DestinationServer = RADIUS_Destinations_.find(DstIp);
-			if (DestinationServer != end(RADIUS_Destinations_)) {
-				if(Logger().trace()) {
-					auto CallingStationID = P.ExtractCallingStationID();
-					auto CalledStationID = P.ExtractCalledStationID();
-					auto SessionID = P.ExtractAccountingSessionID();
-					auto MultiSessionID = P.ExtractAccountingMultiSessionID();
-					Logger().trace(
-						fmt::format("{}: Sending Authentication {} bytes to {}. CalledStationID={} CallingStationID={} SessionID={}:{}",
-									serialNumber, P.Size(),
-									DestinationServer->second->Pool().authConfig.servers[0].ip,
-									CalledStationID, CallingStationID, SessionID, MultiSessionID));
+			if (UseRADSEC) {
+				Poco::Net::SocketAddress RSP(FinalDestination.host(), 0);
+				auto DestinationServer = RADSECservers_.find(RSP);
+				if (DestinationServer != end(RADSECservers_)) {
+					DestinationServer->second->SendData(serialNumber, (const unsigned char *)buffer,
+														size);
 				}
-				if(DestinationServer->second->ServerType()!=GWObjects::RadiusEndpointType::generic) {
-						DestinationServer->second->SendData(serialNumber,
-															(const unsigned char *)buffer, size);
-				}
-				else {
-					DestinationServer->second->SendRadiusDataAuthData(
-						serialNumber, (const unsigned char *)buffer, size);
+			} else {
+				if ((Dst.family() == Poco::Net::SocketAddress::IPv4 &&
+					 AuthenticationSocketV4_ == nullptr) ||
+					(Dst.family() == Poco::Net::SocketAddress::IPv6 &&
+					 AuthenticationSocketV6_ == nullptr)) {
+					poco_debug(
+						Logger(),
+						fmt::format(
+							"AUTH: Trying to use RADIUS GW PROXY but not configured. Device={}",
+							serialNumber));
+					return;
 				}
+				auto AllSent = SendData(Dst.family() == Poco::Net::SocketAddress::IPv4
+											? *AuthenticationSocketV4_
+											: *AuthenticationSocketV6_,
+										(const unsigned char *)buffer, size, FinalDestination);
+				if (!AllSent)
+					poco_error(Logger(),
+							   fmt::format("{}: Could not send Authentication packet packet to {}.",
+										   serialNumber, Destination));
+				else
+					poco_debug(Logger(), fmt::format("{}: Sending Authentication Packet to {}, "
+													 "CalledStationID: {}, CallingStationID:{}",
+													 serialNumber, FinalDestination.toString(),
+													 CalledStationID, CallingStationID));
 			}
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
@@ -197,42 +406,70 @@ namespace OpenWifi {
 	}

 	void RADIUS_proxy_server::SendCoAData(const std::string &serialNumber, const char *buffer,
-										  std::size_t size) {
+										  std::size_t size, std::string & secret) {

 		if (!Continue())
 			return;

 		try {
 			RADIUS::RadiusPacket P((unsigned char *)buffer, size);
-			auto CallingStationID = P.ExtractCallingStationID();
-			auto CalledStationID = P.ExtractCalledStationID();
-			Poco::Net::SocketAddress Dst(Destination);
+			auto Destination = P.ExtractProxyStateDestination();

+			if (Destination.empty()) {
+				Destination = "0.0.0.0:0";
+			}
+
+			P.Log(std::cout);
+
+			if(Destination.empty()) {
+				std::cout << "No destination in CoA. Dropped." << std::endl;
+				return;
+			}
+
+			Poco::Net::SocketAddress Dst(Destination);
 			std::lock_guard G(Mutex_);
-			std::uint32_t 	DstIp = P.ExtractProxyStateDestinationIPint();
-			auto DestinationServer = RADIUS_Destinations_.find(DstIp);
-			if (DestinationServer != end(RADIUS_Destinations_)) {
-				poco_trace(Logger(),fmt::format("{}: Sending CoA {} bytes to {}", serialNumber, P.Size(), DestinationServer->second->Pool().coaConfig.servers[0].ip));
-				if(DestinationServer->second->ServerType()!=GWObjects::RadiusEndpointType::generic) {
+			bool UseRADSEC = false;
+			auto FinalDestination = Route(radius_type::coa, Dst, P, UseRADSEC, secret);
+			if (UseRADSEC) {
+				Poco::Net::SocketAddress RSP(FinalDestination.host(), 0);
+				auto DestinationServer = RADSECservers_.find(RSP);
+				if (DestinationServer != end(RADSECservers_)) {
 					DestinationServer->second->SendData(serialNumber, (const unsigned char *)buffer,
 														size);
-				} else {
-					DestinationServer->second->SendRadiusDataCoAData(
-						serialNumber, (const unsigned char *)buffer, size);
 				}
+			} else {
+				if ((Dst.family() == Poco::Net::SocketAddress::IPv4 && CoASocketV4_ == nullptr) ||
+					(Dst.family() == Poco::Net::SocketAddress::IPv6 && CoASocketV6_ == nullptr)) {
+					poco_debug(
+						Logger(),
+						fmt::format(
+							"CoA: Trying to use RADIUS GW PROXY but not configured. Device={}",
+							serialNumber));
+					return;
+				}
+				auto AllSent = SendData(
+					Dst.family() == Poco::Net::SocketAddress::IPv4 ? *CoASocketV4_ : *CoASocketV6_,
+					(const unsigned char *)buffer, size, FinalDestination);
+				if (!AllSent) {
+					poco_error(Logger(), fmt::format("{}: Could not send CoA packet packet to {}.",
+													 serialNumber, Destination));
+				}
+				else
+					poco_debug(Logger(), fmt::format("{}: Sending CoA Packet to {}", serialNumber,
+													 FinalDestination.toString()));
 			}
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
 		} catch (...) {
 			poco_warning(Logger(),
-						 fmt::format("Bad RADIUS AUTH Packet from {}. Dropped.", serialNumber));
+						 fmt::format("Bad RADIUS CoA/DM Packet from {}. Dropped.", serialNumber));
 		}
 	}

 	void RADIUS_proxy_server::ParseServerList(const GWObjects::RadiusProxyServerConfig &Config,
 											  std::vector<Destination> &V4,
-											  std::vector<Destination> &V6, bool setAsDefault,
-											  const std::string &poolProxyIp) {
+
+											  std::vector<Destination> &V6, bool setAsDefault) {
 		uint64_t TotalV4 = 0, TotalV6 = 0;

 		for (const auto &server : Config.servers) {
@@ -256,8 +493,7 @@ namespace OpenWifi {
 						  .useAsDefault = setAsDefault,
 						  .useRADSEC = server.radsec,
 						  .realms = server.radsecRealms,
-						  .secret = server.secret,
-						  .poolProxyIp = poolProxyIp};
+						  .secret = server.secret };

 			if (setAsDefault && D.useRADSEC)
 				DefaultIsRADSEC_ = true;
@@ -306,11 +542,11 @@ namespace OpenWifi {
 					for (const auto &pool : RPC.pools) {
 						RadiusPool NewPool;
 						ParseServerList(pool.authConfig, NewPool.AuthV4, NewPool.AuthV6,
-										pool.useByDefault, pool.poolProxyIp);
+										pool.useByDefault);
 						ParseServerList(pool.acctConfig, NewPool.AcctV4, NewPool.AcctV6,
-										pool.useByDefault, pool.poolProxyIp);
+										pool.useByDefault);
 						ParseServerList(pool.coaConfig, NewPool.CoaV4, NewPool.CoaV6,
-										pool.useByDefault, pool.poolProxyIp);
+										pool.useByDefault);
 						Pools_.push_back(NewPool);
 					}
 				} else {
@@ -329,7 +565,6 @@ namespace OpenWifi {
 		}
 	}

-/*
 	static bool RealmMatch(const std::string &user_realm, const std::string &realm) {
 		if (realm.find_first_of('*') == std::string::npos)
 			return user_realm == realm;
@@ -415,36 +650,29 @@ namespace OpenWifi {
 		}

 		auto isAddressInPool = [&](const std::vector<Destination> &D, bool &UseRADSEC) -> bool {
-			for (const auto &entry : D) {
-				if (!entry.poolProxyIp.empty() &&
-					entry.poolProxyIp == RequestedAddress.host().toString()) {
-					UseRADSEC = entry.useRADSEC;
-					return true;
-				}
+			for (const auto &entry : D)
 				if (entry.Addr.host() == RequestedAddress.host()) {
 					UseRADSEC = entry.useRADSEC;
 					return true;
 				}
-			}
 			return false;
 		};

-		for (auto &pool : Pools_) {
-			// try and match the pool's address to the destination
+		for (auto &i : Pools_) {
 			switch (rtype) {
 			case radius_type::coa: {
-				if (isAddressInPool((IsV4 ? pool.CoaV4 : pool.CoaV6), UseRADSEC)) {
-					return ChooseAddress(IsV4 ? pool.CoaV4 : pool.CoaV6, RequestedAddress, Secret);
+				if (isAddressInPool((IsV4 ? i.CoaV4 : i.CoaV6), UseRADSEC)) {
+					return ChooseAddress(IsV4 ? i.CoaV4 : i.CoaV6, RequestedAddress, Secret);
 				}
 			} break;
 			case radius_type::auth: {
-				if (isAddressInPool((IsV4 ? pool.AuthV4 : pool.AuthV6), UseRADSEC)) {
-					return ChooseAddress(IsV4 ? pool.AuthV4 : pool.AuthV6, RequestedAddress, Secret);
+				if (isAddressInPool((IsV4 ? i.AuthV4 : i.AuthV6), UseRADSEC)) {
+					return ChooseAddress(IsV4 ? i.AuthV4 : i.AuthV6, RequestedAddress, Secret);
 				}
 			} break;
 			case radius_type::acct: {
-				if (isAddressInPool((IsV4 ? pool.AcctV4 : pool.AcctV6), UseRADSEC)) {
-					return ChooseAddress(IsV4 ? pool.AcctV4 : pool.AcctV6, RequestedAddress, Secret);
+				if (isAddressInPool((IsV4 ? i.AcctV4 : i.AcctV6), UseRADSEC)) {
+					return ChooseAddress(IsV4 ? i.AcctV4 : i.AcctV6, RequestedAddress, Secret);
 				}
 			} break;
 			}
@@ -461,8 +689,11 @@ namespace OpenWifi {

 		if (Pool.size() == 1) {
 			Secret = Pool[0].secret;
-			auto A = Pool[0].Addr;
-			return A;
+			return Pool[0].Addr;
+		}
+
+		if(Pool.empty()) {
+			std::cout << __LINE__ << std::endl;
 		}

 		if (Pool[0].strategy == "weighted") {
@@ -508,7 +739,7 @@ namespace OpenWifi {
 			}

 			if (!found) {
-//				return OriginalAddress;
+				return OriginalAddress;
 			}

 			Pool[index].state += 1;
@@ -524,7 +755,7 @@ namespace OpenWifi {
 		}
 		return OriginalAddress;
 	}
-*/
+
 	void RADIUS_proxy_server::SetConfig(const GWObjects::RadiusProxyPoolList &C) {
 		std::lock_guard G(Mutex_);

--- a/src/RADIUS_proxy_server.h
+++ b/src/RADIUS_proxy_server.h
@@ -11,7 +11,7 @@

 #include "framework/SubSystemServer.h"

-#include "RADIUS_Destination.h"
+#include "RADSEC_server.h"

 namespace OpenWifi {

@@ -28,19 +28,25 @@ namespace OpenWifi {
 		void Stop() final;
 		inline bool Enabled() const { return Enabled_; }

-		void SendAccountingData(const std::string &serialNumber, const char *buffer, std::size_t size);
-		void SendAuthenticationData(const std::string &serialNumber, const char *buffer,
-									std::size_t size);
-		void SendCoAData(const std::string &serialNumber, const char *buffer, std::size_t size);
+		void OnAccountingSocketReadable(const Poco::AutoPtr<Poco::Net::ReadableNotification> &pNf);
+		void
+		OnAuthenticationSocketReadable(const Poco::AutoPtr<Poco::Net::ReadableNotification> &pNf);
+		void OnCoASocketReadable(const Poco::AutoPtr<Poco::Net::ReadableNotification> &pNf);

-		void RouteAndSendAccountingPacket(const std::string &Destination, const std::string &serialNumber, RADIUS::RadiusPacket &P, bool reComputeAuthenticator, std::string &Secret);
+		void SendAccountingData(const std::string &serialNumber, const char *buffer,
+								std::size_t size, std::string & secret);
+		void SendAuthenticationData(const std::string &serialNumber, const char *buffer,
+									std::size_t size, std::string & secret);
+		void SendCoAData(const std::string &serialNumber, const char *buffer, std::size_t size, std::string & secret);
+
+		void RouteAndSendAccountingPacket(const std::string &Destination, const std::string &serialNumber, RADIUS::RadiusPacket &P, bool reComputeAuthenticator, std::string & secret);

 		void SetConfig(const GWObjects::RadiusProxyPoolList &C);
 		void DeleteConfig();
 		void GetConfig(GWObjects::RadiusProxyPoolList &C);

-		void StartRADIUSDestinations();
-		void StopRADIUSDestinations();
+		void StartRADSECServers();
+		void StopRADSECServers();

 		struct Destination {
 			Poco::Net::SocketAddress Addr;
@@ -56,19 +62,24 @@ namespace OpenWifi {
 			bool useRADSEC = false;
 			std::vector<std::string> realms;
 			std::string secret;
-			std::string poolProxyIp;
 		};

 		inline bool Continue() const { return Running_ && Enabled_ && !Pools_.empty(); }

 	  private:
-		Poco::Net::SocketReactor 	RadiusReactor_;
-		Poco::Thread 				RadiusReactorThread_;
+		std::unique_ptr<Poco::Net::DatagramSocket> AccountingSocketV4_;
+		std::unique_ptr<Poco::Net::DatagramSocket> AccountingSocketV6_;
+		std::unique_ptr<Poco::Net::DatagramSocket> AuthenticationSocketV4_;
+		std::unique_ptr<Poco::Net::DatagramSocket> AuthenticationSocketV6_;
+		std::unique_ptr<Poco::Net::DatagramSocket> CoASocketV4_;
+		std::unique_ptr<Poco::Net::DatagramSocket> CoASocketV6_;
+		std::unique_ptr<Poco::Net::SocketReactor> RadiusReactor_;
+		Poco::Thread RadiusReactorThread_;

 		GWObjects::RadiusProxyPoolList PoolList_;
 		std::string ConfigFilename_;

-		std::map<std::uint32_t, std::unique_ptr<RADIUS_Destination>> RADIUS_Destinations_;
+		std::map<Poco::Net::SocketAddress, std::unique_ptr<RADSEC_server>> RADSECservers_;

 		struct RadiusPool {
 			std::vector<Destination> AuthV4;
@@ -93,21 +104,19 @@ namespace OpenWifi {

 		void ParseConfig();
 		void ResetConfig();
-//		Poco::Net::SocketAddress Route(radius_type rtype, const Poco::Net::SocketAddress &A,
-//									   const RADIUS::RadiusPacket &P, bool &UseRADSEC, std::string &secret);
-
+		Poco::Net::SocketAddress Route(radius_type rtype, const Poco::Net::SocketAddress &A,
+									   const RADIUS::RadiusPacket &P, bool &UseRADSEC, std::string &secret);
 		void ParseServerList(const GWObjects::RadiusProxyServerConfig &Config,
-							 std::vector<Destination> &V4,
-							 std::vector<Destination> &V6, bool setAsDefault,
-							 const std::string &poolProxyIp);
-/*		static Poco::Net::SocketAddress
+							 std::vector<Destination> &V4, std::vector<Destination> &V6,
+							 bool setAsDefault);
+		static Poco::Net::SocketAddress
 		ChooseAddress(std::vector<Destination> &Pool,
 					  const Poco::Net::SocketAddress &OriginalAddress, std::string &Secret);
 		Poco::Net::SocketAddress DefaultRoute([[maybe_unused]] radius_type rtype,
 											  const Poco::Net::SocketAddress &RequestedAddress,
 											  const RADIUS::RadiusPacket &P, bool &UseRADSEC,
 											  std::string &Secret);
-*/	};
+	};

 	inline auto RADIUS_proxy_server() { return RADIUS_proxy_server::instance(); }

--- a/src/RADSEC_server.h
+++ b/src/RADSEC_server.h
@@ -0,0 +1,304 @@
+//
+// Created by stephane bourque on 2022-08-15.
+//
+
+#pragma once
+
+#include <fstream>
+#include <iostream>
+
+#include "RESTObjects/RESTAPI_GWobjects.h"
+
+#include "Poco/Crypto/X509Certificate.h"
+#include "Poco/Net/Context.h"
+#include "Poco/Net/NetException.h"
+#include "Poco/Net/SecureStreamSocket.h"
+#include "Poco/Net/SocketReactor.h"
+#include "Poco/TemporaryFile.h"
+
+#include "framework/MicroServiceFuncs.h"
+
+#include "fmt/format.h"
+
+#include "AP_WS_Server.h"
+#include "RADIUS_helpers.h"
+
+namespace OpenWifi {
+
+	class RADSEC_server : public Poco::Runnable {
+	  public:
+		RADSEC_server(Poco::Net::SocketReactor &R, GWObjects::RadiusProxyServerEntry E)
+			: Reactor_(R), Server_(std::move(E)),
+			  Logger_(Poco::Logger::get(
+				  fmt::format("RADSEC: {}@{}:{}", Server_.name, Server_.ip, Server_.port))) {
+			Start();
+		}
+
+		~RADSEC_server() { Stop(); }
+
+		inline int Start() {
+			ReconnectThread_.start(*this);
+			return 0;
+		}
+
+		inline void Stop() {
+			TryAgain_ = false;
+			Disconnect();
+			ReconnectThread_.wakeUp();
+			ReconnectThread_.join();
+		}
+
+		inline void run() final {
+			Poco::Thread::trySleep(3000);
+			std::uint64_t LastStatus = 0;
+			auto RadSecKeepAlive = MicroServiceConfigGetInt("radsec.keepalive", 120);
+			while (TryAgain_) {
+				if (!Connected_) {
+					std::lock_guard G(LocalMutex_);
+					LastStatus = Utils::Now();
+					Connect();
+				} else if ((Utils::Now() - LastStatus) > RadSecKeepAlive) {
+					RADIUS::RadiusOutputPacket P(Server_.radsecSecret);
+					P.MakeStatusMessage();
+					poco_information(Logger_, "Keep-Alive message.");
+					Socket_->sendBytes(P.Data(), P.Len());
+					LastStatus = Utils::Now();
+				}
+				Poco::Thread::trySleep(!Connected_ ? 3000 : 10000);
+			}
+		}
+
+		inline bool SendData(const std::string &serial_number, const unsigned char *buffer,
+							 int length) {
+			try {
+				if (Connected_) {
+					RADIUS::RadiusPacket P(buffer, length);
+					int sent_bytes;
+					if (P.VerifyMessageAuthenticator(Server_.radsecSecret)) {
+						poco_debug(Logger_, fmt::format("{}: {} Sending {} bytes", serial_number,
+														P.PacketType(), length));
+						sent_bytes = Socket_->sendBytes(buffer, length);
+					} else {
+						poco_debug(Logger_, fmt::format("{}: {} Sending {} bytes", serial_number,
+														P.PacketType(), length));
+						P.ComputeMessageAuthenticator(Server_.radsecSecret);
+						sent_bytes = Socket_->sendBytes(P.Buffer(), length);
+					}
+					return (sent_bytes == length);
+				}
+			} catch (const Poco::Exception &E) {
+				Logger_.log(E);
+			} catch (...) {
+				poco_warning(Logger_, "Exception occurred: while sending data.");
+			}
+			return false;
+		}
+
+		inline void
+		onData([[maybe_unused]] const Poco::AutoPtr<Poco::Net::ReadableNotification> &pNf) {
+			unsigned char Buffer[4096];
+
+			try {
+				auto NumberOfReceivedBytes = Socket_->receiveBytes(Buffer, sizeof(Buffer));
+				if (NumberOfReceivedBytes >= 20) {
+					RADIUS::RadiusPacket P(Buffer, NumberOfReceivedBytes);
+					if (P.IsAuthentication()) {
+						auto SerialNumber = P.ExtractSerialNumberFromProxyState();
+						if (!SerialNumber.empty()) {
+							poco_debug(Logger_,
+									   fmt::format("{}: {} Received {} bytes.", SerialNumber,
+												   P.PacketType(), NumberOfReceivedBytes));
+							AP_WS_Server()->SendRadiusAuthenticationData(SerialNumber, Buffer,
+																		 NumberOfReceivedBytes);
+						} else {
+							poco_debug(Logger_, "AUTH packet dropped.");
+						}
+					} else if (P.IsAccounting()) {
+						auto SerialNumber = P.ExtractSerialNumberFromProxyState();
+						if (!SerialNumber.empty()) {
+							poco_debug(Logger_,
+									   fmt::format("{}: {} Received {} bytes.", SerialNumber,
+												   P.PacketType(), NumberOfReceivedBytes));
+							AP_WS_Server()->SendRadiusAccountingData(SerialNumber, Buffer,
+																	 NumberOfReceivedBytes);
+						} else {
+							poco_debug(Logger_, "ACCT packet dropped.");
+						}
+					} else if (P.IsAuthority()) {
+						auto SerialNumber = P.ExtractSerialNumberTIP();
+						if (!SerialNumber.empty()) {
+							poco_debug(Logger_,
+									   fmt::format("{}: {} Received {} bytes.", SerialNumber,
+												   P.PacketType(), NumberOfReceivedBytes));
+							AP_WS_Server()->SendRadiusCoAData(SerialNumber, Buffer,
+															  NumberOfReceivedBytes);
+						} else {
+							poco_debug(Logger_, "CoA/DM packet dropped.");
+						}
+					} else {
+						poco_warning(Logger_,
+									 fmt::format("Unknown packet: Type: {} (type={}) Length={}",
+												 P.PacketType(), P.PacketTypeInt(), P.BufferLen()));
+					}
+				} else {
+					poco_warning(Logger_, "Invalid packet received. Resetting the connection.");
+					Disconnect();
+				}
+			} catch (const Poco::Exception &E) {
+				Logger_.log(E);
+				Disconnect();
+			} catch (...) {
+				Disconnect();
+				poco_warning(Logger_, "Exception occurred. Resetting the connection.");
+			}
+		}
+
+		inline void
+		onError([[maybe_unused]] const Poco::AutoPtr<Poco::Net::ErrorNotification> &pNf) {
+			poco_warning(Logger_, "Socker error. Terminating connection.");
+			Disconnect();
+		}
+
+		inline void
+		onShutdown([[maybe_unused]] const Poco::AutoPtr<Poco::Net::ShutdownNotification> &pNf) {
+			poco_warning(Logger_, "Socker socket shutdown. Terminating connection.");
+			Disconnect();
+		}
+
+		inline bool Connect() {
+			if (TryAgain_) {
+				std::lock_guard G(LocalMutex_);
+
+				Poco::TemporaryFile CertFile_(MicroServiceDataDirectory());
+				Poco::TemporaryFile KeyFile_(MicroServiceDataDirectory());
+				std::vector<std::unique_ptr<Poco::TemporaryFile>> CaCertFiles_;
+
+				DecodeFile(CertFile_.path(), Server_.radsecCert);
+				DecodeFile(KeyFile_.path(), Server_.radsecKey);
+
+				for (auto &cert : Server_.radsecCacerts) {
+					CaCertFiles_.emplace_back(
+						std::make_unique<Poco::TemporaryFile>(MicroServiceDataDirectory()));
+					DecodeFile(CaCertFiles_[CaCertFiles_.size() - 1]->path(), cert);
+				}
+
+				Poco::Net::Context::Ptr SecureContext =
+					Poco::AutoPtr<Poco::Net::Context>(new Poco::Net::Context(
+						Poco::Net::Context::TLS_CLIENT_USE, KeyFile_.path(), CertFile_.path(), ""));
+				if (Server_.allowSelfSigned) {
+					SecureContext->setSecurityLevel(Poco::Net::Context::SECURITY_LEVEL_NONE);
+					SecureContext->enableExtendedCertificateVerification(false);
+				}
+
+				for (const auto &ca : CaCertFiles_) {
+					Poco::Crypto::X509Certificate cert(ca->path());
+					SecureContext->addCertificateAuthority(cert);
+				}
+
+				Socket_ = std::make_unique<Poco::Net::SecureStreamSocket>(SecureContext);
+
+				Poco::Net::SocketAddress Destination(Server_.ip, Server_.port);
+
+				try {
+					poco_information(Logger_, "Attempting to connect");
+					Socket_->connect(Destination, Poco::Timespan(100, 0));
+					Socket_->completeHandshake();
+
+					if (!Server_.allowSelfSigned) {
+						Socket_->verifyPeerCertificate();
+					}
+
+					if (Socket_->havePeerCertificate()) {
+						Peer_Cert_ = std::make_unique<Poco::Crypto::X509Certificate>(
+							Socket_->peerCertificate());
+					}
+
+					Socket_->setBlocking(false);
+					Socket_->setNoDelay(true);
+					Socket_->setKeepAlive(true);
+					Socket_->setReceiveTimeout(Poco::Timespan(1 * 60 * 60, 0));
+
+					Reactor_.addEventHandler(
+						*Socket_, Poco::NObserver<RADSEC_server, Poco::Net::ReadableNotification>(
+									  *this, &RADSEC_server::onData));
+					Reactor_.addEventHandler(
+						*Socket_, Poco::NObserver<RADSEC_server, Poco::Net::ErrorNotification>(
+									  *this, &RADSEC_server::onError));
+					Reactor_.addEventHandler(
+						*Socket_, Poco::NObserver<RADSEC_server, Poco::Net::ShutdownNotification>(
+									  *this, &RADSEC_server::onShutdown));
+
+					Connected_ = true;
+					poco_information(Logger_, fmt::format("Connected. CN={}", CommonName()));
+					return true;
+				} catch (const Poco::Net::NetException &E) {
+					poco_information(Logger_, "Could not connect.");
+					Logger_.log(E);
+				} catch (const Poco::Exception &E) {
+					poco_information(Logger_, "Could not connect.");
+					Logger_.log(E);
+				} catch (...) {
+					poco_information(Logger_, "Could not connect.");
+				}
+			}
+			return false;
+		}
+
+		inline void Disconnect() {
+			if (Connected_) {
+				std::lock_guard G(LocalMutex_);
+
+				Reactor_.removeEventHandler(
+					*Socket_, Poco::NObserver<RADSEC_server, Poco::Net::ReadableNotification>(
+								  *this, &RADSEC_server::onData));
+				Reactor_.removeEventHandler(
+					*Socket_, Poco::NObserver<RADSEC_server, Poco::Net::ErrorNotification>(
+								  *this, &RADSEC_server::onError));
+				Reactor_.removeEventHandler(
+					*Socket_, Poco::NObserver<RADSEC_server, Poco::Net::ShutdownNotification>(
+								  *this, &RADSEC_server::onShutdown));
+				Socket_->close();
+				Connected_ = false;
+			}
+			poco_information(Logger_, "Disconnecting.");
+		}
+
+		static void DecodeFile(const std::string &filename, const std::string &s) {
+			std::ofstream sec_file(filename, std::ios_base::out | std::ios_base::trunc |
+												 std::ios_base::binary);
+			std::stringstream is(s);
+			Poco::Base64Decoder ds(is);
+			Poco::StreamCopier::copyStream(ds, sec_file);
+			sec_file.close();
+		}
+
+		[[nodiscard]] inline std::string CommonName() {
+			if (Peer_Cert_)
+				return Peer_Cert_->commonName();
+			return "";
+		}
+
+		[[nodiscard]] inline std::string IssuerName() {
+			if (Peer_Cert_)
+				return Peer_Cert_->issuerName();
+			return "";
+		}
+
+		[[nodiscard]] inline std::string SubjectName() {
+			if (Peer_Cert_)
+				return Peer_Cert_->subjectName();
+			return "";
+		}
+
+	  private:
+		std::recursive_mutex LocalMutex_;
+		Poco::Net::SocketReactor &Reactor_;
+		GWObjects::RadiusProxyServerEntry Server_;
+		Poco::Logger &Logger_;
+		std::unique_ptr<Poco::Net::SecureStreamSocket> Socket_;
+		Poco::Thread ReconnectThread_;
+		std::unique_ptr<Poco::Crypto::X509Certificate> Peer_Cert_;
+		volatile bool Connected_ = false;
+		volatile bool TryAgain_ = true;
+	};
+} // namespace OpenWifi
--- a/src/RESTAPI/RESTAPI_RPC.cpp
+++ b/src/RESTAPI/RESTAPI_RPC.cpp
@@ -169,12 +169,10 @@ namespace OpenWifi::RESTAPI_RPC {

 			if (Cmd.ErrorCode == 0 && Cmd.Command == uCentralProtocol::CONFIGURE) {
 				//	we need to post a kafka event for this.
-				if (Params.has(uCentralProtocol::CONFIG) && Params.isObject(uCentralProtocol::CONFIG)) {
-					auto Config = Params.get(uCentralProtocol::CONFIG)
-									  .extract<Poco::JSON::Object::Ptr>();
+				if (Params.has(uCentralProtocol::CONFIG)) {
 					DeviceConfigurationChangeKafkaEvent KEvent(
 						Utils::SerialNumberToInt(Cmd.SerialNumber), Utils::Now(),
-						Config);
+						Params.get(uCentralProtocol::CONFIG).toString());
 				}
 			}

--- a/src/RESTAPI/RESTAPI_blacklist.cpp
+++ b/src/RESTAPI/RESTAPI_blacklist.cpp
@@ -63,7 +63,7 @@ namespace OpenWifi {
 		poco_debug(Logger(), fmt::format("BLACKLIST-POST: {}", D.serialNumber));

 		Poco::toLowerInPlace(D.serialNumber);
-		if (StorageService()->IsBlackListed(Utils::MACToInt(D.serialNumber))) {
+		if (StorageService()->IsBlackListed(D.serialNumber)) {
 			return BadRequest(RESTAPI::Errors::SerialNumberExists);
 		}

--- a/src/RESTAPI/RESTAPI_device_commandHandler.cpp
+++ b/src/RESTAPI/RESTAPI_device_commandHandler.cpp
@@ -87,7 +87,7 @@ namespace OpenWifi {
 			poco_debug(
 				Logger_,
 				fmt::format(
-					"Command RTTY TID={} can proceed. Identified as {} and RPCID as {}. thr_id={}",
+					"Command rtty TID={} can proceed. Identified as {} and RPCID as {}. thr_id={}",
 					TransactionId_, UUID, RPC, Poco::Thread::current()->id()));
 			return Rtty(UUID, RPC, 60000ms, Restrictions);
 		};
@@ -163,11 +163,8 @@ namespace OpenWifi {
 		{APCommands::Commands::telemetry, false, true, &RESTAPI_device_commandHandler::Telemetry,
 		 30000ms},
 		{APCommands::Commands::ping, false, true, &RESTAPI_device_commandHandler::Ping, 60000ms},
-		{APCommands::Commands::rrm, false, true, &RESTAPI_device_commandHandler::RRM, 60000ms},
-		{APCommands::Commands::certupdate, false, true, &RESTAPI_device_commandHandler::CertUpdate, 60000ms},
-		{APCommands::Commands::transfer, false, true, &RESTAPI_device_commandHandler::Transfer, 60000ms},
-		{APCommands::Commands::script, false, true, &RESTAPI_device_commandHandler::Script, 60000ms}
-	};
+		{APCommands::Commands::script, false, true, &RESTAPI_device_commandHandler::Script,
+		 300000ms}};

 	void RESTAPI_device_commandHandler::DoPost() {
 		if (!ValidateParameters()) {
@@ -1027,7 +1024,7 @@ namespace OpenWifi {
 		RESTAPI_RPC::WaitForCommand(CMD_RPC, APCommands::Commands::wifiscan, false, Cmd, Params,
 									*Request, *Response, timeout, nullptr, this, Logger_);
 		if (Cmd.ErrorCode == 0) {
-			KafkaManager()->PostMessage(KafkaTopics::WIFISCAN, SerialNumber_, Cmd.Results);
+			KafkaManager()->PostMessage(KafkaTopics::WIFISCAN, SerialNumber_, std::make_shared<std::string>(Cmd.Results));
 		}
 	}

@@ -1072,7 +1069,7 @@ namespace OpenWifi {
 										Logger_);
 			if (Cmd.ErrorCode == 0) {
 				KafkaManager()->PostMessage(KafkaTopics::DEVICE_EVENT_QUEUE, SerialNumber_,
-											Cmd.Results);
+											std::make_shared<std::string>(Cmd.Results));
 			}
 			return;
 		}
@@ -1129,6 +1126,9 @@ namespace OpenWifi {
 		BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
 	}

+#define DBGLINE                                                                                    \
+	{ std::cout << __LINE__ << std::endl; }
+
 	void RESTAPI_device_commandHandler::Rtty(
 		const std::string &CMD_UUID, uint64_t CMD_RPC, std::chrono::milliseconds timeout,
 		[[maybe_unused]] const GWObjects::DeviceRestrictions &Restrictions) {
@@ -1169,7 +1169,7 @@ namespace OpenWifi {

 				if (RTTYS_server()->UseInternal()) {
 					std::uint64_t SN = Utils::SerialNumberToInt(SerialNumber_);
-					bool mTLS = AP_WS_Server()->DeviceRequiresSecureRTTY(SN);
+					bool mTLS = AP_WS_Server()->DeviceRequiresSecureRtty(SN);
 					auto Hash =  Utils::ComputeHash(UserInfo_.webtoken.refresh_token_, Utils::Now());
 					Rtty.Token = Hash.substr(0, RTTY_DEVICE_TOKEN_LENGTH);
 					if (!RTTYS_server()->CreateEndPoint(Rtty.ConnectionId, Rtty.Token, Requester(),
@@ -1342,163 +1342,4 @@ namespace OpenWifi {
 		}
 		return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
 	}
-
-	void RESTAPI_device_commandHandler::RRM(
-		const std::string &CMD_UUID, uint64_t CMD_RPC,
-		[[maybe_unused]] std::chrono::milliseconds timeout,
-		[[maybe_unused]] const GWObjects::DeviceRestrictions &Restrictions) {
-
-		poco_debug(Logger_, fmt::format("RRM({},{}): TID={} user={} serial={}", CMD_UUID,
-										CMD_RPC, TransactionId_, Requester(), SerialNumber_));
-
-		if(IsDeviceSimulated(SerialNumber_)) {
-			CallCanceled("RRM", CMD_UUID, CMD_RPC, RESTAPI::Errors::SimulatedDeviceNotSupported);
-			return BadRequest(RESTAPI::Errors::SimulatedDeviceNotSupported);
-		}
-
-		if(UserInfo_.userinfo.userRole != SecurityObjects::ROOT &&
-			UserInfo_.userinfo.userRole != SecurityObjects::ADMIN) {
-			CallCanceled("RRM", CMD_UUID, CMD_RPC, RESTAPI::Errors::ACCESS_DENIED);
-			return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-		}
-
-		if(!ParsedBody_->has("actions") || !ParsedBody_->isArray("actions")) {
-			return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-		}
-
-		const auto &Actions = *ParsedBody_->getArray("actions");
-		//	perform some validation on the commands.
-		for(const auto &action:Actions) {
-			auto ActionDetails = action.extract<Poco::JSON::Object::Ptr>();
-			if(!ActionDetails->has("action")) {
-				return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-			}
-			auto ActionStr = ActionDetails->get("action").toString();
-			if(	ActionStr != "kick"
-				&& ActionStr != "channel_switch"
-				&& ActionStr != "tx_power"
-				&& ActionStr != "beacon_request"
-				&& ActionStr != "bss_transition"
-				&& ActionStr != "neighbors" ) {
-				return BadRequest(RESTAPI::Errors::InvalidRRMAction);
-			}
-		}
-
-		Poco::JSON::Object Params;
-		Params.set(uCentralProtocol::SERIAL, SerialNumber_);
-		Params.set(uCentralProtocol::ACTIONS, Actions);
-
-		GWObjects::CommandDetails Cmd;
-		Cmd.SerialNumber = SerialNumber_;
-		Cmd.SubmittedBy = Requester();
-		Cmd.UUID = CMD_UUID;
-		Cmd.Command = uCentralProtocol::RRM;
-		std::ostringstream os;
-		Params.stringify(os);
-		Cmd.Details = os.str();
-		Cmd.RunAt = 0;
-		Cmd.ErrorCode = 0;
-		Cmd.WaitingForFile = 0;
-		Cmd.Status= "completed";
-		if(CommandManager()->FireAndForget(SerialNumber_, uCentralProtocol::RRM, Params)) {
-			StorageService()->AddCommand(SerialNumber_, Cmd,
-										 Storage::CommandExecutionType::COMMAND_COMPLETED);
-			Cmd.Status= "completed";
-			return OK();
-		}
-		Cmd.Status= "failed";	//	should never happen
-		StorageService()->AddCommand(SerialNumber_, Cmd,
-									 Storage::CommandExecutionType::COMMAND_COMPLETED);
-		return BadRequest(RESTAPI::Errors::CouldNotPerformCommand);
-	}
-
-	void RESTAPI_device_commandHandler::Transfer(
-		const std::string &CMD_UUID, uint64_t CMD_RPC,
-		[[maybe_unused]] std::chrono::milliseconds timeout,
-		[[maybe_unused]] const GWObjects::DeviceRestrictions &Restrictions) {
-
-		if(UserInfo_.userinfo.userRole != SecurityObjects::ROOT &&
-			UserInfo_.userinfo.userRole != SecurityObjects::ADMIN) {
-			CallCanceled("RRM", CMD_UUID, CMD_RPC, RESTAPI::Errors::ACCESS_DENIED);
-			return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-		}
-
-		poco_debug(Logger_, fmt::format("TRANSFER({},{}): TID={} user={} serial={}", CMD_UUID,
-										CMD_RPC, TransactionId_, Requester(), SerialNumber_));
-
-		if(IsDeviceSimulated(SerialNumber_)) {
-			CallCanceled("RRM", CMD_UUID, CMD_RPC, RESTAPI::Errors::SimulatedDeviceNotSupported);
-			return BadRequest(RESTAPI::Errors::SimulatedDeviceNotSupported);
-		}
-
-		GWObjects::DeviceTransferRequest	TR;
-		if(!TR.from_json(ParsedBody_)) {
-			return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-		}
-
-		GWObjects::CommandDetails Cmd;
-		Cmd.SerialNumber = SerialNumber_;
-		Cmd.SubmittedBy = Requester();
-		Cmd.UUID = CMD_UUID;
-		Cmd.Command = uCentralProtocol::TRANSFER;
-		std::ostringstream os;
-		ParsedBody_->stringify(os);
-		Cmd.Details = os.str();
-		Cmd.RunAt = 0;
-		Cmd.ErrorCode = 0;
-		Cmd.WaitingForFile = 0;
-
-		return RESTAPI_RPC::WaitForCommand(CMD_RPC, APCommands::Commands::transfer, false, Cmd,
-										   *ParsedBody_, *Request, *Response, timeout, nullptr, this,
-										   Logger_);
-	}
-
-	void RESTAPI_device_commandHandler::CertUpdate(
-		const std::string &CMD_UUID, uint64_t CMD_RPC,
-		[[maybe_unused]] std::chrono::milliseconds timeout,
-		[[maybe_unused]] const GWObjects::DeviceRestrictions &Restrictions) {
-
-		poco_debug(Logger_, fmt::format("CERTUPDATE({},{}): TID={} user={} serial={}", CMD_UUID,
-										CMD_RPC, TransactionId_, Requester(), SerialNumber_));
-
-		if(UserInfo_.userinfo.userRole != SecurityObjects::ROOT &&
-			UserInfo_.userinfo.userRole != SecurityObjects::ADMIN) {
-			CallCanceled("RRM", CMD_UUID, CMD_RPC, RESTAPI::Errors::ACCESS_DENIED);
-			return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-		}
-
-		if(IsDeviceSimulated(SerialNumber_)) {
-			CallCanceled("RRM", CMD_UUID, CMD_RPC, RESTAPI::Errors::SimulatedDeviceNotSupported);
-			return BadRequest(RESTAPI::Errors::SimulatedDeviceNotSupported);
-		}
-
-		GWObjects::DeviceCertificateUpdateRequest	CR;
-		if(!CR.from_json(ParsedBody_)) {
-			return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-		}
-
-		GWObjects::DeviceTransferRequest	TR;
-		if(!TR.from_json(ParsedBody_)) {
-			return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-		}
-
-		GWObjects::CommandDetails Cmd;
-		Cmd.SerialNumber = SerialNumber_;
-		Cmd.SubmittedBy = Requester();
-		Cmd.UUID = CMD_UUID;
-		Cmd.Command = uCentralProtocol::CERTUPDATE;
-		std::ostringstream os;
-		ParsedBody_->stringify(os);
-		Cmd.Details = os.str();
-		Cmd.RunAt = 0;
-		Cmd.ErrorCode = 0;
-		Cmd.WaitingForFile = 0;
-
-		return RESTAPI_RPC::WaitForCommand(CMD_RPC, APCommands::Commands::certupdate, false, Cmd,
-										   *ParsedBody_, *Request, *Response, timeout, nullptr, this,
-										   Logger_);
-
-
-	}
-
 } // namespace OpenWifi
--- a/src/RESTAPI/RESTAPI_device_commandHandler.h
+++ b/src/RESTAPI/RESTAPI_device_commandHandler.h
@@ -62,12 +62,6 @@ namespace OpenWifi {
 				  const GWObjects::DeviceRestrictions &R);
 		void Script(const std::string &UUID, uint64_t RPC, std::chrono::milliseconds timeout,
 					const GWObjects::DeviceRestrictions &R);
-		void RRM(const std::string &UUID, uint64_t RPC, std::chrono::milliseconds timeout,
-					const GWObjects::DeviceRestrictions &R);
-		void CertUpdate(const std::string &UUID, uint64_t RPC, std::chrono::milliseconds timeout,
-					const GWObjects::DeviceRestrictions &R);
-		void Transfer(const std::string &UUID, uint64_t RPC, std::chrono::milliseconds timeout,
-					const GWObjects::DeviceRestrictions &R);

 		static auto PathName() {
 			return std::list<std::string>{"/api/v1/device/{serialNumber}/{command}"};
--- a/src/RESTAPI/RESTAPI_devices_handler.cpp
+++ b/src/RESTAPI/RESTAPI_devices_handler.cpp
@@ -174,15 +174,6 @@ namespace OpenWifi {
 			return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
 		}

-		if(GetBoolParameter("simulatedDevices",false)) {
-			auto F = []() ->void {
-				StorageService()->DeleteSimulatedDevice("");
-			};
-			std::thread T(F);
-			T.detach();
-			return OK();
-		}
-
 		if(!QB_.Select.empty() && !Utils::ValidSerialNumbers(QB_.Select)) {
 			return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
 		}
--- a/src/RESTAPI/RESTAPI_radiusProxyConfig_handler.cpp
+++ b/src/RESTAPI/RESTAPI_radiusProxyConfig_handler.cpp
@@ -8,11 +8,6 @@

 namespace OpenWifi {

-	static bool ValidRadiusPoolServerType(const std::string &T) {
-		static std::set<std::string> Types{ "radsec", "generic", "orion", "globalreach"};
-		return Types.find(T)!=Types.end();
-	}
-
 	void RESTAPI_radiusProxyConfig_handler::DoGet() {
 		Logger_.information(fmt::format("GET-RADIUS-PROXY-CONFIG: TID={} user={} thr_id={}",
 										TransactionId_, Requester(),
@@ -49,22 +44,10 @@ namespace OpenWifi {
 		}

 		//	Logically validate the config.
-		for (auto &pool : C.pools) {
+		for (const auto &pool : C.pools) {
 			if (pool.name.empty()) {
 				return BadRequest(RESTAPI::Errors::PoolNameInvalid);
 			}
-			if (pool.radsecPoolType.empty()) {
-				pool.radsecPoolType = "generic";
-			}
-
-			if(!ValidRadiusPoolServerType(pool.radsecPoolType)) {
-				return BadRequest(RESTAPI::Errors::NotAValidRadiusPoolType);
-			}
-
-			if(pool.radsecKeepAlive==0) {
-				pool.radsecKeepAlive=25;
-			}
-
 			for (const auto &config : {pool.acctConfig, pool.authConfig, pool.coaConfig}) {
 				if (config.servers.empty())
 					continue;
--- a/src/RESTObjects/RESTAPI_GWobjects.cpp
+++ b/src/RESTObjects/RESTAPI_GWobjects.cpp
@@ -59,8 +59,6 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj, "pendingUUID", pendingUUID);
 		field_to_json(Obj, "simulated", simulated);
 		field_to_json(Obj, "lastRecordedContact", lastRecordedContact);
-		field_to_json(Obj, "certificateExpiryDate", certificateExpiryDate);
-		field_to_json(Obj, "connectReason", connectReason);
 	}

 	void Device::to_json_with_status(Poco::JSON::Object &Obj) const {
@@ -124,8 +122,6 @@ namespace OpenWifi::GWObjects {
 			field_from_json(Obj, "pendingUUID", pendingUUID);
 			field_from_json(Obj, "simulated", simulated);
 			field_from_json(Obj, "lastRecordedContact", lastRecordedContact);
-			field_from_json(Obj, "certificateExpiryDate", certificateExpiryDate);
-			field_from_json(Obj, "connectReason", connectReason);
 			return true;
 		} catch (const Poco::Exception &E) {
 		}
@@ -434,10 +430,6 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj, "acctConfig", acctConfig);
 		field_to_json(Obj, "coaConfig", coaConfig);
 		field_to_json(Obj, "useByDefault", useByDefault);
-		field_to_json(Obj, "radsecKeepAlive", radsecKeepAlive);
-		field_to_json(Obj, "poolProxyIp", poolProxyIp);
-		field_to_json(Obj, "radsecPoolType", radsecPoolType);
-		field_to_json(Obj, "enabled", enabled);
 	}

 	bool RadiusProxyPool::from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -448,10 +440,6 @@ namespace OpenWifi::GWObjects {
 			field_from_json(Obj, "acctConfig", acctConfig);
 			field_from_json(Obj, "coaConfig", coaConfig);
 			field_from_json(Obj, "useByDefault", useByDefault);
-			field_from_json(Obj, "radsecKeepAlive", radsecKeepAlive);
-			field_from_json(Obj, "poolProxyIp", poolProxyIp);
-			field_from_json(Obj, "radsecPoolType", radsecPoolType);
-			field_from_json(Obj, "enabled", enabled);
 			return true;
 		} catch (const Poco::Exception &E) {
 		}
@@ -698,25 +686,4 @@ namespace OpenWifi::GWObjects {
 		return false;
 	}

-	bool DeviceTransferRequest::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "serialNumber", serialNumber);
-			field_from_json(Obj, "server", server);
-			field_from_json(Obj, "port", port);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	bool DeviceCertificateUpdateRequest::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "serialNumber", serialNumber);
-			field_from_json(Obj, "encodedCertificate", encodedCertificate);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
 } // namespace OpenWifi::GWObjects
--- a/src/RESTObjects/RESTAPI_GWobjects.h
+++ b/src/RESTObjects/RESTAPI_GWobjects.h
@@ -109,9 +109,7 @@ namespace OpenWifi::GWObjects {
 		DeviceRestrictions restrictionDetails;
 		std::uint64_t pendingUUID = 0;
 		bool simulated=false;
-		std::uint64_t 	lastRecordedContact=0;
-		std::uint64_t 	certificateExpiryDate = 0;
-		std::string 	connectReason;
+		std::uint64_t lastRecordedContact=0;

 		void to_json(Poco::JSON::Object &Obj) const;
 		void to_json_with_status(Poco::JSON::Object &Obj) const;
@@ -362,10 +360,6 @@ namespace OpenWifi::GWObjects {
 		RadiusProxyServerConfig acctConfig;
 		RadiusProxyServerConfig coaConfig;
 		bool useByDefault = false;
-		std::string 	radsecPoolType;
-		std::string 	poolProxyIp;
-		std::uint64_t 	radsecKeepAlive=25;
-		bool			enabled=true;

 		void to_json(Poco::JSON::Object &Obj) const;
 		bool from_json(const Poco::JSON::Object::Ptr &Obj);
@@ -454,63 +448,4 @@ namespace OpenWifi::GWObjects {
 		void to_json(Poco::JSON::Object &Obj) const;
 	};

-	enum class RadiusPoolStrategy {
-		round_robin, random, weighted, unknown
-	};
-
-	enum class RadiusEndpointType {
-		generic, radsec, globalreach, orion, unknown
-	};
-
-	static inline RadiusEndpointType RadiusEndpointType(const std::string &T) {
-		if(T=="generic") return RadiusEndpointType::generic;
-		if(T=="radsec") return RadiusEndpointType::radsec;
-		if(T=="globalreach") return RadiusEndpointType::globalreach;
-		if(T=="orion") return RadiusEndpointType::orion;
-		return RadiusEndpointType::unknown;
-	}
-
-	static inline RadiusPoolStrategy RadiusPoolStrategy(const std::string &T) {
-		if(T=="round_robin") return RadiusPoolStrategy::round_robin;
-		if(T=="random") return RadiusPoolStrategy::random;
-		if(T=="weighted") return RadiusPoolStrategy::weighted;
-		return RadiusPoolStrategy::unknown;
-	}
-
-	static inline std::string to_string(enum RadiusEndpointType T) {
-		switch(T) {
-		case RadiusEndpointType::generic: return "generic";
-		case RadiusEndpointType::radsec: return "radsec";
-		case RadiusEndpointType::globalreach: return "globalreach";
-		case RadiusEndpointType::orion: return "orion";
-		default:
-			return "unknown";
-		}
-	}
-
-	static inline std::string to_string(enum RadiusPoolStrategy T) {
-		switch(T) {
-		case RadiusPoolStrategy::round_robin: return "round_robin";
-		case RadiusPoolStrategy::random: return "random";
-		case RadiusPoolStrategy::weighted: return "weighted";
-		default:
-			return "unknown";
-		}
-	}
-
-	struct DeviceTransferRequest {
-		std::string 	serialNumber;
-		std::string 	server;
-		std::uint64_t 	port;
-
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
-	struct DeviceCertificateUpdateRequest {
-		std::string 	serialNumber;
-		std::string 	encodedCertificate;
-
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
 } // namespace OpenWifi::GWObjects
--- a/src/RESTObjects/RESTAPI_OWLSobjects.cpp
+++ b/src/RESTObjects/RESTAPI_OWLSobjects.cpp
@@ -78,22 +78,21 @@ namespace OpenWifi::OWLSObjects {
 		return false;
 	}

-    void SimulationStatus::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "id", id);
-        field_to_json(Obj, "simulationId", simulationId);
-        field_to_json(Obj, "state", state);
-        field_to_json(Obj, "tx", tx);
-        field_to_json(Obj, "rx", rx);
-        field_to_json(Obj, "msgsTx", msgsTx);
-        field_to_json(Obj, "msgsRx", msgsRx);
-        field_to_json(Obj, "liveDevices", liveDevices);
-        field_to_json(Obj, "timeToFullDevices", timeToFullDevices);
-        field_to_json(Obj, "startTime", startTime);
-        field_to_json(Obj, "endTime", endTime);
-        field_to_json(Obj, "errorDevices", errorDevices);
-        field_to_json(Obj, "owner", owner);
-        field_to_json(Obj, "expectedDevices", expectedDevices);
-    }
+	void SimulationStatus::to_json(Poco::JSON::Object &Obj) const {
+		field_to_json(Obj, "id", id);
+		field_to_json(Obj, "simulationId", simulationId);
+		field_to_json(Obj, "state", state);
+		field_to_json(Obj, "tx", tx);
+		field_to_json(Obj, "rx", rx);
+		field_to_json(Obj, "msgsTx", msgsTx);
+		field_to_json(Obj, "msgsRx", msgsRx);
+		field_to_json(Obj, "liveDevices", liveDevices);
+		field_to_json(Obj, "timeToFullDevices", timeToFullDevices);
+		field_to_json(Obj, "startTime", startTime);
+		field_to_json(Obj, "endTime", endTime);
+		field_to_json(Obj, "errorDevices", errorDevices);
+		field_to_json(Obj, "owner", owner);
+	}

 	void Dashboard::to_json([[maybe_unused]] Poco::JSON::Object &Obj) const {}

--- a/src/RESTObjects/RESTAPI_OWLSobjects.h
+++ b/src/RESTObjects/RESTAPI_OWLSobjects.h
@@ -43,24 +43,23 @@ namespace OpenWifi::OWLSObjects {
 		bool from_json(const Poco::JSON::Object::Ptr &Obj);
 	};

-    struct SimulationStatus {
-        std::string id;
-        std::string simulationId;
-        std::string state;
-        uint64_t tx;
-        uint64_t rx;
-        uint64_t msgsTx;
-        uint64_t msgsRx;
-        uint64_t liveDevices;
-        uint64_t timeToFullDevices;
-        uint64_t startTime;
-        uint64_t endTime;
-        uint64_t errorDevices;
-        std::string owner;
-        uint64_t expectedDevices;
+	struct SimulationStatus {
+		std::string id;
+		std::string simulationId;
+		std::string state;
+		uint64_t tx;
+		uint64_t rx;
+		uint64_t msgsTx;
+		uint64_t msgsRx;
+		uint64_t liveDevices;
+		uint64_t timeToFullDevices;
+		uint64_t startTime;
+		uint64_t endTime;
+		uint64_t errorDevices;
+		std::string owner;

-        void to_json(Poco::JSON::Object &Obj) const;
-    };
+		void to_json(Poco::JSON::Object &Obj) const;
+	};

 	struct Dashboard {
 		int O;
--- a/src/RESTObjects/RESTAPI_ProvObjects.cpp
+++ b/src/RESTObjects/RESTAPI_ProvObjects.cpp
@@ -1194,243 +1194,4 @@ namespace OpenWifi::ProvObjects {
 		return false;
 	}

-    void GLBLRAccountInfo::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        field_to_json(Obj, "privateKey", privateKey);
-        field_to_json(Obj, "country", country);
-        field_to_json(Obj, "province", province);
-        field_to_json(Obj, "city", city);
-        field_to_json(Obj, "organization", organization);
-        field_to_json(Obj, "commonName", commonName);
-        field_to_json(Obj, "CSR", CSR);
-        field_to_json(Obj, "CSRPrivateKey", CSRPrivateKey);
-        field_to_json(Obj, "CSRPublicKey", CSRPublicKey);
-        field_to_json(Obj, "GlobalReachAcctId", GlobalReachAcctId);
-    }
-
-    bool GLBLRAccountInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            field_from_json(Obj, "privateKey", privateKey);
-            field_from_json(Obj, "country", country);
-            field_from_json(Obj, "province", province);
-            field_from_json(Obj, "city", city);
-            field_from_json(Obj, "organization", organization);
-            field_from_json(Obj, "commonName", commonName);
-            field_from_json(Obj, "CSR", CSR);
-            field_from_json(Obj, "CSRPrivateKey", CSRPrivateKey);
-            field_from_json(Obj, "CSRPublicKey", CSRPublicKey);
-            field_from_json(Obj, "GlobalReachAcctId", GlobalReachAcctId);
-            return true;
-        } catch (const Poco::Exception &E) {
-
-        }
-        return false;
-    }
-
-    void GLBLRCertificateInfo::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "id", id);
-        field_to_json(Obj, "name", name);
-        field_to_json(Obj, "accountId", accountId);
-        field_to_json(Obj, "csr", csr);
-        field_to_json(Obj, "certificate", certificate);
-        field_to_json(Obj, "certificateChain", certificateChain);
-        field_to_json(Obj, "certificateId", certificateId);
-        field_to_json(Obj, "expiresAt", expiresAt);
-        field_to_json(Obj, "created", created);
-    }
-
-    bool GLBLRCertificateInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj, "id", id);
-            field_from_json(Obj, "name", name);
-            field_from_json(Obj, "accountId", accountId);
-            field_from_json(Obj, "csr", csr);
-            field_from_json(Obj, "certificate", certificate);
-            field_from_json(Obj, "certificateChain", certificateChain);
-            field_from_json(Obj, "certificateId", certificateId);
-            field_from_json(Obj, "expiresAt", expiresAt);
-            field_from_json(Obj, "created", created);
-            return true;
-        } catch (const Poco::Exception &E) {
-
-        }
-        return false;
-    }
-
-    void GooglOrionAccountInfo::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        field_to_json(Obj, "privateKey", privateKey);
-        field_to_json(Obj, "certificate", certificate);
-        field_to_json(Obj, "cacerts", cacerts);
-    }
-
-    bool GooglOrionAccountInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            field_from_json(Obj, "privateKey", privateKey);
-            field_from_json(Obj, "certificate", certificate);
-            field_from_json(Obj, "cacerts", cacerts);
-            return true;
-        } catch (const Poco::Exception &E) {
-
-        }
-        return false;
-    }
-
-    void RADIUSServer::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "Hostname", Hostname);
-        field_to_json(Obj, "IP", IP);
-        field_to_json(Obj, "Port", Port);
-        field_to_json(Obj, "Secret", Secret);
-    }
-
-    bool RADIUSServer::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj, "Hostname", Hostname);
-            field_from_json(Obj, "IP", IP);
-            field_from_json(Obj, "Port", Port);
-            field_from_json(Obj, "Secret", Secret);
-            return true;
-        } catch (const Poco::Exception &E) {
-
-        }
-        return false;
-    }
-
-    void RADIUSEndPointRadiusType::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "Authentication", Authentication);
-        field_to_json(Obj, "Accounting", Accounting);
-        field_to_json(Obj, "CoA", CoA);
-        field_to_json(Obj, "AccountingInterval", AccountingInterval);
-    }
-
-    bool RADIUSEndPointRadiusType::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj, "Authentication", Authentication);
-            field_from_json(Obj, "Accounting", Accounting);
-            field_from_json(Obj, "CoA", CoA);
-            field_from_json(Obj, "AccountingInterval", AccountingInterval);
-            return true;
-        } catch (const Poco::Exception &E) {
-
-        }
-        return false;
-    }
-
-    void RADIUSEndPointRadsecType::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "Hostname", Hostname);
-        field_to_json(Obj, "IP", IP);
-        field_to_json(Obj, "Port", Port);
-        field_to_json(Obj, "Secret", Secret);
-        field_to_json(Obj, "OpenRoamingType", OpenRoamingType);
-        field_to_json(Obj, "UseOpenRoamingAccount", UseOpenRoamingAccount);
-        field_to_json(Obj, "Weight", Weight);
-        field_to_json(Obj, "Certificate", Certificate);
-        field_to_json(Obj, "PrivateKey", PrivateKey);
-        field_to_json(Obj, "CaCerts", CaCerts);
-        field_to_json(Obj, "AllowSelfSigned", AllowSelfSigned);
-    }
-
-    bool RADIUSEndPointRadsecType::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj, "Hostname", Hostname);
-            field_from_json(Obj, "IP", IP);
-            field_from_json(Obj, "Port", Port);
-            field_from_json(Obj, "Secret", Secret);
-            field_from_json(Obj, "OpenRoamingType", OpenRoamingType);
-            field_from_json(Obj, "UseOpenRoamingAccount", UseOpenRoamingAccount);
-            field_from_json(Obj, "Weight", Weight);
-            field_from_json(Obj, "Certificate", Certificate);
-            field_from_json(Obj, "PrivateKey", PrivateKey);
-            field_from_json(Obj, "CaCerts", CaCerts);
-            field_from_json(Obj, "AllowSelfSigned", AllowSelfSigned);
-            return true;
-        } catch (const Poco::Exception &E) {
-
-        }
-        return false;
-    }
-
-    void RADIUSEndPoint::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        field_to_json(Obj, "Type", Type);
-        field_to_json(Obj, "RadsecServers", RadsecServers);
-        field_to_json(Obj, "RadiusServers", RadiusServers);
-        field_to_json(Obj, "PoolStrategy", PoolStrategy);
-        field_to_json(Obj, "Index", Index);
-        field_to_json(Obj, "UsedBy", UsedBy);
-        field_to_json(Obj, "UseGWProxy", UseGWProxy);
-        field_to_json(Obj, "NasIdentifier", NasIdentifier);
-        field_to_json(Obj, "AccountingInterval", AccountingInterval);
-    }
-
-    bool RADIUSEndPoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            field_from_json(Obj, "Type", Type);
-            field_from_json(Obj, "RadsecServers", RadsecServers);
-            field_from_json(Obj, "RadiusServers", RadiusServers);
-            field_from_json(Obj, "PoolStrategy", PoolStrategy);
-            field_from_json(Obj, "Index", Index);
-            field_from_json(Obj, "UsedBy", UsedBy);
-            field_from_json(Obj, "UseGWProxy", UseGWProxy);
-            field_from_json(Obj, "NasIdentifier", NasIdentifier);
-            field_from_json(Obj, "AccountingInterval", AccountingInterval);
-            return true;
-        } catch (const Poco::Exception &E) {
-
-        }
-        return false;
-    }
-
-    void RADIUSEndpointUpdateStatus::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "lastUpdate", lastUpdate);
-        field_to_json(Obj, "lastConfigurationChange", lastConfigurationChange);
-    }
-
-    bool RADIUSEndpointUpdateStatus::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj, "lastUpdate", lastUpdate);
-            field_from_json(Obj, "lastConfigurationChange", lastConfigurationChange);
-            return true;
-        } catch (const Poco::Exception &E) {
-
-        }
-        return false;
-    }
-
-    bool RADIUSEndpointUpdateStatus::Read() {
-        Poco::File  F(OpenWifi::MicroServiceDataDirectory()+"/RADIUSEndpointUpdateStatus.json");
-        try {
-            if (F.exists()) {
-                Poco::JSON::Parser P;
-                std::ifstream ifs(F.path(), std::ios_base::in | std::ios_base::binary);
-                auto Obj = P.parse(ifs);
-                return from_json(Obj.extract<Poco::JSON::Object::Ptr>());
-            }
-        } catch (...) {
-        }
-        return false;
-    }
-
-    bool RADIUSEndpointUpdateStatus::Save() {
-        Poco::File  F(OpenWifi::MicroServiceDataDirectory()+"/RADIUSEndpointUpdateStatus.json");
-        try {
-            Poco::JSON::Object Obj;
-            to_json(Obj);
-            std::ofstream O(F.path(), std::ios_base::out | std::ios_base::trunc | std::ios_base::binary);
-            Poco::JSON::Stringifier::stringify(Obj, O);
-            return true;
-        } catch (...) {
-        }
-        return false;
-    }
-
-    bool RADIUSEndpointUpdateStatus::ChangeConfiguration() {
-        Read();
-        lastConfigurationChange = Utils::Now();
-        return Save();
-    }
-
 } // namespace OpenWifi::ProvObjects
--- a/src/RESTObjects/RESTAPI_ProvObjects.h
+++ b/src/RESTObjects/RESTAPI_ProvObjects.h
--- a/src/SignatureMgr.h
+++ b/src/SignatureMgr.h
@@ -5,7 +5,7 @@
 #pragma once

 #include <fstream>
-#include <mutex>
+#include <shared_mutex>

 #include "framework/MicroServiceFuncs.h"
 #include "framework/SubSystemServer.h"
@@ -38,7 +38,7 @@ namespace OpenWifi {
 		inline int Start() final {
 			poco_notice(Logger(), "Starting...");

-			std::lock_guard L(KeyMutex_);
+			std::shared_lock L(KeyMutex_);

 			CacheFilename_ = MicroServiceDataDirectory() + "/signature_cache";
 			Poco::File CacheFile(CacheFilename_);
@@ -91,7 +91,7 @@ namespace OpenWifi {

 		inline std::string Sign(const GWObjects::DeviceRestrictions &Restrictions,
 								const std::string &Data) const {
-			std::lock_guard L(KeyMutex_);
+			std::shared_lock L(KeyMutex_);
 			try {
 				if (Restrictions.key_info.algo == "static") {
 					return "aaaaaaaaaa";
@@ -120,7 +120,7 @@ namespace OpenWifi {

 		inline std::string Sign(const GWObjects::DeviceRestrictions &Restrictions,
 								const Poco::URI &uri) {
-			std::lock_guard L(KeyMutex_);
+			std::shared_lock L(KeyMutex_);
 			try {
 				if (Restrictions.key_info.algo == "static") {
 					return "aaaaaaaaaa";
@@ -172,7 +172,7 @@ namespace OpenWifi {
 		}

 	  private:
-		mutable std::mutex KeyMutex_;
+		mutable std::shared_mutex KeyMutex_;
 		std::map<std::string, Poco::SharedPtr<Poco::Crypto::RSAKey>> Keys_;
 		std::map<std::string, std::string> SignatureCache_;
 		std::string CacheFilename_;
--- a/src/StorageService.h
+++ b/src/StorageService.h
@@ -16,22 +16,6 @@

 namespace OpenWifi {

-	class LockedDbSession {
-	  public:
-		explicit LockedDbSession();
-		~LockedDbSession() = default;
-		inline std::mutex &Mutex() { return *Mutex_; };
-		inline Poco::Data::Session &Session() {
-			if(!Session_->isConnected()) {
-				Session_->reconnect();
-			}
-			return *Session_;
-		};
-	  private:
-		std::shared_ptr<Poco::Data::Session> 	Session_;
-		std::shared_ptr<std::mutex> 			Mutex_;
-	};
-
 	class Storage : public StorageClass {

 	  public:
@@ -106,8 +90,7 @@ namespace OpenWifi {

 		// typedef std::map<std::string,std::string>	DeviceCapabilitiesCache;

-		bool AddLog(LockedDbSession &Session, const GWObjects::DeviceLog &Log);
-		bool AddStatisticsData(Poco::Data::Session &Session, const GWObjects::Statistics &Stats);
+		bool AddLog(const GWObjects::DeviceLog &Log);
 		bool AddStatisticsData(const GWObjects::Statistics &Stats);
 		bool GetStatisticsData(std::string &SerialNumber, uint64_t FromDate, uint64_t ToDate,
 							   uint64_t Offset, uint64_t HowMany,
@@ -119,7 +102,6 @@ namespace OpenWifi {
 									 std::vector<GWObjects::Statistics> &Stats);

 		bool AddHealthCheckData(const GWObjects::HealthCheck &Check);
-		bool AddHealthCheckData(LockedDbSession &Session, const GWObjects::HealthCheck &Check);
 		bool GetHealthCheckData(std::string &SerialNumber, uint64_t FromDate, uint64_t ToDate,
 								uint64_t Offset, uint64_t HowMany,
 								std::vector<GWObjects::HealthCheck> &Checks);
@@ -133,18 +115,13 @@ namespace OpenWifi {
 									   uint64_t &NewUUID);

 		bool RollbackDeviceConfigurationChange(std::string & SerialNumber);
-		bool CompleteDeviceConfigurationChange(Poco::Data::Session &Session, std::string & SerialNumber);
 		bool CompleteDeviceConfigurationChange(std::string & SerialNumber);
-		bool CreateDevice(LockedDbSession &Session, GWObjects::Device &);
+
 		bool CreateDevice(GWObjects::Device &);
-		bool CreateDefaultDevice(Poco::Data::Session &Session,std::string &SerialNumber,
-								 const Config::Capabilities &Caps,
+		bool CreateDefaultDevice(std::string &SerialNumber, const Config::Capabilities &Caps,
 								 std::string &Firmware, const Poco::Net::IPAddress &IPAddress,
 								 bool simulated);
-		bool CreateDevice(Poco::Data::Session &Sess, GWObjects::Device &DeviceDetails);

-		bool GetDevice(LockedDbSession &Session, std::string &SerialNumber, GWObjects::Device &);
-		bool GetDevice(Poco::Data::Session &Session, std::string &SerialNumber, GWObjects::Device &DeviceDetails);
 		bool GetDevice(std::string &SerialNumber, GWObjects::Device &);
 		bool GetDevices(uint64_t From, uint64_t HowMany, std::vector<GWObjects::Device> &Devices,
 						const std::string &orderBy = "");
@@ -155,8 +132,6 @@ namespace OpenWifi {
 		bool DeleteDevices(std::uint64_t OlderContact, bool SimulatedOnly);

 		bool UpdateDevice(GWObjects::Device &);
-		bool UpdateDevice(LockedDbSession &Session, GWObjects::Device &);
-		bool UpdateDevice(Poco::Data::Session &Sess, GWObjects::Device &NewDeviceDetails);
 		bool DeviceExists(std::string &SerialNumber);
 		bool SetConnectInfo(std::string &SerialNumber, std::string &Firmware);
 		bool GetDeviceCount(uint64_t &Count);
@@ -164,7 +139,7 @@ namespace OpenWifi {
 									std::vector<std::string> &SerialNumbers,
 									const std::string &orderBy = "");
 		bool GetDeviceFWUpdatePolicy(std::string &SerialNumber, std::string &Policy);
-		bool SetDevicePassword(LockedDbSession &Session, std::string &SerialNumber, std::string &Password);
+		bool SetDevicePassword(std::string &SerialNumber, std::string &Password);
 		bool UpdateSerialNumberCache();
 		static void GetDeviceDbFieldList(Types::StringVec &Fields);

@@ -173,11 +148,9 @@ namespace OpenWifi {

 		bool UpdateDeviceCapabilities(std::string &SerialNumber,
 									  const Config::Capabilities &Capabilities);
-		bool UpdateDeviceCapabilities(Poco::Data::Session &Session, std::string &SerialNumber,
-									  const Config::Capabilities &Capabilities);
 		bool GetDeviceCapabilities(std::string &SerialNumber, GWObjects::Capabilities &);
 		bool DeleteDeviceCapabilities(std::string &SerialNumber);
-		bool CreateDeviceCapabilities(Poco::Data::Session &Session, std::string &SerialNumber,
+		bool CreateDeviceCapabilities(std::string &SerialNumber,
 									  const Config::Capabilities &Capabilities);
 		bool InitCapabilitiesCache();

@@ -249,32 +222,28 @@ namespace OpenWifi {
 		void RemovedExpiredCommands();
 		void RemoveTimedOutCommands();

-		bool RemoveOldCommands(std::string &SerialNumber, std::string &Command);
+		bool RemoveOldCommands(std::string &SerilNumber, std::string &Command);

 		bool AddBlackListDevices(std::vector<GWObjects::BlackListedDevice> &Devices);
 		bool AddBlackListDevice(GWObjects::BlackListedDevice &Device);
 		bool GetBlackListDevice(std::string &SerialNumber, GWObjects::BlackListedDevice &Device);
 		bool DeleteBlackListDevice(std::string &SerialNumber);
-		bool IsBlackListed(std::uint64_t SerialNumber, std::string &reason,
+		bool IsBlackListed(const std::string &SerialNumber, std::string &reason,
 						   std::string &author, std::uint64_t &created);
-		bool IsBlackListed(std::uint64_t SerialNumber);
+		bool IsBlackListed(const std::string &SerialNumber);
 		bool InitializeBlackListCache();
 		bool GetBlackListDevices(uint64_t Offset, uint64_t HowMany,
 								 std::vector<GWObjects::BlackListedDevice> &Devices);
 		bool UpdateBlackListDevice(std::string &SerialNumber, GWObjects::BlackListedDevice &Device);
 		uint64_t GetBlackListDeviceCount();

-		bool DeleteSimulatedDevice(const std::string &SerialNumber);
-
 		bool RemoveHealthChecksRecordsOlderThan(uint64_t Date);
 		bool RemoveDeviceLogsRecordsOlderThan(uint64_t Date);
 		bool RemoveStatisticsRecordsOlderThan(uint64_t Date);
 		bool RemoveCommandListRecordsOlderThan(uint64_t Date);
 		bool RemoveUploadedFilesRecordsOlderThan(uint64_t Date);

-		bool SetDeviceLastRecordedContact(LockedDbSession &Session, std::string & SerialNumber, std::uint64_t lastRecordedContact);
-		bool SetDeviceLastRecordedContact(std::string & SerialNumber, std::uint64_t lastRecordedContact);
-		bool SetDeviceLastRecordedContact(Poco::Data::Session & Session, std::string & SerialNumber, std::uint64_t lastRecordedContact);
+		bool SetDeviceLastRecordedContact(std::string & SeialNumber, std::uint64_t lastRecordedContact);

 		int Create_Tables();
 		int Create_Statistics();
@@ -294,19 +263,10 @@ namespace OpenWifi {
 		int Start() override;
 		void Stop() override;

-		inline Poco::Data::Session	StartSession() {
-			return Pool_->get();
-		}
-
 	  private:
 		std::unique_ptr<OpenWifi::ScriptDB> ScriptDB_;
 	};

 	inline auto StorageService() { return Storage::instance(); }

-	inline LockedDbSession::LockedDbSession() {
-		Session_ = std::make_shared<Poco::Data::Session>(Poco::Data::Session(StorageService()->StartSession()));
-		Mutex_ = std::make_shared<std::mutex>();
-	}
-
 } // namespace OpenWifi
--- a/src/TelemetryStream.h
+++ b/src/TelemetryStream.h
@@ -23,7 +23,7 @@

 #include "framework/SubSystemServer.h"

-#include "AP_WS_Reactor_Pool.h"
+#include "AP_WS_ReactorPool.h"
 #include "TelemetryClient.h"

 namespace OpenWifi {
--- a/src/framework/AppServiceRegistry.h
+++ b/src/framework/AppServiceRegistry.h
@@ -11,12 +11,10 @@

 #include "Poco/File.h"
 #include "Poco/StreamCopier.h"
-#include "Poco/JSON/Object.h"
-#include "Poco/JSON/Parser.h"

 #include "framework/MicroServiceFuncs.h"

-// #include "nlohmann/json.hpp"
+#include "nlohmann/json.hpp"

 namespace OpenWifi {

@@ -30,11 +28,11 @@ namespace OpenWifi {
 				if (F.exists()) {
 					std::ostringstream OS;
 					std::ifstream IF(FileName);
-                    Poco::JSON::Parser  P;
-					Registry_ = P.parse(IF).extract<Poco::JSON::Object::Ptr>();
+					Poco::StreamCopier::copyStream(IF, OS);
+					Registry_ = nlohmann::json::parse(OS.str());
 				}
 			} catch (...) {
-				Registry_ = Poco::makeShared<Poco::JSON::Object>();
+				Registry_ = nlohmann::json::parse("{}");
 			}
 		}

@@ -46,47 +44,54 @@ namespace OpenWifi {
 		inline ~AppServiceRegistry() { Save(); }

 		inline void Save() {
+			std::istringstream IS(to_string(Registry_));
 			std::ofstream OF;
 			OF.open(FileName, std::ios::binary | std::ios::trunc);
-            Registry_->stringify(OF);
+			Poco::StreamCopier::copyStream(IS, OF);
 		}

-        void Set(const char *key, const std::vector<std::string> &V) {
-            Poco::JSON::Array   Arr;
-            for(const auto &s:V) {
-                Arr.add(s);
-            }
-            Registry_->set(key,Arr);
-            Save();
-        }
-
-        template<class T> void Set(const char *key, const T &Value) {
-            Registry_->set(key,Value);
+		inline void Set(const char *Key, uint64_t Value) {
+			Registry_[Key] = Value;
 			Save();
 		}

-        bool Get(const char *key, std::vector<std::string> &Value) {
-            if(Registry_->has(key) && !Registry_->isNull(key) && Registry_->isArray(key)) {
-                auto Arr = Registry_->get(key);
-                for(const auto &v:Arr) {
-                    Value.emplace_back(v);
-                }
-                return true;
-            }
-            return false;
-        }
+		inline void Set(const char *Key, const std::string &Value) {
+			Registry_[Key] = Value;
+			Save();
+		}

-        template<class T> bool Get(const char *key, T &Value) {
-            if(Registry_->has(key) && !Registry_->isNull(key)) {
-                Value = Registry_->getValue<T>(key);
-                return true;
-            }
-            return false;
-        }
+		inline void Set(const char *Key, bool Value) {
+			Registry_[Key] = Value;
+			Save();
+		}
+
+		inline bool Get(const char *Key, bool &Value) {
+			if (Registry_[Key].is_boolean()) {
+				Value = Registry_[Key].get<bool>();
+				return true;
+			}
+			return false;
+		}
+
+		inline bool Get(const char *Key, uint64_t &Value) {
+			if (Registry_[Key].is_number_unsigned()) {
+				Value = Registry_[Key].get<uint64_t>();
+				return true;
+			}
+			return false;
+		}
+
+		inline bool Get(const char *Key, std::string &Value) {
+			if (Registry_[Key].is_string()) {
+				Value = Registry_[Key].get<std::string>();
+				return true;
+			}
+			return false;
+		}

 	  private:
 		std::string FileName;
-		Poco::JSON::Object::Ptr Registry_;
+		nlohmann::json Registry_;
 	};

 	inline auto AppServiceRegistry() { return AppServiceRegistry::instance(); }
--- a/src/framework/ConfigurationValidator.cpp
+++ b/src/framework/ConfigurationValidator.cpp
@@ -34,10 +34,6 @@ static std::string DefaultUCentralSchema = R"foo(
    "$schema": "http://json-schema.org/draft-07/schema#",
    "type": "object",
    "properties": {
-        "strict": {
-            "type": "boolean",
-            "default": false
-        },
        "uuid": {
            "type": "integer"
        },
@@ -118,20 +114,6 @@ static std::string DefaultUCentralSchema = R"foo(
                "random-password": {
                    "type": "boolean",
                    "default": false
-                },
-                "beacon-advertisement": {
-                    "type": "object",
-                    "properties": {
-                        "device-name": {
-                            "type": "boolean"
-                        },
-                        "device-serial": {
-                            "type": "boolean"
-                        },
-                        "network-id": {
-                            "type": "integer"
-                        }
-                    }
                }
            }
        },
@@ -240,52 +222,6 @@ static std::string DefaultUCentralSchema = R"foo(
                }
            }
        },
-        "interface.ssid.encryption": {
-            "type": "object",
-            "properties": {
-                "proto": {
-                    "type": "string",
-                    "enum": [
-                        "none",
-                        "owe",
-                        "owe-transition",
-                        "psk",
-                        "psk2",
-                        "psk-mixed",
-                        "psk2-radius",
-                        "wpa",
-                        "wpa2",
-                        "wpa-mixed",
-                        "sae",
-                        "sae-mixed",
-                        "wpa3",
-                        "wpa3-192",
-                        "wpa3-mixed"
-                    ],
-                    "examples": [
-                        "psk2"
-                    ]
-                },
-                "key": {
-                    "type": "string",
-                    "maxLength": 63,
-                    "minLength": 8
-                },
-                "ieee80211w": {
-                    "type": "string",
-                    "enum": [
-                        "disabled",
-                        "optional",
-                        "required"
-                    ],
-                    "default": "disabled"
-                },
-                "key-caching": {
-                    "type": "boolean",
-                    "default": true
-                }
-            }
-        },
        "definitions": {
            "type": "object",
            "properties": {
@@ -780,8 +716,7 @@ static std::string DefaultUCentralSchema = R"foo(
                    "type": "string",
                    "enum": [
                        "dynamic",
-                        "static",
-                        "none"
+                        "static"
                    ],
                    "examples": [
                        "static"
@@ -1071,6 +1006,52 @@ static std::string DefaultUCentralSchema = R"foo(
                }
            ]
        },
+        "interface.ssid.encryption": {
+            "type": "object",
+            "properties": {
+                "proto": {
+                    "type": "string",
+                    "enum": [
+                        "none",
+                        "owe",
+                        "owe-transition",
+                        "psk",
+                        "psk2",
+                        "psk-mixed",
+                        "psk2-radius",
+                        "wpa",
+                        "wpa2",
+                        "wpa-mixed",
+                        "sae",
+                        "sae-mixed",
+                        "wpa3",
+                        "wpa3-192",
+                        "wpa3-mixed"
+                    ],
+                    "examples": [
+                        "psk2"
+                    ]
+                },
+                "key": {
+                    "type": "string",
+                    "maxLength": 63,
+                    "minLength": 8
+                },
+                "ieee80211w": {
+                    "type": "string",
+                    "enum": [
+                        "disabled",
+                        "optional",
+                        "required"
+                    ],
+                    "default": "disabled"
+                },
+                "key-caching": {
+                    "type": "boolean",
+                    "default": true
+                }
+            }
+        },
        "interface.ssid.multi-psk": {
            "type": "object",
            "properties": {
@@ -2039,11 +2020,6 @@ static std::string DefaultUCentralSchema = R"foo(
                    "decription": "This option allows embedding custom vendor specific IEs inside the beacons of a BSS in AP mode.",
                    "type": "string"
                },
-                "tip-information-element": {
-                    "decription": "The device will broadcast the TIP vendor IE inside its beacons if this option is enabled.",
-                    "type": "boolean",
-                    "default": true
-                },
                "fils-discovery-interval": {
                    "type": "integer",
                    "default": 20,
@@ -2467,24 +2443,6 @@ static std::string DefaultUCentralSchema = R"foo(
                    "type": "boolean",
                    "default": false
                },
-                "mode": {
-                    "type": "string",
-                    "enum": [
-                        "radius",
-                        "user"
-                    ]
-                },
-                "port-filter": {
-                    "type": "array",
-                    "items": {
-                        "type": "string",
-                        "examples": [
-                            {
-                                "LAN1": null
-                            }
-                        ]
-                    }
-                },
                "server-certificate": {
                    "type": "string"
                },
@@ -2496,77 +2454,6 @@ static std::string DefaultUCentralSchema = R"foo(
                    "items": {
                        "$ref": "#/$defs/interface.ssid.radius.local-user"
                    }
-                },
-                "radius": {
-                    "type": "object",
-                    "properties": {
-                        "nas-identifier": {
-                            "type": "string"
-                        },
-                        "auth-server-addr": {
-                            "type": "string",
-                            "format": "uc-host",
-                            "examples": [
-                                "192.168.1.10"
-                            ]
-                        },
-                        "auth-server-port": {
-                            "type": "integer",
-                            "maximum": 65535,
-                            "minimum": 1024,
-                            "examples": [
-                                1812
-                            ]
-                        },
-                        "auth-server-secret": {
-                            "type": "string",
-                            "examples": [
-                                "secret"
-                            ]
-                        },
-                        "acct-server-addr": {
-                            "type": "string",
-                            "format": "uc-host",
-                            "examples": [
-                                "192.168.1.10"
-                            ]
-                        },
-                        "acct-server-port": {
-                            "type": "integer",
-                            "maximum": 65535,
-                            "minimum": 1024,
-                            "examples": [
-                                1813
-                            ]
-                        },
-                        "acct-server-secret": {
-                            "type": "string",
-                            "examples": [
-                                "secret"
-                            ]
-                        },
-                        "coa-server-addr": {
-                            "type": "string",
-                            "format": "uc-host",
-                            "examples": [
-                                "192.168.1.10"
-                            ]
-                        },
-                        "coa-server-port": {
-                            "type": "integer",
-                            "maximum": 65535,
-                            "minimum": 1024,
-                            "examples": [
-                                1814
-                            ]
-                        },
-                        "coa-server-secret": {
-                            "type": "string",
-                            "examples": [
-                                "secret"
-                            ]
-                        }
-                    }
                }
            }
        },
@@ -2890,12 +2777,6 @@ static std::string DefaultUCentralSchema = R"foo(
                        }
                    }
                },
-                "services": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                },
                "classifier": {
                    "type": "array",
                    "items": {
@@ -3138,24 +3019,6 @@ static std::string DefaultUCentralSchema = R"foo(
                            "relay-server": {
                                "type": "string",
                                "format": "uc-ip"
-                            },
-                            "circuit-id-format": {
-                                "type": "string",
-                                "enum": [
-                                    "vlan-id",
-                                    "ap-mac",
-                                    "ssid"
-                                ],
-                                "default": "vlan-id"
-                            },
-                            "remote-id-format": {
-                                "type": "string",
-                                "enum": [
-                                    "vlan-id",
-                                    "ap-mac",
-                                    "ssid"
-                                ],
-                                "default": "ap-mac"
                            }
                        }
                    }
--- a/src/framework/EventBusManager.cpp
+++ b/src/framework/EventBusManager.cpp
@@ -9,21 +9,23 @@

 namespace OpenWifi {

+	EventBusManager::EventBusManager(Poco::Logger &L) : Logger_(L) {}
+
 	void EventBusManager::run() {
 		Running_ = true;
 		Utils::SetThreadName("fmwk:EventMgr");
-		auto Msg = (MicroServiceMakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_JOIN));
+		auto Msg = std::make_shared<std::string>(MicroServiceMakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_JOIN));
 		KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS, MicroServicePrivateEndPoint(), Msg,
 									false);
 		while (Running_) {
 			Poco::Thread::trySleep((unsigned long)MicroServiceDaemonBusTimer());
 			if (!Running_)
 				break;
-			Msg = (MicroServiceMakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE));
+			Msg = std::make_shared<std::string>(MicroServiceMakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE));
 			KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS, MicroServicePrivateEndPoint(),
 										Msg, false);
 		}
-		Msg = (MicroServiceMakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_LEAVE));
+		Msg = std::make_shared<std::string>(MicroServiceMakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_LEAVE));
 		KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS, MicroServicePrivateEndPoint(), Msg,
 									false);
 	};
--- a/src/framework/EventBusManager.h
+++ b/src/framework/EventBusManager.h
@@ -12,16 +12,6 @@ namespace OpenWifi {

 	class EventBusManager : public Poco::Runnable {
 	  public:
-		EventBusManager() :
-			Logger_(Poco::Logger::create(
-				"EventBusManager", Poco::Logger::root().getChannel(), Poco::Logger::root().getLevel())) {
-		}
-
-		static auto instance() {
-			static auto instance_ = new EventBusManager;
-			return instance_;
-		}
-
 		explicit EventBusManager(Poco::Logger &L);
 		void run() final;
 		void Start();
@@ -34,6 +24,4 @@ namespace OpenWifi {
 		Poco::Logger &Logger_;
 	};

-	inline auto EventBusManager() { return EventBusManager::instance(); }
-
 } // namespace OpenWifi
--- a/src/framework/KafkaManager.cpp
+++ b/src/framework/KafkaManager.cpp
@@ -6,7 +6,6 @@

 #include "fmt/format.h"
 #include "framework/MicroServiceFuncs.h"
-#include "cppkafka/utils/consumer_dispatcher.h"

 namespace OpenWifi {

@@ -100,12 +99,9 @@ namespace OpenWifi {
 			try {
 				auto Msg = dynamic_cast<KafkaMessage *>(Note.get());
 				if (Msg != nullptr) {
-					auto NewMessage = cppkafka::MessageBuilder(Msg->Topic());
-					NewMessage.key(Msg->Key());
-					NewMessage.partition(0);
-					NewMessage.payload(Msg->Payload());
-					Producer.produce(NewMessage);
-					Producer.flush();
+					Producer.produce(cppkafka::MessageBuilder(Msg->Topic())
+										 .key(Msg->Key())
+										 .payload(Msg->Payload()));
 				}
 			} catch (const cppkafka::HandleException &E) {
 				poco_warning(Logger_,
@@ -160,49 +156,43 @@ namespace OpenWifi {
 			}
 		});

-		// bool AutoCommit = MicroServiceConfigGetBool("openwifi.kafka.auto.commit", false);
-		// auto BatchSize = MicroServiceConfigGetInt("openwifi.kafka.consumer.batchsize", 100);
+		bool AutoCommit = MicroServiceConfigGetBool("openwifi.kafka.auto.commit", false);
+		auto BatchSize = MicroServiceConfigGetInt("openwifi.kafka.consumer.batchsize", 20);

 		Types::StringVec Topics;
-		std::for_each(Topics_.begin(),Topics_.end(),
-					  [&](const std::string & T) { Topics.emplace_back(T); });
+		KafkaManager()->Topics(Topics);
 		Consumer.subscribe(Topics);

 		Running_ = true;
-		std::vector<cppkafka::Message> MsgVec;
-
-		Dispatcher_ = std::make_unique<cppkafka::ConsumerDispatcher>(Consumer);
-
-		Dispatcher_->run(
-			// Callback executed whenever a new message is consumed
-			[&](cppkafka::Message msg) {
-				// Print the key (if any)
-				std::lock_guard G(ConsumerMutex_);
-				auto It = Notifiers_.find(msg.get_topic());
-				if (It != Notifiers_.end()) {
-					const auto &FL = It->second;
-					for (const auto &[CallbackFunc, _] : FL) {
-						try {
-							CallbackFunc(msg.get_key(), msg.get_payload());
-						} catch(const Poco::Exception &E) {
-
-						} catch(...) {
-
+		while (Running_) {
+			try {
+				std::vector<cppkafka::Message> MsgVec =
+					Consumer.poll_batch(BatchSize, std::chrono::milliseconds(100));
+				for (auto const &Msg : MsgVec) {
+					if (!Msg)
+						continue;
+					if (Msg.get_error()) {
+						if (!Msg.is_eof()) {
+							poco_error(Logger_,
+									   fmt::format("Error: {}", Msg.get_error().to_string()));
 						}
+						if (!AutoCommit)
+							Consumer.async_commit(Msg);
+						continue;
 					}
+					KafkaManager()->Dispatch(Msg.get_topic().c_str(), Msg.get_key(), std::make_shared<std::string>(Msg.get_payload()));
+					if (!AutoCommit)
+						Consumer.async_commit(Msg);
 				}
-				Consumer.commit(msg);
-			},
-			// Whenever there's an error (other than the EOF soft error)
-			[&Logger_](cppkafka::Error error) {
-				poco_warning(Logger_,fmt::format("Error: {}", error.to_string()));
-			},
-			// Whenever EOF is reached on a partition, print this
-			[&Logger_](cppkafka::ConsumerDispatcher::EndOfFile, const cppkafka::TopicPartition& topic_partition) {
-				poco_debug(Logger_,fmt::format("Partition {} EOF", topic_partition.get_partition()));
+			} catch (const cppkafka::HandleException &E) {
+				poco_warning(Logger_,
+							 fmt::format("Caught a Kafka exception (consumer): {}", E.what()));
+			} catch (const Poco::Exception &E) {
+				Logger_.log(E);
+			} catch (...) {
+				poco_error(Logger_, "std::exception");
 			}
-		);
-
+		}
 		Consumer.unsubscribe();
 		poco_information(Logger_, "Stopped...");
 	}
@@ -223,13 +213,14 @@ namespace OpenWifi {
 	}

 	void KafkaProducer::Produce(const char *Topic, const std::string &Key,
-								const std::string &Payload) {
+								std::shared_ptr<std::string> Payload) {
 		std::lock_guard G(Mutex_);
 		Queue_.enqueueNotification(new KafkaMessage(Topic, Key, Payload));
 	}

 	void KafkaConsumer::Start() {
 		if (!Running_) {
+			Running_ = true;
 			Worker_.start(*this);
 		}
 	}
@@ -237,16 +228,29 @@ namespace OpenWifi {
 	void KafkaConsumer::Stop() {
 		if (Running_) {
 			Running_ = false;
-			if(Dispatcher_) {
-				Dispatcher_->stop();
-			}
+			Worker_.wakeUp();
 			Worker_.join();
 		}
 	}

-	std::uint64_t KafkaConsumer::RegisterTopicWatcher(const std::string &Topic,
+	void KafkaDispatcher::Start() {
+		if (!Running_) {
+			Running_ = true;
+			Worker_.start(*this);
+		}
+	}
+
+	void KafkaDispatcher::Stop() {
+		if (Running_) {
+			Running_ = false;
+			Queue_.wakeUpAll();
+			Worker_.join();
+		}
+	}
+
+	auto KafkaDispatcher::RegisterTopicWatcher(const std::string &Topic,
 											   Types::TopicNotifyFunction &F) {
-		std::lock_guard G(ConsumerMutex_);
+		std::lock_guard G(Mutex_);
 		auto It = Notifiers_.find(Topic);
 		if (It == Notifiers_.end()) {
 			Types::TopicNotifyFunctionList L;
@@ -255,12 +259,11 @@ namespace OpenWifi {
 		} else {
 			It->second.emplace(It->second.end(), std::make_pair(F, FunctionId_));
 		}
-		Topics_.insert(Topic);
 		return FunctionId_++;
 	}

-	void KafkaConsumer::UnregisterTopicWatcher(const std::string &Topic, int Id) {
-		std::lock_guard G(ConsumerMutex_);
+	void KafkaDispatcher::UnregisterTopicWatcher(const std::string &Topic, int Id) {
+		std::lock_guard G(Mutex_);
 		auto It = Notifiers_.find(Topic);
 		if (It != Notifiers_.end()) {
 			Types::TopicNotifyFunctionList &L = It->second;
@@ -272,17 +275,56 @@ namespace OpenWifi {
 		}
 	}

+	void KafkaDispatcher::Dispatch(const char *Topic, const std::string &Key,
+								   const std::shared_ptr<std::string> Payload) {
+		std::lock_guard G(Mutex_);
+		auto It = Notifiers_.find(Topic);
+		if (It != Notifiers_.end()) {
+			Queue_.enqueueNotification(new KafkaMessage(Topic, Key, Payload));
+		}
+	}
+
+	void KafkaDispatcher::run() {
+		Poco::Logger &Logger_ =
+			Poco::Logger::create("KAFKA-DISPATCHER", KafkaManager()->Logger().getChannel());
+		poco_information(Logger_, "Starting...");
+		Poco::AutoPtr<Poco::Notification> Note(Queue_.waitDequeueNotification());
+		Utils::SetThreadName("kafka:dispatch");
+		while (Note && Running_) {
+			auto Msg = dynamic_cast<KafkaMessage *>(Note.get());
+			if (Msg != nullptr) {
+				auto It = Notifiers_.find(Msg->Topic());
+				if (It != Notifiers_.end()) {
+					const auto &FL = It->second;
+					for (const auto &[CallbackFunc, _] : FL) {
+						CallbackFunc(Msg->Key(), Msg->Payload());
+					}
+				}
+			}
+			Note = Queue_.waitDequeueNotification();
+		}
+		poco_information(Logger_, "Stopped...");
+	}
+
+	void KafkaDispatcher::Topics(std::vector<std::string> &T) {
+		T.clear();
+		for (const auto &[TopicName, _] : Notifiers_)
+			T.push_back(TopicName);
+	}
+
 	int KafkaManager::Start() {
 		if (!KafkaEnabled_)
 			return 0;
 		ConsumerThr_.Start();
 		ProducerThr_.Start();
+		Dispatcher_.Start();
 		return 0;
 	}

 	void KafkaManager::Stop() {
 		if (KafkaEnabled_) {
 			poco_information(Logger(), "Stopping...");
+			Dispatcher_.Stop();
 			ProducerThr_.Stop();
 			ConsumerThr_.Stop();
 			poco_information(Logger(), "Stopped...");
@@ -291,26 +333,39 @@ namespace OpenWifi {
 	}

 	void KafkaManager::PostMessage(const char *topic, const std::string &key,
-								   const std::string & PayLoad, bool WrapMessage) {
+								   const std::shared_ptr<std::string> PayLoad, bool WrapMessage) {
 		if (KafkaEnabled_) {
 			ProducerThr_.Produce(topic, key, WrapMessage ? WrapSystemId(PayLoad) : PayLoad);
 		}
 	}

-	void KafkaManager::PostMessage(const char *topic, const std::string &key,
-					 const Poco::JSON::Object &Object, bool WrapMessage) {
+	void KafkaManager::Dispatch(const char *Topic, const std::string &Key,
+								const std::shared_ptr<std::string> Payload) {
+		Dispatcher_.Dispatch(Topic, Key, Payload);
+	}
+
+	[[nodiscard]] const std::shared_ptr<std::string> KafkaManager::WrapSystemId(const std::shared_ptr<std::string> PayLoad) {
+		*PayLoad = SystemInfoWrapper_ + *PayLoad + "}";
+		return PayLoad;
+	}
+
+	uint64_t KafkaManager::RegisterTopicWatcher(const std::string &Topic,
+												Types::TopicNotifyFunction &F) {
 		if (KafkaEnabled_) {
-			std::ostringstream ObjectStr;
-			Object.stringify(ObjectStr);
-			ProducerThr_.Produce(topic, key, WrapMessage ? WrapSystemId(ObjectStr.str()) : ObjectStr.str());
+			return Dispatcher_.RegisterTopicWatcher(Topic, F);
+		} else {
+			return 0;
 		}
 	}

-	[[nodiscard]] std::string KafkaManager::WrapSystemId(const std::string & PayLoad) {
-		return fmt::format(	R"lit({{ "system" : {{ "id" : {}, "host" : "{}" }}, "payload" : {} }})lit",
-						   MicroServiceID(), MicroServicePrivateEndPoint(), PayLoad ) ;
+	void KafkaManager::UnregisterTopicWatcher(const std::string &Topic, uint64_t Id) {
+		if (KafkaEnabled_) {
+			Dispatcher_.UnregisterTopicWatcher(Topic, Id);
+		}
 	}

+	void KafkaManager::Topics(std::vector<std::string> &T) { Dispatcher_.Topics(T); }
+
 	void KafkaManager::PartitionAssignment(const cppkafka::TopicPartitionList &partitions) {
 		poco_information(
 			Logger(), fmt::format("Partition assigned: {}...", partitions.front().get_partition()));
--- a/src/framework/KafkaManager.h
+++ b/src/framework/KafkaManager.h
@@ -6,7 +6,7 @@

 #include "Poco/Notification.h"
 #include "Poco/NotificationQueue.h"
-#include "Poco/JSON/Object.h"
+
 #include "framework/KafkaTopics.h"
 #include "framework/OpenWifiTypes.h"
 #include "framework/SubSystemServer.h"
@@ -18,17 +18,17 @@ namespace OpenWifi {

 	class KafkaMessage : public Poco::Notification {
 	  public:
-		KafkaMessage(const char * Topic, const std::string &Key, const std::string &Payload)
+		KafkaMessage(const char * Topic, const std::string &Key, std::shared_ptr<std::string> Payload)
 			: Topic_(Topic), Key_(Key), Payload_(Payload) {}

 		inline const char * Topic() { return Topic_; }
 		inline const std::string &Key() { return Key_; }
-		inline const std::string &Payload() { return Payload_; }
+		inline const std::string &Payload() { return *Payload_; }

 	  private:
 		const char *Topic_;
 		std::string Key_;
-		std::string Payload_;
+		std::shared_ptr<std::string> Payload_;
 	};

 	class KafkaProducer : public Poco::Runnable {
@@ -36,10 +36,10 @@ namespace OpenWifi {
 		void run() override;
 		void Start();
 		void Stop();
-		void Produce(const char *Topic, const std::string &Key, const std::string & Payload);
+		void Produce(const char *Topic, const std::string &Key, std::shared_ptr<std::string> Payload);

 	  private:
-		std::mutex Mutex_;
+		std::recursive_mutex Mutex_;
 		Poco::Thread Worker_;
 		mutable std::atomic_bool Running_ = false;
 		Poco::NotificationQueue Queue_;
@@ -47,22 +47,33 @@ namespace OpenWifi {

 	class KafkaConsumer : public Poco::Runnable {
 	  public:
+		void run() override;
 		void Start();
 		void Stop();

 	  private:
-		std::mutex 				ConsumerMutex_;
-		Types::NotifyTable 		Notifiers_;
-		Poco::Thread 			Worker_;
+		std::recursive_mutex Mutex_;
+		Poco::Thread Worker_;
 		mutable std::atomic_bool Running_ = false;
-		uint64_t 				FunctionId_ = 1;
-		std::unique_ptr<cppkafka::ConsumerDispatcher> 	Dispatcher_;
-		std::set<std::string>	Topics_;
+	};

-		void run() override;
-		friend class KafkaManager;
-		std::uint64_t RegisterTopicWatcher(const std::string &Topic, Types::TopicNotifyFunction &F);
+	class KafkaDispatcher : public Poco::Runnable {
+	  public:
+		void Start();
+		void Stop();
+		auto RegisterTopicWatcher(const std::string &Topic, Types::TopicNotifyFunction &F);
 		void UnregisterTopicWatcher(const std::string &Topic, int Id);
+		void Dispatch(const char *Topic, const std::string &Key, const std::shared_ptr<std::string> Payload);
+		void run() override;
+		void Topics(std::vector<std::string> &T);
+
+	  private:
+		std::recursive_mutex Mutex_;
+		Types::NotifyTable Notifiers_;
+		Poco::Thread Worker_;
+		mutable std::atomic_bool Running_ = false;
+		uint64_t FunctionId_ = 1;
+		Poco::NotificationQueue Queue_;
 	};

 	class KafkaManager : public SubSystemServer {
@@ -81,24 +92,20 @@ namespace OpenWifi {
 		void Stop() override;

 		void PostMessage(const char *topic, const std::string &key,
-						 const std::string &PayLoad, bool WrapMessage = true);
-		void PostMessage(const char *topic, const std::string &key,
-						 const Poco::JSON::Object &Object, bool WrapMessage = true);
-
-		[[nodiscard]] std::string WrapSystemId(const std::string & PayLoad);
+						 std::shared_ptr<std::string> PayLoad, bool WrapMessage = true);
+		void Dispatch(const char *Topic, const std::string &Key, std::shared_ptr<std::string> Payload);
+		[[nodiscard]] const std::shared_ptr<std::string> WrapSystemId(std::shared_ptr<std::string> PayLoad);
 		[[nodiscard]] inline bool Enabled() const { return KafkaEnabled_; }
-		inline std::uint64_t RegisterTopicWatcher(const std::string &Topic, Types::TopicNotifyFunction &F) {
-			return ConsumerThr_.RegisterTopicWatcher(Topic,F);
-		}
-		inline void UnregisterTopicWatcher(const std::string &Topic, uint64_t Id) {
-			return ConsumerThr_.UnregisterTopicWatcher(Topic,Id);
-		}
+		uint64_t RegisterTopicWatcher(const std::string &Topic, Types::TopicNotifyFunction &F);
+		void UnregisterTopicWatcher(const std::string &Topic, uint64_t Id);
+		void Topics(std::vector<std::string> &T);

 	  private:
 		bool KafkaEnabled_ = false;
 		std::string SystemInfoWrapper_;
 		KafkaProducer ProducerThr_;
 		KafkaConsumer ConsumerThr_;
+		KafkaDispatcher Dispatcher_;

 		void PartitionAssignment(const cppkafka::TopicPartitionList &partitions);
 		void PartitionRevocation(const cppkafka::TopicPartitionList &partitions);
--- a/src/framework/KafkaTopics.h
+++ b/src/framework/KafkaTopics.h
@@ -20,7 +20,6 @@ namespace OpenWifi::KafkaTopics {
 	inline const char * DEVICE_EVENT_QUEUE = "device_event_queue";
 	inline const char * DEVICE_TELEMETRY = "device_telemetry";
 	inline const char * PROVISIONING_CHANGE = "provisioning_change";
-	inline const char * RRM = "rrm";

 	namespace ServiceEvents {
 		inline const char * EVENT_JOIN = "join";
--- a/src/framework/MicroService.cpp
+++ b/src/framework/MicroService.cpp
@@ -33,23 +33,9 @@ namespace OpenWifi {

 	void MicroService::Exit(int Reason) { std::exit(Reason); }

-    static std::string MakeServiceListString(const Types::MicroServiceMetaMap &Services) {
-        std::string SvcList;
-        for (const auto &Svc : Services) {
-            if (SvcList.empty())
-                SvcList = Svc.second.Type;
-            else
-                SvcList += ", " + Svc.second.Type;
-        }
-        return SvcList;
-    }
-
 	void MicroService::BusMessageReceived([[maybe_unused]] const std::string &Key,
 										  const std::string &Payload) {
 		std::lock_guard G(InfraMutex_);
-
-		Poco::Logger &BusLogger = EventBusManager()->Logger();
-
 		try {
 			Poco::JSON::Parser P;
 			auto Object = P.parse(Payload).extract<Poco::JSON::Object::Ptr>();
@@ -69,10 +55,13 @@ namespace OpenWifi {
 							Object->has(KafkaTopics::ServiceEvents::Fields::KEY)) {
 							auto PrivateEndPoint =
 								Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE).toString();
-							if (Event == KafkaTopics::ServiceEvents::EVENT_LEAVE) {
+							if (Event == KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE &&
+								Services_.find(PrivateEndPoint) != Services_.end()) {
+								Services_[PrivateEndPoint].LastUpdate = Utils::Now();
+							} else if (Event == KafkaTopics::ServiceEvents::EVENT_LEAVE) {
 								Services_.erase(PrivateEndPoint);
-								poco_information(
-									BusLogger,
+								poco_debug(
+									logger(),
 									fmt::format(
 										"Service {} ID={} leaving system.",
 										Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE)
@@ -80,7 +69,14 @@ namespace OpenWifi {
 										ID));
 							} else if (Event == KafkaTopics::ServiceEvents::EVENT_JOIN ||
 									   Event == KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE) {
-								auto ServiceInfo = Types::MicroServiceMeta{
+								poco_debug(
+									logger(),
+									fmt::format(
+										"Service {} ID={} joining system.",
+										Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE)
+											.toString(),
+										ID));
+								Services_[PrivateEndPoint] = Types::MicroServiceMeta{
 									.Id = ID,
 									.Type = Poco::toLower(
 										Object->get(KafkaTopics::ServiceEvents::Fields::TYPE)
@@ -98,46 +94,20 @@ namespace OpenWifi {
 												   .toString(),
 									.LastUpdate = Utils::Now()};

-                                auto s1 = MakeServiceListString(Services_);
-								auto PreviousSize = Services_.size();
-								Services_[PrivateEndPoint] = ServiceInfo;
-								auto CurrentSize = Services_.size();
-								if(Event == KafkaTopics::ServiceEvents::EVENT_JOIN) {
-									if(!s1.empty()) {
-										poco_information(
-											BusLogger,
-											fmt::format(
-												"Service {} ID={} is joining the system.",
-												Object
-													->get(
-														KafkaTopics::ServiceEvents::Fields::PRIVATE)
-													.toString(),
-												ID));
-									}
-									std::string SvcList;
-									for (const auto &Svc : Services_) {
-										if (SvcList.empty())
-											SvcList = Svc.second.Type;
-										else
-											SvcList += ", " + Svc.second.Type;
-									}
-									poco_information(
-										BusLogger,
-										fmt::format("Current list of microservices: {}", SvcList));
-								} else if(CurrentSize!=PreviousSize) {
-									poco_information(
-										BusLogger,
-										fmt::format(
-											"Service {} ID={} is being added back in.",
-											Object
-												->get(KafkaTopics::ServiceEvents::Fields::PRIVATE)
-												.toString(),
-											ID));
+								std::string SvcList;
+								for (const auto &Svc : Services_) {
+									if (SvcList.empty())
+										SvcList = Svc.second.Type;
+									else
+										SvcList += ", " + Svc.second.Type;
 								}
+								poco_information(
+									logger(),
+									fmt::format("Current list of microservices: {}", SvcList));
 							}
 						} else {
-							poco_information(
-								BusLogger,
+							poco_error(
+								logger(),
 								fmt::format("KAFKA-MSG: invalid event '{}', missing a field.",
 											Event));
 						}
@@ -148,39 +118,32 @@ namespace OpenWifi {
 								Object->get(KafkaTopics::ServiceEvents::Fields::TOKEN).toString());
 #endif
 						} else {
-							poco_information(
-								BusLogger,
+							poco_error(
+								logger(),
 								fmt::format("KAFKA-MSG: invalid event '{}', missing token", Event));
 						}
 					} else {
-						poco_information(BusLogger,
+						poco_error(logger(),
 								   fmt::format("Unknown Event: {} Source: {}", Event, ID));
 					}
 				}
 			} else {
-				std::ostringstream os;
-				Object->stringify(std::cout);
-				poco_error(BusLogger, fmt::format("Bad bus message: {}", os.str()));
+				poco_error(logger(), "Bad bus message.");
+                std::ostringstream os;
+                Object->stringify(std::cout);
 			}

-			auto ServiceHint = Services_.begin();
+			auto i = Services_.begin();
 			auto now = Utils::Now();
-            auto si1 = Services_.size();
-            auto ss1 = MakeServiceListString(Services_);
-			while(ServiceHint!=Services_.end()) {
-				if ((now - ServiceHint->second.LastUpdate) > 120) {
-					poco_information(BusLogger, fmt::format("ZombieService: Removing service {}, ", ServiceHint->second.PublicEndPoint));
-					ServiceHint = Services_.erase(ServiceHint);
+			for (; i != Services_.end();) {
+				if ((now - i->second.LastUpdate) > 60) {
+					i = Services_.erase(i);
 				} else
-					++ServiceHint;
+					++i;
 			}
-            if(Services_.size() != si1) {
-                auto ss2 = MakeServiceListString(Services_);
-                poco_information(BusLogger, fmt::format("Current list of microservices: {} -> {}", ss1, ss2));
-            }

 		} catch (const Poco::Exception &E) {
-			BusLogger.log(E);
+			logger().log(E);
 		}
 	}

@@ -449,7 +412,7 @@ namespace OpenWifi {
 			try {
 				DataDir.createDirectory();
 			} catch (const Poco::Exception &E) {
-				Logger_.log(E);
+				logger().log(E);
 			}
 		}
 		WWWAssetsDir_ = ConfigPath("openwifi.restapi.wwwassets", "");
@@ -567,12 +530,14 @@ namespace OpenWifi {
 		for (auto i : SubSystems_) {
 			i->Start();
 		}
-		EventBusManager()->Start();
+		EventBusManager_ = std::make_unique<EventBusManager>(Poco::Logger::create(
+			"EventBusManager", Poco::Logger::root().getChannel(), Poco::Logger::root().getLevel()));
+		EventBusManager_->Start();
 	}

 	void MicroService::StopSubSystemServers() {
 		AddActivity("Stopping");
-		EventBusManager()->Stop();
+		EventBusManager_->Stop();
 		for (auto i = SubSystems_.rbegin(); i != SubSystems_.rend(); ++i) {
 			(*i)->Stop();
 		}
@@ -732,7 +697,7 @@ namespace OpenWifi {
 			auto APIKEY = Request.get("X-API-KEY");
 			return APIKEY == MyHash_;
 		} catch (const Poco::Exception &E) {
-			Logger_.log(E);
+			logger().log(E);
 		}
 		return false;
 	}
--- a/src/framework/MicroService.h
+++ b/src/framework/MicroService.h
@@ -201,6 +201,7 @@ namespace OpenWifi {
 		Poco::JWT::Signer Signer_;
 		Poco::Logger &Logger_;
 		Poco::ThreadPool TimerPool_{"timer:pool", 2, 32};
+		std::unique_ptr<EventBusManager> EventBusManager_;
 	};

 	inline MicroService *MicroService::instance_ = nullptr;
--- a/src/framework/MicroServiceFuncs.cpp
+++ b/src/framework/MicroServiceFuncs.cpp
@@ -129,8 +129,4 @@ namespace OpenWifi {
 		return ALBHealthCheckServer()->RegisterExtendedHealthMessage(Callback);
 	}

-	std::string MicroServiceAccessKey() {
-		return MicroService::instance().Hash();
-	}
-
 } // namespace OpenWifi
--- a/src/framework/MicroServiceFuncs.h
+++ b/src/framework/MicroServiceFuncs.h
@@ -22,7 +22,6 @@ namespace OpenWifi {
 	std::string MicroServicePublicEndPoint();
 	std::string MicroServiceConfigGetString(const std::string &Key,
 											const std::string &DefaultValue);
-	std::string MicroServiceAccessKey();
 	bool MicroServiceConfigGetBool(const std::string &Key, bool DefaultValue);
 	std::uint64_t MicroServiceConfigGetInt(const std::string &Key, std::uint64_t DefaultValue);
 	std::string MicroServicePrivateEndPoint();
--- a/src/framework/RESTAPI_Handler.h
+++ b/src/framework/RESTAPI_Handler.h
@@ -574,37 +574,7 @@ namespace OpenWifi {
 			Poco::JSON::Stringifier::stringify(Object, Answer);
 		}

-        inline void ReturnObject(const std::vector<std::string> &Strings) {
-            Poco::JSON::Array   Arr;
-            for(const auto &String:Strings) {
-                Arr.add(String);
-            }
-            std::ostringstream os;
-            Arr.stringify(os);
-            return ReturnRawJSON(os.str());
-        }
-
-        template<class T> void ReturnObject(const std::vector<T> &Objects) {
-            Poco::JSON::Array   Arr;
-            for(const auto &Object:Objects) {
-                Poco::JSON::Object O;
-                Object.to_json(O);
-                Arr.add(O);
-            }
-            std::ostringstream os;
-            Arr.stringify(os);
-            return ReturnRawJSON(os.str());
-        }
-
-        template<class T> void ReturnObject(const T &Object) {
-            Poco::JSON::Object  O;
-            Object.to_json(O);
-            std::ostringstream os;
-            O.stringify(os);
-            return ReturnRawJSON(os.str());
-        }
-
-        inline void ReturnRawJSON(const std::string &json_doc) {
+		inline void ReturnRawJSON(const std::string &json_doc) {
 			PrepareResponse();
 			if (Request != nullptr) {
 				//   can we compress ???
--- a/src/framework/StorageClass.h
+++ b/src/framework/StorageClass.h
@@ -47,8 +47,6 @@ namespace OpenWifi {

        }

-		Poco::Data::SessionPool &Pool() { return *Pool_; }
-
 	  private:
 		inline int Setup_SQLite();
 		inline int Setup_MySQL();
--- a/src/framework/SubSystemServer.cpp
+++ b/src/framework/SubSystemServer.cpp
@@ -37,7 +37,6 @@ namespace OpenWifi {
 		P.cipherList = "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH";
 		P.dhUse2048Bits = true;
 		P.caLocation = cas_;
-        // P.securityLevel =

 		auto Context = Poco::AutoPtr<Poco::Net::Context>(
 			new Poco::Net::Context(Poco::Net::Context::TLS_SERVER_USE, P));
@@ -54,6 +53,7 @@ namespace OpenWifi {

 			Context->useCertificate(Cert);
 			Context->addChainCertificate(Root);
+
 			Context->addCertificateAuthority(Root);

 			if (level_ == Poco::Net::Context::VERIFY_STRICT) {
@@ -76,18 +76,18 @@ namespace OpenWifi {
 				L.fatal(fmt::format("Wrong Certificate({}) for Key({})", cert_file_, key_file_));
 			}

-            SSL_CTX_set_verify(SSLCtx, level_==Poco::Net::Context::VERIFY_NONE ? SSL_VERIFY_NONE : SSL_VERIFY_PEER, nullptr);
+			SSL_CTX_set_verify(SSLCtx, SSL_VERIFY_PEER, nullptr);

 			if (level_ == Poco::Net::Context::VERIFY_STRICT) {
 				SSL_CTX_set_client_CA_list(SSLCtx, SSL_load_client_CA_file(client_cas_.c_str()));
-                SSL_CTX_enable_ct(SSLCtx, SSL_CT_VALIDATION_STRICT);
 			}
+			SSL_CTX_enable_ct(SSLCtx, SSL_CT_VALIDATION_STRICT);
 			SSL_CTX_dane_enable(SSLCtx);

 			Context->enableSessionCache();
 			Context->setSessionCacheSize(0);
 			Context->setSessionTimeout(60);
-			Context->enableExtendedCertificateVerification( level_!= Poco::Net::Context::VERIFY_NONE );
+			Context->enableExtendedCertificateVerification(true);
 			Context->disableStatelessSessionResumption();
 		}

--- a/src/framework/orm.h
+++ b/src/framework/orm.h
@@ -576,8 +576,8 @@ namespace ORM {
 		bool UpdateRecord(field_name_t FieldName, const T &Value, const RecordType &R) {
 			try {
 				assert(ValidFieldName(FieldName));
+
 				Poco::Data::Session Session = Pool_.get();
-                Session.begin();
 				Poco::Data::Statement Update(Session);

 				RecordTuple RT;
@@ -593,7 +593,6 @@ namespace ORM {
 				Update.execute();
 				if (Cache_)
 					Cache_->UpdateCache(R);
-                Session.commit();
 				return true;
 			} catch (const Poco::Exception &E) {
 				Logger_.log(E);
@@ -663,7 +662,6 @@ namespace ORM {
 				assert(ValidFieldName(FieldName));

 				Poco::Data::Session Session = Pool_.get();
-                Session.begin();
 				Poco::Data::Statement Delete(Session);

 				std::string St = "delete from " + TableName_ + " where " + FieldName + "=?";
@@ -673,7 +671,6 @@ namespace ORM {
 				Delete.execute();
 				if (Cache_)
 					Cache_->Delete(FieldName, Value);
-                Session.commit();
 				return true;
 			} catch (const Poco::Exception &E) {
 				Logger_.log(E);
@@ -685,13 +682,11 @@ namespace ORM {
 			try {
 				assert(!WhereClause.empty());
 				Poco::Data::Session Session = Pool_.get();
-                Session.begin();
 				Poco::Data::Statement Delete(Session);

 				std::string St = "delete from " + TableName_ + " where " + WhereClause;
 				Delete << St;
 				Delete.execute();
-                Session.commit();
 				return true;
 			} catch (const Poco::Exception &E) {
 				Logger_.log(E);
--- a/src/framework/ow_constants.h
+++ b/src/framework/ow_constants.h
@@ -40,7 +40,6 @@ namespace OpenWifi {
 	};
 }

-#define DBGLINE     std::cout << __LINE__ << ":" << __FILE__ << ", " << __func__ << std::endl;
 namespace OpenWifi::RESTAPI::Errors {
 	struct msg {
 		uint64_t err_num;
@@ -406,32 +405,7 @@ namespace OpenWifi::RESTAPI::Errors {
            1172, "The venue name already exists."
    };

-    static const struct msg InvalidGlobalReachAccount {
-            1173, "Invalid Global Reach account information."
-    };
-    static const struct msg CannotCreateCSR {
-            1174, "Cannot create a CSR certificate."
-    };
-
-    static const struct msg DefFirmwareNameExists { 1175, "Firmware name already exists." };
-    static const struct msg NotAValidECKey { 1176, "Not a valid Signing Key." };
-	static const struct msg NotAValidRadiusPoolType { 1177, "Not a valid RADIUS pool type." };
-    static const struct msg InvalidRadiusTypeEndpoint { 1178, "Invalid RADIUS Server Endpoint type." };
-    static const struct msg InvalidRadiusEndpointPoolStrategy { 1179, "Invalid RADIUS Server Endpoint Pool strategy." };
-    static const struct msg EndpointMustHaveOneTypeOfServers { 1180, "All servers must be either RADIUS or RADSEC." };
-    static const struct msg RadiusEndpointIndexInvalid { 1181, "Index must be an address between 0.0.1.1 and 0.0.2.254" };
-    static const struct msg RadiusEndpointIndexMustBeUnique { 1182, "Index must be unique." };
-    static const struct msg OrionAccountMustExist { 1183, "Orion account must exist." };
-    static const struct msg GlobalReachCertMustExist { 1184, "Global Reach certificate must exist." };
-    static const struct msg InvalidRadsecMainCertificate { 1185, "Invalid Radsec main certificate." };
-    static const struct msg InvalidRadsecCaCertificate { 1186, "Invalid Radsec CA certificates." };
-    static const struct msg InvalidRadsecPrivteKey { 1187, "Invalid Radsec Private key." };
-    static const struct msg InvalidRadsecIPAddress { 1188, "Invalid Radsec IP Address." };
-    static const struct msg InvalidRadsecPort { 1189, "Invalid Radsec Port." };
-    static const struct msg InvalidRadsecSecret { 1190, "Invalid Radsec Secret." };
-    static const struct msg InvalidRadiusServer { 1191, "Invalid Radius Server." };
-
-	static const struct msg InvalidRRMAction { 1192, "Invalid RRM Action." };
+    static const struct msg DefFirmwareNameExists { 1172, "Firmware name already exists." };

    static const struct msg SimulationDoesNotExist {
        7000, "Simulation Instance ID does not exist."
@@ -563,10 +537,6 @@ namespace OpenWifi::RESTAPI::Protocol {
 	static const char *CONTENTDISPOSITION = "Content-Disposition";
 	static const char *CONTENTTYPE = "Content-Type";

-	static const char *TRANSFER = "transfer";
-	static const char *CERTUPDATE = "certupdate";
-	static const char *RRM = "rrm";
-
 	static const char *REQUIREMENTS = "requirements";
 	static const char *PASSWORDPATTERN = "passwordPattern";
 	static const char *ACCESSPOLICY = "accessPolicy";
@@ -684,12 +654,6 @@ namespace OpenWifi::uCentralProtocol {
 	static const char *RADIUSCOA = "coa";
 	static const char *RADIUSDST = "dst";
 	static const char *IES = "ies";
-
-	static const char *TRANSFER = "transfer";
-	static const char *CERTUPDATE = "certupdate";
-	static const char *RRM = "rrm";
-	static const char *ACTIONS = "actions";
-
 } // namespace OpenWifi::uCentralProtocol

 namespace OpenWifi::uCentralProtocol::Events {
@@ -782,9 +746,6 @@ namespace OpenWifi::APCommands {
 		telemetry,
 		ping,
 		script,
-		rrm,
-		certupdate,
-		transfer,
 		unknown
 	};

@@ -797,10 +758,7 @@ namespace OpenWifi::APCommands {
 		RESTAPI::Protocol::LEDS,		 RESTAPI::Protocol::TRACE,
 		RESTAPI::Protocol::REQUEST,		 RESTAPI::Protocol::WIFISCAN,
 		RESTAPI::Protocol::EVENTQUEUE,	 RESTAPI::Protocol::TELEMETRY,
-		RESTAPI::Protocol::PING,		 RESTAPI::Protocol::SCRIPT,
-		RESTAPI::Protocol::RRM,		 	 RESTAPI::Protocol::CERTUPDATE,
-		RESTAPI::Protocol::TRANSFER
-	};
+		RESTAPI::Protocol::PING,		 RESTAPI::Protocol::SCRIPT};

 	inline const char *to_string(Commands Cmd) { return uCentralAPCommands[(uint8_t)Cmd]; }

--- a/src/framework/utils.cpp
+++ b/src/framework/utils.cpp
@@ -3,19 +3,10 @@
 //

 #include "Poco/Path.h"
-#include "Poco/TemporaryFile.h"
-#include "Poco/Crypto/ECKey.h"
+
 #include "framework/AppServiceRegistry.h"
 #include "framework/utils.h"

-#include <iostream>
-#include <cstdlib>
-#include <ctime>
-#include <string>
-#include <algorithm>
-
-#include <resolv.h>
-
 namespace OpenWifi::Utils {

 	bool NormalizeMac(std::string &Mac) {
@@ -617,329 +608,4 @@ namespace OpenWifi::Utils {
 		return DT.timestamp().epochTime();
 	}

-    static std::string FileToString(const std::string &Filename) {
-        std::ifstream   ifs(Filename.c_str(),std::ios_base::in|std::ios_base::binary);
-        std::ostringstream os;
-        Poco::StreamCopier::copyStream(ifs,os);
-        return os.str();
-    }
-
-    bool CreateX509CSR(const CSRCreationParameters & Parameters, CSRCreationResults & Results) {
-        int             ret = 0;
-        RSA             *r = nullptr;
-        BIGNUM          *bne = nullptr;
-
-        int             nVersion = 0;
-        unsigned long   e = RSA_F4;
-
-        X509_REQ        *x509_req = nullptr;
-        X509_NAME       *x509_name = nullptr;
-        EVP_PKEY        *pKey = nullptr;
-//        RSA             *tem = nullptr;
-//        BIO             *bio_err = nullptr;
-
-        const char      *szCountry = Parameters.Country.c_str();
-        const char      *szProvince = Parameters.Province.c_str();
-        const char      *szCity = Parameters.City.c_str();
-        const char      *szOrganization = Parameters.Organization.c_str();
-        const char      *szCommon = Parameters.CommonName.c_str();
-
-        Poco::TemporaryFile     CsrPath, PubKey, PrivateKey;
-        std::string             Result;
-        std::ifstream           ifs;
-        std::ostringstream      ss;
-        BIO                     *bp_public = nullptr,
-                *bp_private = nullptr,
-                *bp_csr = nullptr;
-
-        // 1. generate rsa key
-        bne = BN_new();
-        ret = BN_set_word(bne,e);
-        if(ret != 1){
-            goto free_all;
-        }
-
-        r = RSA_new();
-        ret = RSA_generate_key_ex(r, Parameters.bits, bne, nullptr);
-        if(ret != 1){
-            goto free_all;
-        }
-
-        bp_public = BIO_new_file(PubKey.path().c_str(), "w+");
-        ret = PEM_write_bio_RSAPublicKey(bp_public, r);
-        if(ret != 1) {
-            goto free_all;
-        }
-
-        bp_private = BIO_new_file(PrivateKey.path().c_str(), "w+");
-        ret = PEM_write_bio_RSAPrivateKey(bp_private, r, NULL, NULL, 0, NULL, NULL);
-        if(ret != 1) {
-            goto free_all;
-        }
-
-// 2. set version of x509 req
-        x509_req = X509_REQ_new();
-        ret = X509_REQ_set_version(x509_req, nVersion);
-        if (ret != 1){
-            goto free_all;
-        }
-
-// 3. set subject of x509 req
-        x509_name = X509_REQ_get_subject_name(x509_req);
-
-        ret = X509_NAME_add_entry_by_txt(x509_name,"C", MBSTRING_ASC, (const unsigned char*)szCountry, -1, -1, 0);
-        if (ret != 1){
-            goto free_all;
-        }
-
-        ret = X509_NAME_add_entry_by_txt(x509_name,"ST", MBSTRING_ASC, (const unsigned char*)szProvince, -1, -1, 0);
-        if (ret != 1){
-            goto free_all;
-        }
-
-        ret = X509_NAME_add_entry_by_txt(x509_name,"L", MBSTRING_ASC, (const unsigned char*)szCity, -1, -1, 0);
-        if (ret != 1){
-            goto free_all;
-        }
-
-        ret = X509_NAME_add_entry_by_txt(x509_name,"O", MBSTRING_ASC, (const unsigned char*)szOrganization, -1, -1, 0);
-        if (ret != 1){
-            goto free_all;
-        }
-
-        ret = X509_NAME_add_entry_by_txt(x509_name,"CN", MBSTRING_ASC, (const unsigned char*)szCommon, -1, -1, 0);
-        if (ret != 1){
-            goto free_all;
-        }
-
-// 4. set public key of x509 req
-        pKey = EVP_PKEY_new();
-        EVP_PKEY_assign_RSA(pKey, r);
-        r = nullptr;   // will be free rsa when EVP_PKEY_free(pKey)
-
-        ret = X509_REQ_set_pubkey(x509_req, pKey);
-        if (ret != 1){
-            goto free_all;
-        }
-
-// 5. set sign key of x509 req
-        ret = X509_REQ_sign(x509_req, pKey, EVP_sha1());    // return x509_req->signature->length
-        if (ret <= 0){
-            goto free_all;
-        }
-
-        bp_csr = BIO_new_file(CsrPath.path().c_str(),"w");
-        ret = PEM_write_bio_X509_REQ(bp_csr, x509_req);
-
-// 6. free
-        free_all:
-        X509_REQ_free(x509_req);
-        BIO_free_all(bp_csr);
-        BIO_free_all(bp_public);
-        BIO_free_all(bp_private);
-
-        EVP_PKEY_free(pKey);
-        BN_free(bne);
-        if(ret==1) {
-            Results.CSR = FileToString(CsrPath.path());
-            Results.PrivateKey = FileToString(PrivateKey.path());
-            Results.PublicKey = FileToString(PubKey.path());
-        }
-
-        return ret;
-    }
-
-    bool VerifyECKey(const std::string &key) {
-        try {
-            Poco::TemporaryFile F;
-
-            std::ofstream of(F.path().c_str(), std::ios_base::trunc | std::ios_base::out | std::ios_base::binary);
-            of << key;
-            of.close();
-
-            auto Key = Poco::SharedPtr<Poco::Crypto::ECKey>(
-                    new Poco::Crypto::ECKey("", F.path(),""));
-
-            return true;
-        } catch (const Poco::Exception &E) {
-
-        }
-        return false;
-    }
-
-    bool VerifyRSAKey([[
-    maybe_unused]] const std::string &key) {
-        try {
-            Poco::TemporaryFile F;
-
-            std::ofstream of(F.path().c_str(), std::ios_base::trunc | std::ios_base::out | std::ios_base::binary);
-            of << key;
-            of.close();
-
-            auto Key = Poco::SharedPtr<Poco::Crypto::RSAKey>(
-                    new Poco::Crypto::RSAKey("", F.path(),""));
-            return true;
-        } catch (const Poco::Exception &E) {
-
-        }
-        return false;
-    }
-
-    bool VerifyPrivateKey(const std::string &key) {
-        return VerifyECKey(key) || VerifyRSAKey(key);
-    }
-
-    bool ValidX509Certificate([[
-                              maybe_unused]] const std::string &Cert) {
-        try {
-            Poco::TemporaryFile F;
-            std::ofstream of(F.path().c_str(), std::ios_base::trunc | std::ios_base::out | std::ios_base::binary);
-            of << Cert;
-            of.close();
-
-            auto Key = Poco::SharedPtr<Poco::Crypto::X509Certificate>(
-                    new Poco::Crypto::X509Certificate(F.path()));
-            return true;
-        } catch (const Poco::Exception &E) {
-
-        }
-        return false;
-    }
-
-    bool ValidX509Certificate([[
-                              maybe_unused]] const std::vector<std::string> &Certs) {
-        auto F = [](const std::string &C) -> bool { return ValidX509Certificate(C); };
-        return std::all_of(Certs.begin(),Certs.end(), F);
-    }
-
-    std::string generateStrongPassword(int minLength, int maxLength, int numDigits, int minLowercase, int minSpecial, int minUppercase) {
-        // Define character sets for each category
-        const std::string lowercaseChars = "abcdefghijklmnopqrstuvwxyz";
-        const std::string uppercaseChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-        const std::string digitChars = "0123456789";
-        const std::string specialChars = "!@#$%^&*()_+[]{}|;:,.<>?";
-
-        // Check if parameters are valid
-        if (minLength < 1 || minLength > maxLength || minLowercase + minUppercase + numDigits + minSpecial > maxLength) {
-            return "Invalid parameters";
-        }
-
-        // Initialize random seed
-        std::random_device rd;
-        std::mt19937 g(rd());
-
-        // Initialize the password string
-        std::string password;
-
-        // Generate the required number of each character type
-        for (int i = 0; i < minLowercase; ++i) {
-            password += lowercaseChars[g() % lowercaseChars.length()];
-        }
-        for (int i = 0; i < minUppercase; ++i) {
-            password += uppercaseChars[g() % uppercaseChars.length()];
-        }
-        for (int i = 0; i < numDigits; ++i) {
-            password += digitChars[g() % digitChars.length()];
-        }
-        for (int i = 0; i < minSpecial; ++i) {
-            password += specialChars[g() % specialChars.length()];
-        }
-
-        // Calculate how many more characters are needed
-        int remainingLength = maxLength - (int)password.length();
-
-        // Generate random characters to fill the remaining length
-        for (int i = 0; i < remainingLength; ++i) {
-            int category = g() % 4; // Randomly select a category
-            if (category == 0) {
-                password += lowercaseChars[g() % lowercaseChars.length()];
-            } else if (category == 1) {
-                password += uppercaseChars[g() % uppercaseChars.length()];
-            } else if (category == 2) {
-                password += digitChars[g() % digitChars.length()];
-            } else {
-                password += specialChars[g() % specialChars.length()];
-            }
-        }
-
-        // Shuffle the password to randomize the character order
-        std::shuffle(password.begin(), password.end(),g);
-
-        return password;
-    }
-
-// Function to query NAPTR records for a domain and return them in a vector
-    std::vector<NAPTRRecord> getNAPTRRecords(const std::string& domain) {
-        std::vector<NAPTRRecord> naptrRecords;
-
-        unsigned char buf[4096];
-        ns_msg handle;
-        ns_initparse(buf, NS_PACKETSZ, &handle);
-
-        // Query NAPTR records for the given domain
-        int response = res_query(domain.c_str(), ns_c_in, ns_t_naptr, buf, sizeof(buf));
-        if (response < 0) {
-            return naptrRecords;
-        }
-
-        if(ns_initparse(buf, response, &handle) < 0) {
-            return naptrRecords;
-        }
-
-        // Iterate through the DNS response and extract NAPTR records
-        int count = ns_msg_count(handle, ns_s_an);
-        for (int i = 0; i < count; ++i) {
-            ns_rr rr;
-            if (ns_parserr(&handle, ns_s_an, i, &rr) == 0) {
-                char rdata[256];
-                ns_sprintrr(&handle, &rr, nullptr, nullptr, rdata, sizeof(rdata));
-                NAPTRRecord record;
-                std::istringstream os(rdata);
-                os  >> record.name >> record.ttl >> record.rclass >> record.rtype >> record.order >> record.preference >> record.flags
-                    >> record.service >> record.regexp >>  record.replacement;
-                naptrRecords.push_back(record);
-            }
-        }
-
-        return naptrRecords;
-    }
-
-    std::vector<SrvRecord> getSRVRecords(const std::string& domain) {
-        std::vector<SrvRecord> srvRecords;
-
-        // Buffer to hold the DNS response
-        unsigned char buf[4096];
-        ns_msg handle;
-        ns_initparse(buf, NS_PACKETSZ, &handle);
-
-        // Query NAPTR records for the given domain
-        int response = res_query(domain.c_str(), ns_c_in, ns_t_srv, buf, sizeof(buf));
-        if (response < 0) {
-            std::cerr << "DNS query failed for " << domain << ": " << hstrerror(h_errno) << std::endl;
-            return srvRecords;
-        }
-
-        if(ns_initparse(buf, response, &handle) < 0) {
-            return srvRecords;
-        }
-
-        // Iterate through the DNS response and extract NAPTR records
-        int count = ns_msg_count(handle, ns_s_an);
-        for (int i = 0; i < count; ++i) {
-            ns_rr rr;
-            if (ns_parserr(&handle, ns_s_an, i, &rr) == 0) {
-                char rdata[256];
-                ns_sprintrr(&handle, &rr, nullptr, nullptr, rdata, sizeof(rdata));
-                SrvRecord record;
-                std::istringstream os(rdata);
-                os  >>  record.name >> record.ttl >> record.rclass >> record.rtype >> record.pref >> record.weight >>
-                    record.port >> record.srvname ;
-                srvRecords.push_back(record);
-            }
-        }
-
-        return srvRecords;
-    }
-
-
 } // namespace OpenWifi::Utils
--- a/src/framework/utils.h
+++ b/src/framework/utils.h
@@ -247,159 +247,4 @@ namespace OpenWifi::Utils {
 		return count;
 	}

-    inline std::uint32_t IPtoInt(const std::string &A) {
-        Poco::Net::IPAddress    IP;
-        std::uint32_t Result=0;
-
-        if(Poco::Net::IPAddress::tryParse(A,IP)) {
-            for(const auto i:IP.toBytes()) {
-                Result <<= 8;
-                Result += i;
-            }
-        }
-        return Result;
-    }
-
-    inline bool ValidIP(const std::string &IPstr) {
-        Poco::Net::IPAddress    IP;
-        return Poco::Net::IPAddress::tryParse(IPstr,IP);
-    }
-
-    struct CSRCreationParameters {
-        std::string Country, Province, City,
-                    Organization, CommonName;
-        int         bits=2048;
-    };
-
-    struct CSRCreationResults {
-        std::string     CSR, PublicKey, PrivateKey;
-    };
-
-    bool CreateX509CSR(const CSRCreationParameters & Parameters, CSRCreationResults & Results);
-    std::string generateStrongPassword(int minLength, int maxLength, int numDigits, int minLowercase, int minSpecial, int minUppercase);
-    bool VerifyECKey(const std::string &key);
-    bool VerifyRSAKey(const std::string &key);
-    bool VerifyPrivateKey(const std::string &key);
-    bool ValidX509Certificate(const std::string &Cert);
-    bool ValidX509Certificate(const std::vector<std::string> &Certs);
-
-    struct NAPTRRecord {
-        std::string     name;
-        std::string     ttl;
-        std::string     rclass;
-        std::string     rtype;
-        uint32_t        order=0;
-        uint32_t        preference=0;
-        std::string     flags;
-        std::string     service;
-        std::string     regexp;
-        std::string     replacement;
-    };
-
-// Function to query NAPTR records for a domain and return them in a vector
-    std::vector<NAPTRRecord> getNAPTRRecords(const std::string& domain);
-    struct SrvRecord {
-        std::string     name;
-        std::string     ttl;
-        std::string     rclass;
-        std::string     rtype;
-        uint32_t        pref = 0;
-        uint32_t        weight = 0;
-        uint32_t        port = 0;
-        std::string     srvname;
-    };
-
-    std::vector<SrvRecord> getSRVRecords(const std::string& domain);
-
-    struct HostNameServerResult{
-        std::string     Hostname;
-        uint32_t        Port;
-    };
-
-	class CompressedString {
-	  public:
-		CompressedString() {
-			DecompressedSize_ = 0;
-		};
-
-		explicit CompressedString(const std::string &Data) : DecompressedSize_(Data.size()) {
-			CompressIt(Data);
-		}
-
-		CompressedString(const CompressedString &Data) {
-			this->DecompressedSize_ = Data.DecompressedSize_;
-			this->CompressedData_ = Data.CompressedData_;
-		}
-
-		CompressedString& operator=(const CompressedString& rhs) {
-			if (this != &rhs) {
-				this->DecompressedSize_ = rhs.DecompressedSize_;
-				this->CompressedData_ = rhs.CompressedData_;
-			}
-			return *this;
-		}
-
-		CompressedString& operator=(CompressedString&& rhs) {
-			if (this != &rhs) {
-				this->DecompressedSize_ = rhs.DecompressedSize_;
-				this->CompressedData_ = rhs.CompressedData_;
-			}
-			return *this;
-		}
-
-		~CompressedString() = default;
-
-		operator std::string() const {
-			return DecompressIt();
-		}
-
-		CompressedString &operator=(const std::string &Data) {
-			DecompressedSize_ = Data.size();
-			CompressIt(Data);
-			return *this;
-		}
-
-		auto CompressedSize() const { return CompressedData_.size(); }
-		auto DecompressedSize() const { return DecompressedSize_; }
-
-	  private:
-		std::string     CompressedData_;
-		std::size_t     DecompressedSize_;
-
-		inline void CompressIt(const std::string &Data) {
-			z_stream strm; // = {0};
-			CompressedData_.resize(Data.size());
-			strm.next_in = (Bytef *)Data.data();
-			strm.avail_in = Data.size();
-			strm.next_out = (Bytef *)CompressedData_.data();
-			strm.avail_out = Data.size();
-			strm.zalloc = Z_NULL;
-			strm.zfree = Z_NULL;
-			strm.opaque = Z_NULL;
-			deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 15 + 16, 8, Z_DEFAULT_STRATEGY);
-			deflate(&strm, Z_FINISH);
-			deflateEnd(&strm);
-			CompressedData_.resize(strm.total_out);
-		}
-
-		[[nodiscard]] std::string DecompressIt() const {
-			std::string Result;
-			if(DecompressedSize_!=0) {
-				Result.resize(DecompressedSize_);
-				z_stream strm ; //= {0};
-				strm.next_in = (Bytef *)CompressedData_.data();
-				strm.avail_in = CompressedData_.size();
-				strm.next_out = (Bytef *)Result.data();
-				strm.avail_out = Result.size();
-				strm.zalloc = Z_NULL;
-				strm.zfree = Z_NULL;
-				strm.opaque = Z_NULL;
-				inflateInit2(&strm, 15 + 32);
-				inflate(&strm, Z_FINISH);
-				inflateEnd(&strm);
-			}
-			return Result;
-		}
-	};
-
 } // namespace OpenWifi::Utils
--- a/src/rttys/RTTYS_server.cpp
+++ b/src/rttys/RTTYS_server.cpp
@@ -21,18 +21,9 @@
 #include "Poco/Net/SocketAcceptor.h"
 #include <algorithm>

-/*

-2023-09-25 14:57:48.963 RADSEC: radsec.openro.am@3.33.129.120:2084: [Error][thr:7] SSL connection unexpectedly closed
-2023-09-25 14:57:48.964 RADSEC: radsec.openro.am@3.33.129.120:2084: [Information][thr:7] Disconnecting.
-2023-09-25 14:57:50.965 RADSEC: radsec.openro.am@3.33.129.120:2084: [Information][thr:40] Attempting to connect
-2023-09-25 14:57:51.675 RTTY-SVR: [Error][thr:6] Frame readable shutdown.
-2023-09-25 14:57:51.675 RTTY-SVR: [Debug][thr:6] Closing connection onClientSocketReadable:646
-2023-09-25 14:57:51.717 RADSEC: radsec.openro.am@3.33.129.120:2084: [Information][thr:40] Connected. CN=radsec.openro.am
-2023-09-25 14:57:51.717 RADSEC: radsec.openro.am@3.33.129.120:2084: [Error][thr:7] SSL connection unexpectedly closed
-2023-09-25 14:57:51.717 RADSEC: radsec.openro.am@3.33.129.120:2084: [Information][thr:7] Disconnecting.
-
- */
+#define DBGLINE                                                                                    \
+	{ std::cout << __LINE__ << std::endl; }

 namespace OpenWifi {

@@ -146,7 +137,7 @@ namespace OpenWifi {

 				auto WebClientSecureContext =
 					new Poco::Net::Context(Poco::Net::Context::SERVER_USE, KeyFileName,
-										   CertFileName, "", Poco::Net::Context::VERIFY_NONE);
+										   CertFileName, "", Poco::Net::Context::VERIFY_RELAXED);
 				Poco::Crypto::X509Certificate WebRoot(RootCaFileName);
 				WebClientSecureContext->addCertificateAuthority(WebRoot);
 				WebClientSecureContext->disableStatelessSessionResumption();
@@ -449,9 +440,11 @@ namespace OpenWifi {
 			std::size_t 	agg_buf_pos=0;

 			try {
+//				std::cout << "Available: " << buffer.available() << "  ";
 				Poco::Timespan	TS(5,0);
 				received_bytes = hint->second->socket.receiveBytes(buffer);
 				if(received_bytes==0) {
+					// std::cout << hint->second->socket.lastError() << std::endl;
 					poco_warning(Logger(), "Device Closing connection - 0 bytes received.");
 					EndConnection( pNf->socket(), __func__, __LINE__ );
 					return;
@@ -492,6 +485,9 @@ namespace OpenWifi {
 					return;
 				}

+//				std::cout << line++ << "  Available: " << buffer.available() << "  Cmd: " << (int) LastCommand << "  Received: " << received_bytes
+//						  << "  MsgLen: " << msg_len << "  Data in buffer: " << buffer.used() << std::endl;
+
 				buffer.drain(RTTY_HDR_SIZE);

 				switch (LastCommand) {
@@ -541,6 +537,8 @@ namespace OpenWifi {
 				EmptyBuffer(fd, agg_buffer, agg_buf_pos);
 			}

+//			std::cout << "Empty: " << buffer.isEmpty() << std::endl;
+
 			if (!good) {
 				EndConnection(pNf->socket(), __func__, __LINE__);
 			}
@@ -585,7 +583,7 @@ namespace OpenWifi {
 			}

 			int flags;
-			unsigned char FrameBuffer[64000];
+			unsigned char FrameBuffer[1024];

 			auto ReceivedBytes = Connection->WSSocket_->receiveFrame(FrameBuffer, sizeof(FrameBuffer), flags);
 			auto Op = flags & Poco::Net::WebSocket::FRAME_OP_BITMASK;
@@ -1042,6 +1040,7 @@ namespace OpenWifi {
 				// buffer.drain(msg_len);
 				return true;
 			} catch (const Poco::Exception &E) {
+				std::cout << "Failed to send WS stuff" << std::endl;
 				Logger().log(E);
 			} catch (const std::exception &E) {
 				LogStdException(E, "Cannot send data to UI Client");
--- a/src/storage/storage_blacklist.cpp
+++ b/src/storage/storage_blacklist.cpp
@@ -56,10 +56,10 @@ namespace OpenWifi {
 	struct DeviceDetails {
 		std::string reason;
 		std::string author;
-		std::uint64_t created=Utils::Now();
+		std::uint64_t created;
 	};

-	static std::map<std::uint64_t , DeviceDetails> BlackListDevices;
+	static std::map<std::string, DeviceDetails> BlackListDevices;
 	static std::recursive_mutex BlackListMutex;

 	bool Storage::InitializeBlackListCache() {
@@ -78,7 +78,7 @@ namespace OpenWifi {
 				auto Reason = RSet[1].convert<std::string>();
 				auto Author = RSet[2].convert<std::string>();
 				auto Created = RSet[3].convert<std::uint64_t>();
-				BlackListDevices[Utils::MACToInt(SerialNumber)] =
+				BlackListDevices[SerialNumber] =
 					DeviceDetails{.reason = Reason, .author = Author, .created = Created};
 				More = RSet.moveNext();
 			}
@@ -93,7 +93,6 @@ namespace OpenWifi {
 	bool Storage::AddBlackListDevice(GWObjects::BlackListedDevice &Device) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Insert(Sess);

 			std::string St{"INSERT INTO BlackList (" + DB_BlackListDeviceSelectFields + ") " +
@@ -103,9 +102,9 @@ namespace OpenWifi {
 			ConvertBlackListDeviceRecord(Device, T);
 			Insert << ConvertParams(St), Poco::Data::Keywords::use(T);
 			Insert.execute();
-			Sess.commit();
+
 			std::lock_guard G(BlackListMutex);
-			BlackListDevices[Utils::MACToInt(Device.serialNumber)] = DeviceDetails{
+			BlackListDevices[Device.serialNumber] = DeviceDetails{
 				.reason = Device.reason, .author = Device.author, .created = Device.created};
 			return true;
 		} catch (const Poco::Exception &E) {
@@ -131,7 +130,6 @@ namespace OpenWifi {
 	bool Storage::DeleteBlackListDevice(std::string &SerialNumber) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Delete(Sess);

 			std::string St{"DELETE FROM BlackList WHERE SerialNumber=?"};
@@ -139,9 +137,9 @@ namespace OpenWifi {
 			Poco::toLowerInPlace(SerialNumber);
 			Delete << ConvertParams(St), Poco::Data::Keywords::use(SerialNumber);
 			Delete.execute();
-			Sess.commit();
+
 			std::lock_guard G(BlackListMutex);
-			BlackListDevices.erase(Utils::MACToInt(SerialNumber));
+			BlackListDevices.erase(SerialNumber);
 			return true;
 		} catch (const Poco::Exception &E) {
 			poco_warning(Logger(), fmt::format("{}: Failed with: {}", std::string(__func__),
@@ -179,7 +177,6 @@ namespace OpenWifi {
 										GWObjects::BlackListedDevice &Device) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Update(Sess);

 			std::string St{"UPDATE BlackList SET " + DB_BlackListDeviceUpdateFields +
@@ -190,9 +187,9 @@ namespace OpenWifi {
 			Update << ConvertParams(St), Poco::Data::Keywords::use(T),
 				Poco::Data::Keywords::use(SerialNumber);
 			Update.execute();
-			Sess.commit();
+
 			std::lock_guard G(BlackListMutex);
-			BlackListDevices[Utils::MACToInt(Device.serialNumber)] = DeviceDetails{
+			BlackListDevices[Device.serialNumber] = DeviceDetails{
 				.reason = Device.reason, .author = Device.author, .created = Device.created};

 			return true;
@@ -236,10 +233,10 @@ namespace OpenWifi {
 		return BlackListDevices.size();
 	}

-	bool Storage::IsBlackListed(std::uint64_t SerialNumber, std::string &reason,
+	bool Storage::IsBlackListed(const std::string &SerialNumber, std::string &reason,
 								std::string &author, std::uint64_t &created) {
 		std::lock_guard G(BlackListMutex);
-		auto DeviceHint = BlackListDevices.find(SerialNumber);
+		auto DeviceHint = BlackListDevices.find(Poco::toLower(SerialNumber));
 		if (DeviceHint == end(BlackListDevices))
 			return false;
 		reason = DeviceHint->second.reason;
@@ -248,9 +245,9 @@ namespace OpenWifi {
 		return true;
 	}

-	bool Storage::IsBlackListed(std::uint64_t SerialNumber) {
+	bool Storage::IsBlackListed(const std::string &SerialNumber) {
 		std::lock_guard G(BlackListMutex);
-		auto DeviceHint = BlackListDevices.find(SerialNumber);
+		auto DeviceHint = BlackListDevices.find(Poco::toLower(SerialNumber));
 		return DeviceHint != end(BlackListDevices);
 	}
 } // namespace OpenWifi
--- a/src/storage/storage_capabilities.cpp
+++ b/src/storage/storage_capabilities.cpp
@@ -17,11 +17,11 @@

 namespace OpenWifi {

-	bool Storage::CreateDeviceCapabilities(Poco::Data::Session &Session, std::string &SerialNumber,
+	bool Storage::CreateDeviceCapabilities(std::string &SerialNumber,
 										   const Config::Capabilities &Capabilities) {
 		try {
-			Session.begin();
-			Poco::Data::Statement UpSert(Session);
+			Poco::Data::Session Sess = Pool_->get();
+			Poco::Data::Statement UpSert(Sess);

 			std::string TCaps{Capabilities.AsString()};
 			uint64_t Now = Utils::Now();
@@ -33,7 +33,6 @@ namespace OpenWifi {
 				Poco::Data::Keywords::use(Now), Poco::Data::Keywords::use(TCaps),
 				Poco::Data::Keywords::use(Now);
 			UpSert.execute();
-			Session.commit();
 			return true;
 		} catch (const Poco::Exception &E) {
 			poco_warning(Logger(), fmt::format("{}: Failed with: {}", std::string(__func__),
@@ -42,11 +41,11 @@ namespace OpenWifi {
 		return false;
 	}

-	bool Storage::UpdateDeviceCapabilities(Poco::Data::Session &Session, std::string &SerialNumber,
+	bool Storage::UpdateDeviceCapabilities(std::string &SerialNumber,
 										   const Config::Capabilities &Caps) {
 		try {
-			Session.begin();
-			Poco::Data::Statement UpSert(Session);
+			Poco::Data::Session Sess = Pool_->get();
+			Poco::Data::Statement UpSert(Sess);

 			uint64_t Now = Utils::Now();
 			if (!Caps.Compatible().empty() && !Caps.Platform().empty())
@@ -62,7 +61,6 @@ namespace OpenWifi {
 				Poco::Data::Keywords::use(Now), Poco::Data::Keywords::use(TCaps),
 				Poco::Data::Keywords::use(Now);
 			UpSert.execute();
-			Session.commit();
 			return true;
 		} catch (const Poco::Exception &E) {
 			poco_warning(Logger(), fmt::format("{}: Failed with: {}", std::string(__func__),
@@ -101,14 +99,13 @@ namespace OpenWifi {
 	bool Storage::DeleteDeviceCapabilities(std::string &SerialNumber) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Delete(Sess);

 			std::string St{"DELETE FROM Capabilities WHERE SerialNumber=?"};

 			Delete << ConvertParams(St), Poco::Data::Keywords::use(SerialNumber);
 			Delete.execute();
-			Sess.commit();
+
 			return true;
 		} catch (const Poco::Exception &E) {
 			poco_warning(Logger(), fmt::format("{}: Failed with: {}", std::string(__func__),
--- a/src/storage/storage_command.cpp
+++ b/src/storage/storage_command.cpp
@@ -105,7 +105,6 @@ namespace OpenWifi {
 	bool Storage::RemoveOldCommands(std::string &SerialNumber, std::string &Command) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Delete(Sess);

 			std::string St{
@@ -113,7 +112,8 @@ namespace OpenWifi {
 			Delete << ConvertParams(St), Poco::Data::Keywords::use(SerialNumber),
 				Poco::Data::Keywords::use(Command);
 			Delete.execute();
-			Sess.commit();
+			Delete.reset(Sess);
+
 			return true;
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
@@ -146,7 +146,6 @@ namespace OpenWifi {
 			RemoveOldCommands(SerialNumber, Command.Command);

 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Insert(Sess);

 			std::string St{"INSERT INTO CommandList ( " + DB_Command_SelectFields + " ) VALUES( " +
@@ -157,7 +156,7 @@ namespace OpenWifi {

 			Insert << ConvertParams(St), Poco::Data::Keywords::use(R);
 			Insert.execute();
-			Sess.commit();
+
 			return true;

 		} catch (const Poco::Exception &E) {
@@ -216,7 +215,6 @@ namespace OpenWifi {
 	bool Storage::DeleteCommands(std::string &SerialNumber, uint64_t FromDate, uint64_t ToDate) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Delete(Sess);

 			bool DatesIncluded = (FromDate != 0 || ToDate != 0);
@@ -239,7 +237,8 @@ namespace OpenWifi {

 			Delete << IntroStatement + DateSelector;
 			Delete.execute();
-			Sess.commit();
+			Delete.reset(Sess);
+
 			return true;
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
@@ -275,6 +274,7 @@ namespace OpenWifi {
 				if (Records.size() < HowMany)
 					Done = true;
 			}
+			Select.reset(Sess);
 			return true;
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
@@ -286,7 +286,6 @@ namespace OpenWifi {

 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Update(Sess);

 			std::string St{"UPDATE CommandList SET Status=?,  Executed=?,  Completed=?,  "
@@ -300,7 +299,7 @@ namespace OpenWifi {
 				Poco::Data::Keywords::use(Command.ErrorCode), Poco::Data::Keywords::use(UUID);

 			Update.execute();
-			Sess.commit();
+
 			return true;

 		} catch (const Poco::Exception &E) {
@@ -312,7 +311,6 @@ namespace OpenWifi {
 	bool Storage::SetCommandExecuted(std::string &CommandUUID) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Update(Sess);

 			auto Now = Utils::Now();
@@ -323,7 +321,6 @@ namespace OpenWifi {
 			Update << ConvertParams(St), Poco::Data::Keywords::use(Now),
 				Poco::Data::Keywords::use(Status), Poco::Data::Keywords::use(CommandUUID);
 			Update.execute();
-			Sess.commit();
 			return true;
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
@@ -334,7 +331,6 @@ namespace OpenWifi {
 	void Storage::RemovedExpiredCommands() {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Update(Sess);

 			auto Now = Utils::Now(), Window = Now - CommandManager()->CommandTimeout();
@@ -345,7 +341,8 @@ namespace OpenWifi {
 			Update << ConvertParams(St), Poco::Data::Keywords::use(Now),
 				Poco::Data::Keywords::use(Status), Poco::Data::Keywords::use(Window);
 			Update.execute();
-			Sess.commit();
+			Update.reset(Sess);
+
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
 		}
@@ -354,7 +351,6 @@ namespace OpenWifi {
 	bool Storage::SetCommandLastTry(std::string &CommandUUID) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Update(Sess);

 			auto Now = Utils::Now();
@@ -363,7 +359,6 @@ namespace OpenWifi {
 			Update << ConvertParams(St), Poco::Data::Keywords::use(Now),
 				Poco::Data::Keywords::use(CommandUUID);
 			Update.execute();
-			Sess.commit();
 			return true;
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
@@ -374,7 +369,6 @@ namespace OpenWifi {
 	void Storage::RemoveTimedOutCommands() {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Update(Sess);

 			auto Now = Utils::Now(), Window = Now - CommandManager()->CommandTimeout();
@@ -383,7 +377,7 @@ namespace OpenWifi {
 			Update << ConvertParams(St), Poco::Data::Keywords::use(Now),
 				Poco::Data::Keywords::use(Window);
 			Update.execute();
-			Sess.commit();
+			Update.reset(Sess);
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
 		}
@@ -392,7 +386,6 @@ namespace OpenWifi {
 	bool Storage::SetCommandTimedOut(std::string &CommandUUID) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Update(Sess);

 			auto Now = Utils::Now();
@@ -402,7 +395,6 @@ namespace OpenWifi {
 			Update << ConvertParams(St), Poco::Data::Keywords::use(Now),
 				Poco::Data::Keywords::use(Status), Poco::Data::Keywords::use(CommandUUID);
 			Update.execute();
-			Sess.commit();
 			return true;
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
@@ -433,7 +425,6 @@ namespace OpenWifi {
 	bool Storage::DeleteCommand(std::string &UUID) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Delete(Sess);

 			std::string St{"DELETE FROM CommandList WHERE UUID=?"};
@@ -444,7 +435,8 @@ namespace OpenWifi {
 			St = "DELETE FROM FileUploads WHERE UUID=?";
 			Delete << ConvertParams(St), Poco::Data::Keywords::use(UUID);
 			Delete.execute();
-			Sess.commit();
+			Delete.reset(Sess);
+
 			return true;
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
@@ -518,7 +510,6 @@ namespace OpenWifi {
 			auto Now = Utils::Now();

 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Update(Sess);

 			std::string St{"UPDATE CommandList SET Executed=? WHERE UUID=?"};
@@ -527,7 +518,7 @@ namespace OpenWifi {
 				Poco::Data::Keywords::use(UUID);

 			Update.execute();
-			Sess.commit();
+
 			return true;
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
@@ -564,7 +555,6 @@ namespace OpenWifi {
 			}

 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Update(Sess);

 			auto Status = to_string(Storage::CommandExecutionType::COMMAND_COMPLETED);
@@ -576,7 +566,6 @@ namespace OpenWifi {
 				Poco::Data::Keywords::use(ResultStr), Poco::Data::Keywords::use(Status),
 				Poco::Data::Keywords::use(tET), Poco::Data::Keywords::use(UUID);
 			Update.execute();
-			Sess.commit();
 			return true;
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
@@ -614,7 +603,6 @@ namespace OpenWifi {
 	bool Storage::CancelWaitFile(std::string &UUID, std::string &ErrorText) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			auto Now = Utils::Now();
 			uint64_t Size = 0, WaitForFile = 0;

@@ -628,7 +616,6 @@ namespace OpenWifi {
 				Poco::Data::Keywords::use(ErrorText), Poco::Data::Keywords::use(Now),
 				Poco::Data::Keywords::use(UUID);
 			Update.execute();
-			Sess.commit();
 			return true;
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
@@ -644,7 +631,6 @@ namespace OpenWifi {
 			uint64_t Size = FileContent.str().size();

 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Statement(Sess);

 			std::string StatementStr;
@@ -658,14 +644,14 @@ namespace OpenWifi {
 				Poco::Data::Keywords::use(Now), Poco::Data::Keywords::use(Size),
 				Poco::Data::Keywords::use(UUID);
 			Statement.execute();
-			Sess.commit();
+
 			if (Size < FileUploader()->MaxSize()) {

 				Poco::Data::BLOB TheBlob;

 				TheBlob.appendRaw((const unsigned char *)FileContent.str().c_str(),
 								  FileContent.str().size());
-				Sess.begin();
+
 				Poco::Data::Statement Insert(Sess);
 				std::string FileType{Type};

@@ -676,12 +662,10 @@ namespace OpenWifi {
 					Poco::Data::Keywords::use(FileType), Poco::Data::Keywords::use(Now),
 					Poco::Data::Keywords::use(TheBlob);
 				Insert.execute();
-				Sess.commit();
+				return true;
 			} else {
 				poco_warning(Logger(), fmt::format("File {} is too large.", UUID));
 			}
-			Sess.commit();
-			return true;
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
 		}
@@ -728,7 +712,6 @@ namespace OpenWifi {
 	bool Storage::SetCommandResult(std::string &UUID, std::string &Result) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Update(Sess);

 			auto Now = Utils::Now();
@@ -739,7 +722,6 @@ namespace OpenWifi {
 				Poco::Data::Keywords::use(Result), Poco::Data::Keywords::use(Status),
 				Poco::Data::Keywords::use(UUID);
 			Update.execute();
-			Sess.commit();
 			return true;

 		} catch (const Poco::Exception &E) {
@@ -751,14 +733,13 @@ namespace OpenWifi {
 	bool Storage::RemoveAttachedFile(std::string &UUID) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Delete(Sess);

 			std::string St{"DELETE FROM FileUploads WHERE UUID=?"};

 			Delete << ConvertParams(St), Poco::Data::Keywords::use(UUID);
 			Delete.execute();
-			Sess.commit();
+
 			return true;

 		} catch (const Poco::Exception &E) {
@@ -770,13 +751,11 @@ namespace OpenWifi {
 	bool Storage::RemoveUploadedFilesRecordsOlderThan(uint64_t Date) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Delete(Sess);

 			std::string St1{"delete from FileUploads where Created<?"};
 			Delete << ConvertParams(St1), Poco::Data::Keywords::use(Date);
 			Delete.execute();
-			Sess.commit();
 			return true;
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
@@ -787,13 +766,11 @@ namespace OpenWifi {
 	bool Storage::RemoveCommandListRecordsOlderThan(uint64_t Date) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Delete(Sess);

 			std::string St1{"delete from CommandList where Submitted<?"};
 			Delete << ConvertParams(St1), Poco::Data::Keywords::use(Date);
 			Delete.execute();
-			Sess.commit();
 			return true;
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
--- a/src/storage/storage_def_firmware.cpp
+++ b/src/storage/storage_def_firmware.cpp
@@ -82,7 +82,6 @@ namespace OpenWifi {
 			if (!TmpName.empty())
 				return false;

-			Sess.begin();
 			Poco::Data::Statement Insert(Sess);

 			std::string St2{"INSERT INTO DefaultFirmwares ( " + DB_DefFirmware_SelectFields +
@@ -95,7 +94,6 @@ namespace OpenWifi {
 			Insert << ConvertParams(St2),
 				Poco::Data::Keywords::use(R);
 			Insert.execute();
-			Sess.commit();
 			return true;

 		} catch (const Poco::Exception &E) {
@@ -109,7 +107,6 @@ namespace OpenWifi {
 		try {

 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Delete(Sess);
 			Poco::toLowerInPlace(deviceType);

@@ -117,7 +114,7 @@ namespace OpenWifi {

 			Delete << ConvertParams(St), Poco::Data::Keywords::use(deviceType);
 			Delete.execute();
-			Sess.commit();
+
 			return true;
 		} catch (const Poco::Exception &E) {
 			poco_warning(Logger(), fmt::format("{}: Failed with: {}", std::string(__func__),
@@ -128,9 +125,9 @@ namespace OpenWifi {

 	bool Storage::UpdateDefaultFirmware(GWObjects::DefaultFirmware &DefFirmware) {
 		try {
-			uint64_t Now = Utils::Now();
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
+
+			uint64_t Now = time(nullptr);
 			Poco::Data::Statement Update(Sess);
 			DefFirmware.LastModified = Now;
 			Poco::toLowerInPlace(DefFirmware.deviceType);
@@ -146,7 +143,7 @@ namespace OpenWifi {
 				Poco::Data::Keywords::use(R),
 				Poco::Data::Keywords::use(DefFirmware.deviceType);
 			Update.execute();
-			Sess.commit();
+
 			return true;
 		} catch (const Poco::Exception &E) {
 			poco_warning(Logger(), fmt::format("{}: Failed with: {}", std::string(__func__),
--- a/src/storage/storage_defconfig.cpp
+++ b/src/storage/storage_defconfig.cpp
@@ -72,7 +72,6 @@ namespace OpenWifi {
 			Config::Config Cfg(DefConfig.Configuration);

 			if (Cfg.Valid()) {
-				Sess.begin();
 				Poco::Data::Statement Insert(Sess);

 				std::string St{"INSERT INTO DefaultConfigs ( " + DB_DefConfig_SelectFields +
@@ -84,7 +83,6 @@ namespace OpenWifi {
 				Convert(DefConfig, R);
 				Insert << ConvertParams(St), Poco::Data::Keywords::use(R);
 				Insert.execute();
-				Sess.commit();
 				return true;
 			} else {
 				poco_warning(Logger(), "Cannot create device: invalid configuration.");
@@ -101,14 +99,13 @@ namespace OpenWifi {
 		try {

 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Delete(Sess);

 			std::string St{"DELETE FROM DefaultConfigs WHERE Name=?"};

 			Delete << ConvertParams(St), Poco::Data::Keywords::use(Name);
 			Delete.execute();
-			Sess.commit();
+
 			return true;
 		} catch (const Poco::Exception &E) {
 			poco_warning(Logger(), fmt::format("{}: Failed with: {}", std::string(__func__),
@@ -120,9 +117,9 @@ namespace OpenWifi {
 	bool Storage::UpdateDefaultConfiguration(std::string &Name,
 											 GWObjects::DefaultConfiguration &DefConfig) {
 		try {
-			uint64_t Now = Utils::Now();
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
+
+			uint64_t Now = time(nullptr);
 			Poco::Data::Statement Update(Sess);
 			DefConfig.LastModified = Now;

@@ -135,7 +132,6 @@ namespace OpenWifi {
 			Update << ConvertParams(St), Poco::Data::Keywords::use(R),
 				Poco::Data::Keywords::use(Name);
 			Update.execute();
-			Sess.commit();
 			return true;
 		} catch (const Poco::Exception &E) {
 			poco_warning(Logger(), fmt::format("{}: Failed with: {}", std::string(__func__),
--- a/src/storage/storage_device.cpp
+++ b/src/storage/storage_device.cpp
@@ -53,9 +53,7 @@ namespace OpenWifi {
 												   "restrictionDetails, "
 												   "pendingUUID, "
 												   "simulated,"
-												   "lastRecordedContact,"
-												   "certificateExpiryDate,"
-												   "connectReason "
+												   "lastRecordedContact"
 	};

 	const static std::string DB_DeviceUpdateFields{"SerialNumber=?,"
@@ -86,20 +84,16 @@ namespace OpenWifi {
 												   "restrictionDetails=?, "
 												   "pendingUUID=?, "
 												   "simulated=?,"
-												   "lastRecordedContact=?, "
-												   "certificateExpiryDate=?,"
-												   "connectReason=? "
-	};
+												   "lastRecordedContact=? "};

 	const static std::string DB_DeviceInsertValues{
-		" VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) "};
+		" VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) "};

 	typedef Poco::Tuple<std::string, std::string, std::string, std::string, std::string,
 						std::string, std::string, std::string, std::string, std::string,
 						std::string, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, std::string,
 						std::string, std::string, std::string, uint64_t, std::string, bool,
-						std::string, std::string, std::string, std::uint64_t, bool, std::uint64_t,
-						std::uint64_t, std::string>
+						std::string, std::string, std::string, std::uint64_t, bool, std::uint64_t>
 		DeviceRecordTuple;
 	typedef std::vector<DeviceRecordTuple> DeviceRecordList;

@@ -134,8 +128,6 @@ namespace OpenWifi {
 		D.pendingUUID = R.get<26>();
 		D.simulated = R.get<27>();
 		D.lastRecordedContact = R.get<28>();
-		D.certificateExpiryDate = R.get<29>();
-		D.connectReason = R.get<30>();
 	}

 	void ConvertDeviceRecord(const GWObjects::Device &D, DeviceRecordTuple &R) {
@@ -168,8 +160,6 @@ namespace OpenWifi {
 		R.set<26>(D.pendingUUID);
 		R.set<27>(D.simulated);
 		R.set<28>(D.lastRecordedContact);
-		R.set<29>(D.certificateExpiryDate);
-		R.set<30>(D.connectReason);
 	}

 	bool Storage::GetDeviceCount(uint64_t &Count) {
@@ -210,7 +200,7 @@ namespace OpenWifi {
 		return false;
 	}

-/*	bool Storage::UpdateDeviceConfiguration(std::string &SerialNumber, std::string &Configuration,
+	bool Storage::UpdateDeviceConfiguration(std::string &SerialNumber, std::string &Configuration,
 											uint64_t &NewUUID) {
 		try {

@@ -255,7 +245,7 @@ namespace OpenWifi {
 		}
 		return false;
 	}
-*/
+
 	bool Storage::RollbackDeviceConfigurationChange(std::string & SerialNumber) {
 		try {
 			GWObjects::Device D;
@@ -268,7 +258,6 @@ namespace OpenWifi {
 			ConfigurationCache().Add(Utils::SerialNumberToInt(SerialNumber), D.UUID);

 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Update(Sess);

 			DeviceRecordTuple R;
@@ -278,7 +267,6 @@ namespace OpenWifi {
 			Update << ConvertParams(St2), Poco::Data::Keywords::use(R),
 				Poco::Data::Keywords::use(SerialNumber);
 			Update.execute();
-			Sess.commit();
 			return true;
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
@@ -287,16 +275,6 @@ namespace OpenWifi {
 	}

 	bool Storage::CompleteDeviceConfigurationChange(std::string & SerialNumber) {
-		try {
-			auto Session = Pool_->get();
-			return CompleteDeviceConfigurationChange(Session, SerialNumber);
-		} catch (const Poco::Exception &E) {
-			Logger().log(E);
-		}
-		return false;
-	}
-
-	bool Storage::CompleteDeviceConfigurationChange(Poco::Data::Session & Session, std::string & SerialNumber) {
 		try {
 			GWObjects::Device D;
 			if (!GetDevice(SerialNumber, D))
@@ -312,8 +290,8 @@ namespace OpenWifi {

 			ConfigurationCache().Add(Utils::SerialNumberToInt(SerialNumber), D.UUID);

-			Session.begin();
-			Poco::Data::Statement Update(Session);
+			Poco::Data::Session Sess = Pool_->get();
+			Poco::Data::Statement Update(Sess);

 			DeviceRecordTuple R;
 			ConvertDeviceRecord(D, R);
@@ -322,7 +300,6 @@ namespace OpenWifi {
 			Update << ConvertParams(St2), Poco::Data::Keywords::use(R),
 				Poco::Data::Keywords::use(SerialNumber);
 			Update.execute();
-			Session.commit();
 			return true;
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
@@ -341,12 +318,13 @@ namespace OpenWifi {
 				return false;
 			}

+			Poco::Data::Session Sess = Pool_->get();
+			Poco::Data::Statement Select(Sess);

 			GWObjects::Device D;
 			if (!GetDevice(SerialNumber, D))
 				return false;

-
 			uint64_t Now = time(nullptr);
 			if(NewUUID==0) {
 				D.pendingUUID = NewUUID = (D.LastConfigurationChange == Now ? Now + 1 : Now);
@@ -355,8 +333,6 @@ namespace OpenWifi {
 			}

 			if (Cfg.SetUUID(NewUUID)) {
-				Poco::Data::Session Sess = Pool_->get();
-				Sess.begin();
 				Poco::Data::Statement Update(Sess);
 				D.pendingConfiguration = Cfg.get();

@@ -367,7 +343,6 @@ namespace OpenWifi {
 				Update << ConvertParams(St2), Poco::Data::Keywords::use(R),
 					Poco::Data::Keywords::use(SerialNumber);
 				Update.execute();
-				Sess.commit();
 				poco_information(Logger(),
 								 fmt::format("DEVICE-PENDING-CONFIGURATION-UPDATED({}): New UUID is {}",
 											 SerialNumber, NewUUID));
@@ -381,95 +356,69 @@ namespace OpenWifi {
 		return false;
 	}

-	bool Storage::SetDeviceLastRecordedContact(LockedDbSession &Session, std::string &SerialNumber, std::uint64_t lastRecordedContact) {
+	bool Storage::SetDeviceLastRecordedContact(std::string &SerialNumber, std::uint64_t lastRecordedContact) {
 		try {
-			std::lock_guard		Lock(Session.Mutex());
-			return SetDeviceLastRecordedContact(Session.Session(), SerialNumber, lastRecordedContact);
-		} catch (const Poco::Exception &E) {
-			Logger().log(E);
-		}
-		return false;
-	}
-
-	bool Storage::SetDeviceLastRecordedContact(Poco::Data::Session &Session, std::string &SerialNumber, std::uint64_t lastRecordedContact) {
-		try {
-			Session.begin();
-			Poco::Data::Statement 	Update(Session);
+			Poco::Data::Session 	Sess = Pool_->get();
+			Poco::Data::Statement 	Update(Sess);
 			std::string St{"UPDATE Devices SET lastRecordedContact=?  WHERE SerialNumber=?"};

 			Update << ConvertParams(St), Poco::Data::Keywords::use(lastRecordedContact),
 				Poco::Data::Keywords::use(SerialNumber);
 			Update.execute();
-			Session.commit();
 			return true;
+
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
 		}
 		return false;
 	}

-	bool Storage::SetDeviceLastRecordedContact(std::string &SerialNumber, std::uint64_t lastRecordedContact) {
-		try {
-			auto Session = Pool_->get();
-			return SetDeviceLastRecordedContact(Session, SerialNumber, lastRecordedContact);
-		} catch (const Poco::Exception &E) {
-			Logger().log(E);
-		}
-		return false;
-	}
-
-	bool Storage::CreateDevice(Poco::Data::Session &Sess, GWObjects::Device &DeviceDetails) {
+	bool Storage::CreateDevice(GWObjects::Device &DeviceDetails) {
 		std::string SerialNumber;
 		try {
-			Config::Config Cfg(DeviceDetails.Configuration);
-			uint64_t Now = Utils::Now();

-			DeviceDetails.modified = Utils::Now();
-			DeviceDetails.CreationTimestamp = DeviceDetails.LastConfigurationDownload =
-				DeviceDetails.UUID = DeviceDetails.LastConfigurationChange = Now;
+			Poco::Data::Session Sess = Pool_->get();
+			Poco::Data::Statement Select(Sess);

-			if (Cfg.Valid() && Cfg.SetUUID(DeviceDetails.UUID)) {
+			std::string St{"SELECT SerialNumber FROM Devices WHERE SerialNumber=?"};

-				DeviceDetails.Configuration = Cfg.get();
-				Sess.begin();
-				Poco::Data::Statement Insert(Sess);
+			Select << ConvertParams(St), Poco::Data::Keywords::into(SerialNumber),
+				Poco::Data::Keywords::use(DeviceDetails.SerialNumber);
+			Select.execute();

-				std::string St2{"INSERT INTO Devices ( " + DB_DeviceSelectFields + " ) " +
-								DB_DeviceInsertValues + " ON CONFLICT (SerialNumber) DO NOTHING"};
+			if (Select.rowsExtracted() == 0) {
+				Config::Config Cfg(DeviceDetails.Configuration);
+				uint64_t Now = Utils::Now();

-				SetCurrentConfigurationID(DeviceDetails.SerialNumber, DeviceDetails.UUID);
-				DeviceRecordTuple R;
-				ConvertDeviceRecord(DeviceDetails, R);
-				Insert << ConvertParams(St2), Poco::Data::Keywords::use(R);
-				Insert.execute();
-				Sess.commit();
-				SetCurrentConfigurationID(DeviceDetails.SerialNumber, DeviceDetails.UUID);
-				SerialNumberCache()->AddSerialNumber(DeviceDetails.SerialNumber);
+				DeviceDetails.modified = Utils::Now();
+				DeviceDetails.CreationTimestamp = DeviceDetails.LastConfigurationDownload =
+					DeviceDetails.UUID = DeviceDetails.LastConfigurationChange = Now;
+
+				if (Cfg.Valid() && Cfg.SetUUID(DeviceDetails.UUID)) {
+
+					DeviceDetails.Configuration = Cfg.get();
+					Poco::Data::Statement Insert(Sess);
+
+					std::string St2{"INSERT INTO Devices ( " + DB_DeviceSelectFields + " ) " +
+									DB_DeviceInsertValues};
+
+					SetCurrentConfigurationID(DeviceDetails.SerialNumber, DeviceDetails.UUID);
+					DeviceRecordTuple R;
+					ConvertDeviceRecord(DeviceDetails, R);
+					Insert << ConvertParams(St2), Poco::Data::Keywords::use(R);
+					Insert.execute();
+					SetCurrentConfigurationID(DeviceDetails.SerialNumber, DeviceDetails.UUID);
+					SerialNumberCache()->AddSerialNumber(DeviceDetails.SerialNumber);
+					return true;
+				} else {
+					poco_warning(Logger(), "Cannot create device: invalid configuration.");
+					return false;
+				}
 			} else {
-				poco_warning(Logger(), "Cannot create device: invalid configuration.");
+				poco_warning(Logger(), fmt::format("Device {} already exists.", SerialNumber));
 				return false;
 			}
-			return true;
-		} catch (const Poco::Exception &E) {
-			Logger().log(E);
-		}
-		return false;
-	}

-	bool Storage::CreateDevice(LockedDbSession &Session, GWObjects::Device &DeviceDetails) {
-		try {
-			std::lock_guard	Lock(Session.Mutex());
-			return CreateDevice(Session.Session(), DeviceDetails);
-		} catch (const Poco::Exception &E) {
-			Logger().log(E);
-		}
-		return false;
-	}
-
-		bool Storage::CreateDevice(GWObjects::Device &DeviceDetails) {
-		try {
-			auto Session = Pool_->get();
-			return CreateDevice(Session, DeviceDetails);
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
 		}
@@ -498,45 +447,16 @@ namespace OpenWifi {
 		return FoundCountry;
 	}

-	bool Storage::DeleteSimulatedDevice([[maybe_unused]] const std::string &SerialNumber) {
+#define __DBGLOG__ std::cout << __LINE__ << std::endl;

-		std::vector<std::string> Statements =
-		{
-			"delete from commandlist using devices where commandlist.serialnumber=devices.serialnumber and devices.simulated=true;",
-			"delete from healthchecks using devices where healthchecks.serialnumber=devices.serialnumber and devices.simulated=true;",
-			"delete from statistics using devices where statistics.serialnumber=devices.serialnumber and devices.simulated=true;",
-			"delete from devicelogs using devices where devicelogs.serialnumber=devices.serialnumber and devices.simulated=true;",
-			"delete from capabilities using devices where capabilities.serialnumber=devices.serialnumber and devices.simulated=true;",
-			"delete from devices where devices.simulated=true;"
-		};
-		try {
-			Poco::Data::Session Sess = Pool_->get();
-			Poco::Data::Statement Command(Sess);
-
-			for (const auto &i : Statements) {
-				try {
-					Command << i, Poco::Data::Keywords::now;
-				} catch (const Poco::Exception &E) {
-					Logger().log(E);
-				}
-				Command.reset(Sess);
-			}
-			return true;
-		} catch (const Poco::Exception &E) {
-			Logger().log(E);
-		}
-		return true;
-	}
-
-	bool Storage::CreateDefaultDevice(Poco::Data::Session &Session, std::string &SerialNumber, const Config::Capabilities &Caps,
+	bool Storage::CreateDefaultDevice(std::string &SerialNumber, const Config::Capabilities &Caps,
 									  std::string &Firmware,
 									  const Poco::Net::IPAddress &IPAddress,
 									  bool simulated) {

 		GWObjects::Device D;
-
-		// poco_information(Logger(), fmt::format("AUTO-CREATION({}): Start.", SerialNumber));
-		uint64_t Now = Utils::Now();
+		poco_information(Logger(), fmt::format("AUTO-CREATION({})", SerialNumber));
+		uint64_t Now = time(nullptr);
 		GWObjects::DefaultConfiguration DefConfig;

 		if (!Caps.Platform().empty() && !Caps.Compatible().empty()) {
@@ -579,13 +499,12 @@ namespace OpenWifi {
 		D.Notes = SecurityObjects::NoteInfoVec{
 			SecurityObjects::NoteInfo{(uint64_t)Utils::Now(), "", "Auto-provisioned."}};

-		CreateDeviceCapabilities(Session, SerialNumber, Caps);
-		auto Result = CreateDevice(Session, D);
-		poco_information(Logger(), fmt::format("AUTO-CREATION({}): Done, Result={}", SerialNumber, Result));
-		return Result;
+		CreateDeviceCapabilities(SerialNumber, Caps);
+
+		return CreateDevice(D);
 	}

-/*	bool Storage::GetDeviceFWUpdatePolicy(std::string &SerialNumber, std::string &Policy) {
+	bool Storage::GetDeviceFWUpdatePolicy(std::string &SerialNumber, std::string &Policy) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
 			Poco::Data::Statement Select(Sess);
@@ -600,19 +519,46 @@ namespace OpenWifi {
 		}
 		return false;
 	}
-*/
-	bool Storage::SetDevicePassword(LockedDbSession &Sess, std::string &SerialNumber, std::string &Password) {
-		try {
-			std::lock_guard		Lock(Sess.Mutex());
-			Sess.Session().begin();

-			Poco::Data::Statement Update(Sess.Session());
+	bool Storage::SetDevicePassword(std::string &SerialNumber, std::string &Password) {
+		try {
+			Poco::Data::Session Sess = Pool_->get();
+			Poco::Data::Statement Update(Sess);
 			std::string St{"UPDATE Devices SET DevicePassword=?  WHERE SerialNumber=?"};

 			Update << ConvertParams(St), Poco::Data::Keywords::use(Password),
 				Poco::Data::Keywords::use(SerialNumber);
 			Update.execute();
-			Sess.Session().commit();
+			return true;
+		} catch (const Poco::Exception &E) {
+			Logger().log(E);
+		}
+		return false;
+	}
+
+	bool Storage::SetConnectInfo(std::string &SerialNumber, std::string &Firmware) {
+		try {
+			Poco::Data::Session Sess = Pool_->get();
+			Poco::Data::Statement Select(Sess);
+
+			//	Get the old version and if they do not match, set the last date
+			std::string St{"SELECT Firmware FROM Devices  WHERE SerialNumber=?"};
+			std::string TmpFirmware;
+			Select << ConvertParams(St), Poco::Data::Keywords::into(TmpFirmware),
+				Poco::Data::Keywords::use(SerialNumber);
+			Select.execute();
+
+			if (TmpFirmware != Firmware) {
+				Poco::Data::Statement Update(Sess);
+				std::string St2{
+					"UPDATE Devices SET Firmware=?, LastFWUpdate=? WHERE SerialNumber=?"};
+				uint64_t Now = Utils::Now();
+
+				Update << ConvertParams(St2), Poco::Data::Keywords::use(Firmware),
+					Poco::Data::Keywords::use(Now), Poco::Data::Keywords::use(SerialNumber);
+				Update.execute();
+				return true;
+			}
 			return true;
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
@@ -628,14 +574,12 @@ namespace OpenWifi {
 			for (const auto &tableName : TableNames) {

 				Poco::Data::Session Sess = Pool_->get();
-				Sess.begin();
 				Poco::Data::Statement Delete(Sess);

 				std::string St = fmt::format("DELETE FROM {} WHERE SerialNumber='{}'", tableName, SerialNumber);
 				try {
 					Delete << St;
 					Delete.execute();
-					Sess.commit();
 				} catch (...) {
 				}
 			}
@@ -646,7 +590,9 @@ namespace OpenWifi {
 				Poco::JSON::Object Message;
 				Message.set("command", "device_deleted");
 				Message.set("timestamp", Utils::Now());
-				KafkaManager()->PostMessage(KafkaTopics::COMMAND, SerialNumber, Message);
+				std::ostringstream StrPayload;
+				Message.stringify(StrPayload);
+				KafkaManager()->PostMessage(KafkaTopics::COMMAND, SerialNumber, std::make_shared<std::string>(StrPayload.str()));
 			}

 			return true;
@@ -708,9 +654,11 @@ namespace OpenWifi {
 		return false;
 	}

-	bool Storage::GetDevice(Poco::Data::Session &Session, std::string &SerialNumber, GWObjects::Device &DeviceDetails) {
+	bool Storage::GetDevice(std::string &SerialNumber, GWObjects::Device &DeviceDetails) {
 		try {
-			Poco::Data::Statement Select(Session);
+			Poco::Data::Session Sess = Pool_->get();
+			Poco::Data::Statement Select(Sess);
+
 			std::string St{"SELECT " + DB_DeviceSelectFields +
 						   " FROM Devices WHERE SerialNumber=?"};

@@ -729,26 +677,6 @@ namespace OpenWifi {
 		return false;
 	}

-	bool Storage::GetDevice(std::string &SerialNumber, GWObjects::Device &DeviceDetails) {
-		try {
-			auto Sess = Pool_->get();
-			return GetDevice(Sess, SerialNumber, DeviceDetails);
-		} catch (const Poco::Exception &E) {
-			Logger().log(E);
-		}
-		return false;
-	}
-
-	bool Storage::GetDevice(LockedDbSession &Session, std::string &SerialNumber, GWObjects::Device &DeviceDetails) {
-		try {
-			std::lock_guard		Lock(Session.Mutex());
-			return GetDevice(Session.Session(), SerialNumber, DeviceDetails);
-		} catch (const Poco::Exception &E) {
-			Logger().log(E);
-		}
-		return false;
-	}
-
 	bool Storage::DeviceExists(std::string &SerialNumber) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
@@ -775,26 +703,6 @@ namespace OpenWifi {
 	bool Storage::UpdateDevice(GWObjects::Device &NewDeviceDetails) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			return UpdateDevice(Sess, NewDeviceDetails);
-		} catch (const Poco::Exception &E) {
-			Logger().log(E);
-		}
-		return false;
-	}
-
-	bool Storage::UpdateDevice(LockedDbSession &Session, GWObjects::Device &NewDeviceDetails) {
-		try {
-			std::lock_guard Lock(Session.Mutex());
-			return UpdateDevice(Session.Session(), NewDeviceDetails);
-		} catch (const Poco::Exception &E) {
-			Logger().log(E);
-		}
-		return false;
-	}
-
-	bool Storage::UpdateDevice(Poco::Data::Session &Sess, GWObjects::Device &NewDeviceDetails) {
-		try {
-			Sess.begin();
 			Poco::Data::Statement Update(Sess);

 			DeviceRecordTuple R;
@@ -807,7 +715,6 @@ namespace OpenWifi {
 			Update << ConvertParams(St2), Poco::Data::Keywords::use(R),
 				Poco::Data::Keywords::use(NewDeviceDetails.SerialNumber);
 			Update.execute();
-			Sess.commit();
 			// GetDevice(NewDeviceDetails.SerialNumber,NewDeviceDetails);
 			return true;
 		} catch (const Poco::Exception &E) {
--- a/src/storage/storage_healthcheck.cpp
+++ b/src/storage/storage_healthcheck.cpp
@@ -35,11 +35,10 @@ namespace OpenWifi {
 		R.set<4>(H.Recorded);
 	}

-	bool Storage::AddHealthCheckData(LockedDbSession &Session, const GWObjects::HealthCheck &Check) {
+	bool Storage::AddHealthCheckData(const GWObjects::HealthCheck &Check) {
 		try {
-			std::lock_guard Guard(Session.Mutex());
-			Session.Session().begin();
-			Poco::Data::Statement Insert(Session.Session());
+			Poco::Data::Session Sess = Pool_->get();
+			Poco::Data::Statement Insert(Sess);

 			std::string St{"INSERT INTO HealthChecks ( " + DB_HealthCheckSelectFields +
 						   " ) VALUES( " + DB_HealthCheckInsertValues + " )"};
@@ -48,7 +47,6 @@ namespace OpenWifi {
 			ConvertHealthCheckRecord(Check, R);
 			Insert << ConvertParams(St), Poco::Data::Keywords::use(R);
 			Insert.execute();
-			Session.Session().commit();
 			return true;
 		} catch (const Poco::Exception &E) {
 			poco_warning(Logger(), fmt::format("{}: Failed with: {}", std::string(__func__),
@@ -136,7 +134,7 @@ namespace OpenWifi {
 										uint64_t ToDate) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
+
 			bool DatesIncluded = (FromDate != 0 || ToDate != 0);

 			std::string Prefix{"DELETE FROM HealthChecks "};
@@ -160,7 +158,7 @@ namespace OpenWifi {
 			Delete << Statement + DateSelector;

 			Delete.execute();
-			Sess.commit();
+
 			return true;
 		} catch (const Poco::Exception &E) {
 			poco_warning(Logger(), fmt::format("{}: Failed with: {}", std::string(__func__),
@@ -172,13 +170,11 @@ namespace OpenWifi {
 	bool Storage::RemoveHealthChecksRecordsOlderThan(uint64_t Date) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Delete(Sess);

 			std::string St1{"delete from HealthChecks where recorded<?"};
 			Delete << ConvertParams(St1), Poco::Data::Keywords::use(Date);
 			Delete.execute();
-			Sess.commit();
 			return true;
 		} catch (const Poco::Exception &E) {
 			poco_warning(Logger(), fmt::format("{}: Failed with: {}", std::string(__func__),
--- a/src/storage/storage_logs.cpp
+++ b/src/storage/storage_logs.cpp
@@ -39,11 +39,11 @@ namespace OpenWifi {
 		R.set<6>(Log.UUID);
 	}

-	bool Storage::AddLog(LockedDbSession &Session, const GWObjects::DeviceLog &Log) {
+	bool Storage::AddLog(const GWObjects::DeviceLog &Log) {
 		try {
-			std::lock_guard Guard(Session.Mutex());
-			Session.Session().begin();
-			Poco::Data::Statement Insert(Session.Session());
+
+			Poco::Data::Session Sess = Pool_->get();
+			Poco::Data::Statement Insert(Sess);

 			std::string St{"INSERT INTO DeviceLogs (" + DB_LogsSelectFields + ") values( " +
 						   DB_LogsInsertValues + " )"};
@@ -53,7 +53,6 @@ namespace OpenWifi {

 			Insert << ConvertParams(St), Poco::Data::Keywords::use(R);
 			Insert.execute();
-			Session.Session().commit();
 			return true;
 		} catch (const Poco::Exception &E) {
 			poco_warning(Logger(), fmt::format("{}: Failed with: {}", std::string(__func__),
@@ -115,7 +114,7 @@ namespace OpenWifi {
 								uint64_t Type) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
+
 			bool DatesIncluded = (FromDate != 0 || ToDate != 0);
 			bool HasWhere = DatesIncluded || !SerialNumber.empty();

@@ -142,7 +141,7 @@ namespace OpenWifi {
 			Delete << StatementStr + DateSelector + TypeSelector;

 			Delete.execute();
-			Sess.commit();
+			Delete.reset(Sess);

 			return true;
 		} catch (const Poco::Exception &E) {
@@ -184,13 +183,11 @@ namespace OpenWifi {
 	bool Storage::RemoveDeviceLogsRecordsOlderThan(uint64_t Date) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
 			Poco::Data::Statement Delete(Sess);

 			std::string St1{"delete from DeviceLogs where recorded<?"};
 			Delete << ConvertParams(St1), Poco::Data::Keywords::use(Date);
 			Delete.execute();
-			Sess.commit();
 			return true;
 		} catch (const Poco::Exception &E) {
 			poco_warning(Logger(), fmt::format("{}: Failed with: {}", std::string(__func__),
--- a/src/storage/storage_statistics.cpp
+++ b/src/storage/storage_statistics.cpp
@@ -8,6 +8,7 @@

 #include "AP_WS_Server.h"
 #include "StorageService.h"
+
 #include "fmt/format.h"

 namespace OpenWifi {
@@ -32,10 +33,10 @@ namespace OpenWifi {
 		R.set<3>(Stats.Recorded);
 	}

-	bool Storage::AddStatisticsData(Poco::Data::Session &Session, const GWObjects::Statistics &Stats) {
+	bool Storage::AddStatisticsData(const GWObjects::Statistics &Stats) {
 		try {
-			Session.begin();
-			Poco::Data::Statement Insert(Session);
+			Poco::Data::Session Sess(Pool_->get());
+			Poco::Data::Statement Insert(Sess);

 			poco_trace(Logger(), fmt::format("{}: Adding stats. Size={}", Stats.SerialNumber,
 											 std::to_string(Stats.Data.size())));
@@ -45,7 +46,6 @@ namespace OpenWifi {
 			ConvertStatsRecord(Stats, R);
 			Insert << ConvertParams(St), Poco::Data::Keywords::use(R);
 			Insert.execute();
-			Session.commit();
 			return true;
 		} catch (const Poco::Exception &E) {
 			poco_warning(Logger(), fmt::format("{}: Failed with: {}", std::string(__func__),
@@ -167,7 +167,7 @@ namespace OpenWifi {
 									   uint64_t ToDate) {
 		try {
 			Poco::Data::Session Sess = Pool_->get();
-			Sess.begin();
+
 			bool DatesIncluded = (FromDate != 0 || ToDate != 0);

 			std::string Prefix{"DELETE FROM Statistics "};
@@ -189,7 +189,7 @@ namespace OpenWifi {
 			Poco::Data::Statement Select(Sess);
 			Select << Statement + DateSelector;
 			Select.execute();
-			Sess.commit();
+
 			return true;
 		} catch (const Poco::Exception &E) {
 			poco_warning(Logger(), (fmt::format("{}: Failed with: {}", std::string(__func__),
--- a/src/storage/storage_tables.cpp
+++ b/src/storage/storage_tables.cpp
@@ -40,15 +40,12 @@ namespace OpenWifi {
 				Sess << "CREATE INDEX IF NOT EXISTS StatsSerial ON Statistics (SerialNumber ASC, "
 						"Recorded ASC)",
 					Poco::Data::Keywords::now;
-				Sess << "CREATE INDEX IF NOT EXISTS StatsSerial0 ON Statistics (SerialNumber ASC)",
-					Poco::Data::Keywords::now;
 			} else if (dbType_ == mysql) {
 				Sess << "CREATE TABLE IF NOT EXISTS Statistics ("
 						"SerialNumber VARCHAR(30), "
 						"UUID INTEGER, "
 						"Data TEXT, "
 						"Recorded BIGINT, "
-						"INDEX StatSerial0 (SerialNumber)), ",
 						"INDEX StatSerial (SerialNumber ASC, Recorded ASC))",
 					Poco::Data::Keywords::now;
 			}
@@ -93,9 +90,7 @@ namespace OpenWifi {
 						"restrictionDetails TEXT, "
 						"pendingUUID	BIGINT, "
 						"simulated 		BOOLEAN,"
-						"lastRecordedContact 	BIGINT,"
-						"certificateExpiryDate 	BIGINT,"
-						"connectReason 			TEXT"
+						"lastRecordedContact BIGINT"
 						",INDEX DeviceOwner (Owner ASC),"
 						"INDEX LocationIndex (Location ASC))",
 					Poco::Data::Keywords::now;
@@ -129,9 +124,7 @@ namespace OpenWifi {
 						"restrictionDetails TEXT,"
 						"pendingUUID 	BIGINT, "
 						"simulated 		BOOLEAN, "
-						"lastRecordedContact 	BIGINT,"
-						"certificateExpiryDate 	BIGINT,"
-						"connectReason 			TEXT"
+						"lastRecordedContact BIGINT"
 						")",
 					Poco::Data::Keywords::now;
 				Sess << "CREATE INDEX IF NOT EXISTS DeviceOwner ON Devices (Owner ASC)",
@@ -152,9 +145,7 @@ namespace OpenWifi {
 				"alter table devices add column restrictionDetails TEXT",
 				"alter table devices add column pendingUUID bigint",
 				"alter table devices add column lastRecordedContact bigint",
-				"alter table devices add column simulated boolean",
-				"alter table devices add column certificateExpiryDate bigint",
-				"alter table devices add column connectReason TEXT"
+				"alter table devices add column simulated boolean"
 			};

 			for (const auto &i : Script) {
--- a/test_scripts/curl/cli
+++ b/test_scripts/curl/cli
@@ -83,77 +83,82 @@ setgateway() {
 			-H "Authorization: Bearer ${token}"  > ${result_file}
 		rawurl="$(cat < ${result_file} | jq -r '.endpoints[] | select( .type == "owgw" ) | .uri')"
 		if [[ ! -z "${rawurl}" ]]; then
-  		proto="$(echo "$rawurl" | grep :// | sed -e's,^\(.*://\).*,\1,g')"
-  		url="$(echo "${rawurl/$proto/}")"
-	  	user="$(echo $url | grep @ | cut -d@ -f1)"
-	    export OWGW=${url}
-			echo "Using ${OWGW}..."
-    else
-      echo "OWGW endpoint is not found:"
-      jq < ${result_file}
-      exit 1
-    fi
-  else
-    export OWGW=${OWGW_OVERRIDE}
+		proto="$(echo "$rawurl" | grep :// | sed -e's,^\(.*://\).*,\1,g')"
+# shellcheck disable=SC2116
+		url="$(echo "${rawurl/$proto/}")"
+		user="$(echo $url | grep @ | cut -d@ -f1)"
+		hostport="$(echo ${url/$user@/} | cut -d/ -f1)"
+		host="$(echo $hostport | sed -e 's,:.*,,g')"
+		port="$(echo $hostport | sed -e 's,^.*:,:,g' -e 's,.*:\([0-9]*\).*,\1,g' -e 's,[^0-9],,g')"
+		path="$(echo $url | grep / | cut -d/ -f2-)"
+		export OWGW=${url}
+					  echo "Using ${OWGW}..."
+					  else
+					  echo "OWGW endpoint is not found:"
+					  jq < ${result_file}
+					  exit 1
+					  fi
+					  else
+					  export OWGW=${OWGW_OVERRIDE}
 	fi
 }

 logout() {
-  curl  ${FLAGS} -X DELETE "https://${OWSEC}/api/v1/oauth2/${token}" \
-    -H "Content-Type: application/json" \
-    -H "Authorization: Bearer ${token}"
+	curl  ${FLAGS} -X DELETE "https://${OWSEC}/api/v1/oauth2/${token}" \
+	-H "Content-Type: application/json" \
+	-H "Authorization: Bearer ${token}"
 	rm -rf token.json
 }

 getdevice() {
-  curl  ${FLAGS} -X GET --url "https://${OWGW}/api/v1/device/$1" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
+	curl  ${FLAGS} -X GET --url "https://${OWGW}/api/v1/device/$1" \
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 getcommand() {
 	curl  ${FLAGS} -X GET "https://${OWGW}/api/v1/command/$1" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 deletecommand() {
 	curl  ${FLAGS} -X DELETE "https://${OWGW}/api/v1/command/$1" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}"
+	-H "Accept: application/json" \
+	-H "Authorization: Bearer ${token}"
 }

 listcommands() {
 	curl  ${FLAGS} -X GET "https://${OWGW}/api/v1/commands?serialNumber=$1&limit=300" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}"  > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}"  > ${result_file}
+		jq < ${result_file}
 }

 newestcommands() {
 	curl  ${FLAGS} -X GET "https://${OWGW}/api/v1/commands?serialNumber=$1&newest=true&limit=50" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}"  > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}"  > ${result_file}
+		jq < ${result_file}
 }

 deletecommands() {
 	curl  ${FLAGS} -X DELETE "https://${OWGW}/api/v1/commands?serialNumber=$1" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}"
+	-H "Accept: application/json" \
+	-H "Authorization: Bearer ${token}"
 }

 getcapabilities() {
 	curl  ${FLAGS} -X GET "https://${OWGW}/api/v1/device/$1/capabilities" \
-    -H "accept: application/json" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
+			-H "accept: application/json" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 deletecapabilities() {
@@ -164,42 +169,42 @@ deletecapabilities() {

 listdevices() {
 	curl  ${FLAGS} -X GET "https://${OWGW}/api/v1/devices" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 deletesimdevices() {
 	curl  ${FLAGS} -X DELETE "https://${OWGW}/api/v1/devices?simulatedOnly=true&macPattern=$1" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 deletebulkdevices() {
 	curl  ${FLAGS} -X DELETE "https://${OWGW}/api/v1/devices?macPattern=$1" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 listdevicesk() {
 	curl  ${FLAGS} -X GET "https://${OWGW}/api/v1/devices" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "X-API-KEY: $1" > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "X-API-KEY: $1" > ${result_file}
+		jq < ${result_file}
 }

 ldevs() {
 	curl  ${FLAGS} -X GET "https://${OWGW}/api/v1/devices?offset=$1&limit=$2" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 deletedevice() {
@@ -655,7 +660,7 @@ validateconfig() {
 wstest() {
 	echo "Token:${token}"
 	wscat \
-	-c wss://"${OWGW}"/api/v1/ws
+	-c wss://${OWGW}/api/v1/ws
 }

 telemetry() {
@@ -707,7 +712,7 @@ telemetry_to_kafka() {
 }

 runscript() {
-	scriptcontent=$(base64 -i "$3")
+	scriptcontent=$(base64 -i $3)
 	payload="$(printf '{ "serialNumber": "%s", "type": "%s" , "timeout": 30, "script" : "%s" , "deferred" : false, "when" : 0 }' "$1" "$2" "$scriptcontent" )"
 	curl  ${FLAGS} -X POST "https://${OWGW}/api/v1/device/$1/script" \
 				  -H "Content-Type: application/json" \
@@ -729,61 +734,61 @@ runscriptname() {

 deviceping() {
 	payload="$(printf '{ "serialNumber": "%s" }' "$1" )"
-  curl  ${FLAGS} -X POST "https://${OWGW}/api/v1/device/$1/ping" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" \
-    -d "$payload"  > ${result_file}
-  jq < ${result_file}
+					  curl  ${FLAGS} -X POST "https://${OWGW}/api/v1/device/$1/ping" \
+				  -H "Content-Type: application/json" \
+				  -H "Accept: application/json" \
+				  -H "Authorization: Bearer ${token}" \
+				  -d "$payload"  > ${result_file}
+			  jq < ${result_file}
 }

 caplist() {
 	curl    ${FLAGS} -X GET "https://${OWGW}/api/v1/capabilities" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 iptocountry() {
 	curl    ${FLAGS} -X GET "https://${OWGW}/api/v1/iptocountry?iplist=$1" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 setradiusconfig() {
 	curl    ${FLAGS} -X PUT "https://${OWGW}/api/v1/radiusProxyConfig" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -d "@${1}" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-d "@${1}" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 getradiusconfig() {
 	curl    ${FLAGS} -X GET "https://${OWGW}/api/v1/radiusProxyConfig" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 deleteradiusconfig() {
 	curl    ${FLAGS} -X DELETE "https://${OWGW}/api/v1/radiusProxyConfig" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 connectionstatistics() {
 	curl    ${FLAGS} -X GET "https://${OWGW}/api/v1/devices?connectionStatistics=true" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 testtoken() {
@@ -831,129 +836,92 @@ stats7count() {

 listscripts() {
 	curl  ${FLAGS} -X GET "https://${OWGW}/api/v1/scripts" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 getscript() {
 	curl  ${FLAGS} -X GET "https://${OWGW}/api/v1/script/$1" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 regulatory() {
 	curl  ${FLAGS} -X GET "https://${OWGW}/api/v1/regulatory?countries=$1" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 regulatory_reload() {
 	curl  ${FLAGS} -X GET "https://${OWGW}/api/v1/regulatory?reload=true" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 radiussessions() {
 	curl  ${FLAGS} -X GET "https://${OWGW}/api/v1/radiusSessions/$1" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 radiussearch() {
 	curl  ${FLAGS} -X GET "https://${OWGW}/api/v1/radiusSessions/0?userName=$1" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 radiussearchmac() {
 	curl  ${FLAGS} -X GET "https://${OWGW}/api/v1/radiusSessions/0?mac=$1" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 radiusaps() {
 	curl  ${FLAGS} -X GET "https://${OWGW}/api/v1/radiusSessions/0?serialNumberOnly=true" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 radiuscoadm() {
 	payload="$(printf '{ "accountingSessionId": "%s", "accountingMultiSessionId": "%s" , "callingStationId": "%s" }' "$2" "$3" "$4" )"
 	curl  ${FLAGS} -X PUT "https://${OWGW}/api/v1/radiusSessions/$1?operation=coadm" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" \
-    -d "$payload"  > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}" \
+			-d "$payload"  > ${result_file}
+		jq < ${result_file}
 }

 listdefaultfirmwares() {
 	curl  ${FLAGS} -X GET "https://${OWGW}/api/v1/default_firmwares" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 getdefaultfirmware() {
 	curl  ${FLAGS} -X GET "https://${OWGW}/api/v1/default_firmware/$1" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" > ${result_file}
-  jq < ${result_file}
-}
-
-transferdevice() {
-  payload="$(printf '{ "serialNumber": "%s", "server": "%s" , "port": %s}' "$1" "$2" "$3")"
-  curl  ${FLAGS} -X POST "https://${OWGW}/api/v1/device/$1/transfer" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" \
-    -d "$payload"  > ${result_file}
-  jq < ${result_file}
-}
-
-certupdate() {
-  payload="$(printf '{ "serialNumber": "%s", "encodedCertificate": "%s"}' "$1" "$2")"
-  curl  ${FLAGS} -X POST "https://${OWGW}/api/v1/device/$1/certupdate" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" \
-    -d "$payload"  > ${result_file}
-  jq < ${result_file}
-}
-
-rrm_kick() {
-  payload="$(printf '{ "actions" : [{ "action": "kick", "addr": "%s", "reason": %s, "ban_time": %s}] }' "$2" "$3" "$4")"
-  echo "$payload"
-  curl  ${FLAGS} -X POST "https://${OWGW}/api/v1/device/$1/rrm" \
-    -H "Content-Type: application/json" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}" \
-    -d "$payload"  > ${result_file}
-  jq < ${result_file}
-}
-
-deletesimulateddevices() {
-	curl  ${FLAGS} -X DELETE "https://${OWGW}/api/v1/devices?simulatedDevices=true" \
-    -H "Accept: application/json" \
-    -H "Authorization: Bearer ${token}"
+			-H "Content-Type: application/json" \
+			-H "Accept: application/json" \
+			-H "Authorization: Bearer ${token}" > ${result_file}
+		jq < ${result_file}
 }

 check_response() {
@@ -1242,10 +1210,6 @@ case "$1" in
 	"deletebulkdevices") login; deletebulkdevices "$2"; logout;;
 	"listdefaultfirmwares") login; listdefaultfirmwares; logout;;
 	"getdefaultfirmware") login; getdefaultfirmware "$2"; logout;;
-  "transferdevice") login; transferdevice "$2" "$3" "$4"; logout;;
-  "certupdate") login; certupdate "$2" "$3"; logout;;
-  "rrm_kick") login; rrm_kick "$2" "$3" "$4" "$5"; logout;;
-  "deletesimulateddevices") login; deletesimulateddevices ; logout;;
 	"testtoken") testtoken;;
  	*) help ;;
 esac