Change image tag to rc version

2025-10-30 02:12:22 +00:00 · 2021-08-31 13:44:07 +02:00
145 changed files with 6617 additions and 14086 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,46 +25,41 @@ jobs:
      DOCKER_REGISTRY_URL: tip-tip-wlan-cloud-ucentral.jfrog.io
      DOCKER_REGISTRY_USERNAME: ucentral
    steps:
-    - name: Checkout actions repo
-      uses: actions/checkout@v2
-      with:
-        repository: Telecominfraproject/.github
-        path: github
+    - uses: actions/checkout@v2

-    - name: Build and push Docker image
-      uses: ./github/composite-actions/docker-image-build
-      with:
-        image_name: owfms
-        registry: tip-tip-wlan-cloud-ucentral.jfrog.io
-        registry_user: ucentral
-        registry_password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+    - name: Build Docker image
+      run: docker build -t wlan-cloud-ucentralfms:${{ github.sha }} .

-  trigger-testing:
-    if: startsWith(github.ref, 'refs/pull/')
-    runs-on: ubuntu-latest
-    needs: docker
-    steps:
-    - name: Get base branch name and set as output
-      id: get_base_branch
+    - name: Tag Docker image
      run: |
-        echo ::set-output name=branch::$(echo ${GITHUB_BASE_REF##*/})
-        echo ::set-output name=owgw_branch::$(echo ${GITHUB_BASE_REF##*/} | sed 's/main/master/g')
-
-    - name: Checkout actions repo
-      uses: actions/checkout@v2
+        TAGS="${{ github.sha }}"
+        if [[ ${GITHUB_REF} == "refs/heads/"* ]]
+        then
+          CURRENT_TAG=$(echo ${GITHUB_REF#refs/heads/} | tr '/' '-')
+          TAGS="$TAGS $CURRENT_TAG"
+        else
+          if [[ ${GITHUB_REF} == "refs/tags/"* ]]
+          then
+            CURRENT_TAG=$(echo ${GITHUB_REF#refs/tags/} | tr '/' '-')
+            TAGS="$TAGS $CURRENT_TAG"
+          else # PR build
+            CURRENT_TAG=$(echo ${GITHUB_HEAD_REF#refs/heads/} | tr '/' '-')
+            TAGS="$TAGS $CURRENT_TAG"
+          fi
+        fi
+        echo "Result tags: $TAGS"
+        for tag in $TAGS; do
+          docker tag wlan-cloud-ucentralfms:${{ github.sha }} ${{ env.DOCKER_REGISTRY_URL }}/ucentralfms:$tag
+        done
+    - name: Log into Docker registry
+      if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/pull/') || github.ref == 'refs/heads/main'
+      uses: docker/login-action@v1
      with:
-        repository: Telecominfraproject/.github
-        path: github
+        registry: ${{ env.DOCKER_REGISTRY_URL }}
+        username: ${{ env.DOCKER_REGISTRY_USERNAME }}
+        password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}

-    - name: Trigger testing of OpenWifi Docker Compose deployment and wait for result
-      uses: ./github/composite-actions/trigger-workflow-and-wait
-      env:
-        BASE_BRANCH: ${{ steps.get_base_branch.outputs.branch }}
-        OWGW_BASE_BRANCH: ${{ steps.get_base_branch.outputs.owgw_branch }}
-      with:
-        owner: Telecominfraproject
-        repo: wlan-testing
-        workflow: ow_docker-compose.yml
-        token: ${{ secrets.WLAN_TESTING_PAT }}
-        ref: master
-        inputs: '{"owgw_version": "${{ env.OWGW_BASE_BRANCH }}", "owgwui_version": "${{ env.BASE_BRANCH }}", "owsec_version": "${{ env.BASE_BRANCH }}", "owfms_version": "${{ github.sha }}", "owprov_version": "main", "owprovui_version": "main"}'
+    - name: Push Docker images
+      if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/pull/') || github.ref == 'refs/heads/main'
+      run: |
+        docker images | grep ${{ env.DOCKER_REGISTRY_URL }}/ucentralfms | awk -F ' ' '{print $1":"$2}' | xargs -I {} docker push {}
--- a/.github/workflows/cleanup.yml
+++ b/.github/workflows/cleanup.yml
@@ -16,4 +16,4 @@ jobs:
    steps:
      - run: |
          export PR_BRANCH_TAG=$(echo ${GITHUB_HEAD_REF#refs/heads/} | tr '/' '-')
-          curl -uucentral:${{ secrets.DOCKER_REGISTRY_PASSWORD }} -X DELETE "https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral/owfms/$PR_BRANCH_TAG"
+          curl -uucentral:${{ secrets.DOCKER_REGISTRY_PASSWORD }} -X DELETE "https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral/ucentralfms/$PR_BRANCH_TAG"
--- a/.github/workflows/enforce-jira-issue-key.yml
+++ b/.github/workflows/enforce-jira-issue-key.yml
@@ -1,24 +0,0 @@
-name: Ensure Jira issue is linked
-
-on:
-  pull_request:
-    types: [opened, edited, reopened, synchronize]
-    branches:
-      - 'release/*'
-
-jobs:
-  check_for_issue_key:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout actions repo
-        uses: actions/checkout@v2
-        with:
-          repository: Telecominfraproject/.github
-          path: github
-
-      - name: Run JIRA check
-        uses: ./github/composite-actions/enforce-jira-issue-key
-        with:
-          jira_base_url: ${{ secrets.TIP_JIRA_URL }}
-          jira_user_email: ${{ secrets.TIP_JIRA_USER_EMAIL }}
-          jira_api_token: ${{ secrets.TIP_JIRA_API_TOKEN }}
--- a/.gitignore
+++ b/.gitignore
@@ -9,8 +9,6 @@ install_manifest.txt
 compile_commands.json
 CTestTestfile.cmake
 certs/*.*
-/logs/
-/data/
 _deps
 *.pem
 *.id
@@ -20,4 +18,5 @@ _deps
 *.zip
 result.json
 pidfile
-test_scripts/curl/result.json
+
+
--- a/CLI.md
+++ b/CLI.md
@@ -1,10 +1,10 @@
 # Firmware Service (FMS) CLI Documentation

 ## Before using the CLI
-You must set the environment variable `OWSEC`. You must specify the host and port for the security service 
+You must set the environment variable `UCENTRALSEC`. You must specify the host and port for the security service 
 associated with the FMS Service. Here is an example
 ```csh
-export OWSEC=mysecurityservice.example.com:16001
+export UCENTRALSEC=mysecurityservice,example.com:16001
 ```
 Once set, you can start using the `CLI`.

@@ -12,48 +12,37 @@ Once set, you can start using the `CLI`.
 Most commands will take from 0 to 2 parameters. You should include all parameters in double quotes when possible.

 ## The commands
-### getfirmwares
-Get a lit of firmwares.

-### latestfirmware <device_type>
-Get the latest firmware for the device_type specified.
+### `cli getfirmwares <device_type>`
+This will list all firmwares that apply to the `device_type`. You can get a list of `device_types` with the `cli devicetypes` command.

-### revisions
-Get a list of revisions available.
+### `latestfirmware <device_type>`
+Get the latest firmware version for a given `device_type`.

-### devicetypes
-Get the list of device types supported.
+### `cli revisions`
+Get the list of currently available revisions.

-### firmwareage <device_type> <revision>   
-Calculate how out of date a specific release it.
+### `cli devicetypes`
+Retrieve the list of known `device_types`

-### gethistory <device serial number>
-Get the device firmware history.
+### `cli firmwareage <device_type> <revision>`
+If you specify your `device_type` and `revision`, the system will do its best to estimate how 
+far in the past you `revision` is compared to the latest revision.

-### connecteddevice <device serial number> 
-Get the device status.
+### `cli gethistory <serialNumber>`
+Get the revision history for a given device.

-### connectedDevices
-Get the list of connected devices.
+### `cli connecteddevices`
+Get a list of the currently known devices and the last connection information we have about the,

-### devicereport
-Get the dashboard.
+### `cli connecteddevice <serialNumber>`
+Get the information relevant to a specific device.

-### setloglevel <subsystem> <loglevel>     
-Set the log level for s specific subsystem.
+### `cli devicereport`
+Give a simplified dashboard report of the data in the service.

-### getloglevels
-Get the current log levels for all subsystems.
-
-### getloglevelnames
-Get the log level names available.
-
-### getsubsystemnames
-Get the list of subsystems.
-
-### systeminfo
-Get basic system information.
-
-### reloadsubsystem <subsystem name>       
-Reload the configuration for a subsystem.
+### `cli fmsversion`
+Display the version of the service.

+### `cli fmstimes`
+Display the uptime and start time of the service.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(owfms VERSION 2.5.0)
+project(ucentralfms VERSION 2.1.0)

 set(CMAKE_CXX_STANDARD 17)

@@ -15,32 +15,18 @@ if(UNIX AND NOT APPLE)
 endif()

 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/build)
-    file(READ ${CMAKE_CURRENT_SOURCE_DIR}/build BUILD_NUM)
+    file(READ build BUILD_NUM)
    if(BUILD_INCREMENT)
        MATH(EXPR BUILD_NUM "${BUILD_NUM}+1")
-        file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/build ${BUILD_NUM})
+        file(WRITE build ${BUILD_NUM})
    endif()
 else()
    set(BUILD_NUM 1)
-    file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/build ${BUILD_NUM})
+    file(WRITE build ${BUILD_NUM})
 endif()

-find_package(Git QUIET)
-if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
-    execute_process(COMMAND ${GIT_EXECUTABLE} describe --always --tags
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-            RESULT_VARIABLE GIT_RESULT
-            OUTPUT_VARIABLE GIT_HASH)
-    if(NOT GIT_RESULT EQUAL "0")
-        message(FATAL_ERROR "git describe --always --tags failed with ${GIT_RESULT}")
-    endif()
-    string(REGEX REPLACE "\n$" "" GIT_HASH "${GIT_HASH}")
-endif()
-
-add_definitions(-DAWS_CUSTOM_MEMORY_MANAGEMENT)
-
 set(BUILD_SHARED_LIBS 1)
-add_definitions(-DAWS_CUSTOM_MEMORY_MANAGEMENT)
+add_definitions(-DAPP_VERSION="${CMAKE_PROJECT_VERSION}" -DBUILD_NUMBER="${BUILD_NUM}" -DAWS_CUSTOM_MEMORY_MANAGEMENT)

 set(Boost_USE_STATIC_LIBS OFF)
 set(Boost_USE_MULTITHREADED ON)
@@ -62,49 +48,47 @@ endif()

 include_directories(/usr/local/include  /usr/local/opt/openssl/include src include/kafka /usr/local/opt/mysql-client/include)

-configure_file(src/ow_version.h.in ${PROJECT_SOURCE_DIR}/src/ow_version.h @ONLY)
+add_executable( ucentralfms
+                build
+                src/Dashboard.cpp src/Dashboard.h
+                src/Daemon.cpp src/Daemon.h
+                src/StorageService.cpp src/StorageService.h
+                src/storage_tables.cpp
+                src/storage_setup.cpp
+                src/SubSystemServer.cpp src/SubSystemServer.h
+                src/RESTAPI_handler.cpp src/RESTAPI_handler.h
+                src/storage_firmwares.cpp
+                src/Utils.cpp src/Utils.h
+                src/RESTAPI_server.cpp src/RESTAPI_server.h
+                src/RESTAPI_firmwaresHandler.cpp src/RESTAPI_firmwaresHandler.h
+                src/RESTAPI_firmwareHandler.cpp src/RESTAPI_firmwareHandler.h
+                src/RESTAPI_GWobjects.cpp src/RESTAPI_GWobjects.h
+                src/ALBHealthCheckServer.h
+                src/ManifestCreator.cpp src/ManifestCreator.h
+                src/KafkaManager.cpp src/KafkaManager.h
+                src/MicroService.h src/MicroService.cpp
+                src/AuthClient.h src/AuthClient.cpp
+                src/RESTAPI_SecurityObjects.cpp src/RESTAPI_SecurityObjects.h
+                src/RESTAPI_system_command.cpp src/RESTAPI_system_command.h
+                src/OpenAPIRequest.h src/OpenAPIRequest.cpp
+                src/RESTAPI_InternalServer.cpp src/RESTAPI_InternalServer.h
+                src/RESTAPI_utils.cpp src/RESTAPI_utils.h
+                src/RESTAPI_FMSObjects.cpp src/RESTAPI_FMSObjects.h
+                src/storage_firmwares.h src/storage_history.cpp
+                src/storage_history.h src/storage_deviceTypes.cpp
+                src/RESTAPI_historyHandler.cpp src/RESTAPI_historyHandler.h
+                src/NewConnectionHandler.cpp src/NewConnectionHandler.h
+                src/LatestFirmwareCache.cpp src/LatestFirmwareCache.h
+                src/DeviceCache.cpp src/DeviceCache.h
+                src/RESTAPI_firmwareAgeHandler.cpp src/RESTAPI_firmwareAgeHandler.h
+                src/storage_deviceInfo.cpp src/storage_deviceInfo.h
+                src/RESTAPI_connectedDevicesHandler.cpp src/RESTAPI_connectedDevicesHandler.h
+                src/FirmwareCache.cpp src/FirmwareCache.h
+                src/RESTAPI_connectedDeviceHandler.cpp src/RESTAPI_connectedDeviceHandler.h
+                src/RESTAPI_deviceReportHandler.cpp src/RESTAPI_deviceReportHandler.h
+                src/OpenWifiTypes.h )

-add_executable( owfms
-        build
-        src/ow_version.h.in
-        src/framework/CountryCodes.h
-        src/framework/KafkaTopics.h
-        src/framework/MicroService.h
-        src/framework/OpenWifiTypes.h
-        src/framework/orm.h
-        src/framework/RESTAPI_errors.h
-        src/framework/RESTAPI_protocol.h
-        src/framework/StorageClass.h
-        src/framework/uCentral_Protocol.h
-        src/RESTObjects/RESTAPI_SecurityObjects.h src/RESTObjects/RESTAPI_SecurityObjects.cpp
-        src/RESTObjects/RESTAPI_ProvObjects.cpp src/RESTObjects/RESTAPI_ProvObjects.h
-        src/RESTObjects/RESTAPI_GWobjects.h src/RESTObjects/RESTAPI_GWobjects.cpp
-        src/RESTObjects/RESTAPI_FMSObjects.h src/RESTObjects/RESTAPI_FMSObjects.cpp
-        src/RESTAPI/RESTAPI_firmwaresHandler.cpp src/RESTAPI/RESTAPI_firmwaresHandler.h
-        src/RESTAPI/RESTAPI_firmwareHandler.cpp src/RESTAPI/RESTAPI_firmwareHandler.h
-        src/RESTAPI/RESTAPI_historyHandler.cpp src/RESTAPI/RESTAPI_historyHandler.h
-        src/RESTAPI/RESTAPI_firmwareAgeHandler.cpp src/RESTAPI/RESTAPI_firmwareAgeHandler.h
-        src/RESTAPI/RESTAPI_connectedDevicesHandler.cpp src/RESTAPI/RESTAPI_connectedDevicesHandler.h
-        src/RESTAPI/RESTAPI_deviceReportHandler.cpp src/RESTAPI/RESTAPI_deviceReportHandler.h
-        src/RESTAPI/RESTAPI_connectedDeviceHandler.cpp src/RESTAPI/RESTAPI_connectedDeviceHandler.h
-        src/RESTAPI/RESTAPI_Routers.cpp
-        src/Dashboard.cpp src/Dashboard.h
-        src/Daemon.cpp src/Daemon.h
-        src/StorageService.cpp src/StorageService.h
-        src/ManifestCreator.cpp src/ManifestCreator.h
-        src/framework/MicroService.h
-        src/NewConnectionHandler.cpp src/NewConnectionHandler.h
-        src/LatestFirmwareCache.cpp src/LatestFirmwareCache.h
-        src/DeviceCache.cpp src/DeviceCache.h
-        src/FirmwareCache.cpp src/FirmwareCache.h
-        src/SDK/Prov_SDK.cpp src/SDK/Prov_SDK.h
-        src/AutoUpdater.cpp src/AutoUpdater.h src/SDK/GW_SDK.cpp src/SDK/GW_SDK.h
-        src/NewCommandHandler.cpp src/NewCommandHandler.h
-        src/storage/orm_history.cpp src/storage/orm_history.h
-        src/storage/orm_firmwares.cpp src/storage/orm_firmwares.h
-        src/storage/orm_deviceInfo.cpp src/storage/orm_deviceInfo.h)
-
-target_link_libraries(owfms PUBLIC
+target_link_libraries(ucentralfms PUBLIC
        ${Poco_LIBRARIES} ${MySQL_LIBRARIES}
        ${Boost_LIBRARIES}
        ${ZLIB_LIBRARIES} ${AWSSDK_LINK_LIBRARIES}
--- a/122
+++ b/122
@@ -1,29 +1,28 @@
-FROM alpine:3.15 AS build-base
+FROM alpine AS builder

 RUN apk add --update --no-cache \
-    make cmake g++ git \
+    openssl openssh \
+    ncurses-libs \
+    bash util-linux coreutils curl \
+    make cmake gcc g++ libstdc++ libgcc git zlib-dev \
+    openssl-dev boost-dev curl-dev util-linux-dev \
    unixodbc-dev postgresql-dev mariadb-dev \
-    librdkafka-dev boost-dev openssl-dev \
-    zlib-dev nlohmann-json \
-    curl-dev
+    librdkafka-dev

-FROM build-base AS poco-build
-
-ADD https://api.github.com/repos/stephb9959/poco/git/refs/heads/master version.json
 RUN git clone https://github.com/stephb9959/poco /poco
+RUN git clone https://github.com/stephb9959/cppkafka /cppkafka
+RUN git clone --recurse-submodules https://github.com/aws/aws-sdk-cpp /aws-sdk-cpp

-WORKDIR /poco
+WORKDIR /aws-sdk-cpp
 RUN mkdir cmake-build
 WORKDIR cmake-build
-RUN cmake ..
+RUN cmake .. -DBUILD_ONLY="s3" \
+             -DCMAKE_BUILD_TYPE=Release \
+             -DCMAKE_CXX_FLAGS="-Wno-error=stringop-overflow -Wno-error=uninitialized" \ 
+             -DAUTORUN_UNIT_TESTS=OFF
 RUN cmake --build . --config Release -j8
 RUN cmake --build . --target install

-FROM build-base AS cppkafka-build
-
-ADD https://api.github.com/repos/stephb9959/cppkafka/git/refs/heads/master version.json
-RUN git clone https://github.com/stephb9959/cppkafka /cppkafka
-
 WORKDIR /cppkafka
 RUN mkdir cmake-build
 WORKDIR cmake-build
@@ -31,90 +30,45 @@ RUN cmake ..
 RUN cmake --build . --config Release -j8
 RUN cmake --build . --target install

-FROM build-base AS json-schema-validator-build
-
-ADD https://api.github.com/repos/pboettch/json-schema-validator/git/refs/heads/master version.json
-RUN git clone https://github.com/pboettch/json-schema-validator /json-schema-validator
-
-WORKDIR /json-schema-validator
+WORKDIR /poco
 RUN mkdir cmake-build
 WORKDIR cmake-build
 RUN cmake ..
-RUN make
-RUN make install
-
-FROM build-base AS aws-sdk-cpp-build
-
-ADD https://api.github.com/repos/aws/aws-sdk-cpp/git/refs/heads/main version.json
-RUN git clone --recurse-submodules https://github.com/aws/aws-sdk-cpp /aws-sdk-cpp
-
-WORKDIR /aws-sdk-cpp
-RUN mkdir cmake-build
-WORKDIR cmake-build
-RUN cmake .. -DBUILD_ONLY="sns;s3" \
-             -DCMAKE_BUILD_TYPE=Release \
-             -DCMAKE_CXX_FLAGS="-Wno-error=stringop-overflow -Wno-error=uninitialized" \
-             -DAUTORUN_UNIT_TESTS=OFF
 RUN cmake --build . --config Release -j8
 RUN cmake --build . --target install

-FROM build-base AS owfms-build
+ADD CMakeLists.txt build /ucentralfms/
+ADD cmake /ucentralfms/cmake
+ADD src /ucentralfms/src

-ADD CMakeLists.txt build /owfms/
-ADD cmake /owfms/cmake
-ADD src /owfms/src
-ADD .git /owfms/.git
-
-COPY --from=poco-build /usr/local/include /usr/local/include
-COPY --from=poco-build /usr/local/lib /usr/local/lib
-COPY --from=cppkafka-build /usr/local/include /usr/local/include
-COPY --from=cppkafka-build /usr/local/lib /usr/local/lib
-COPY --from=json-schema-validator-build /usr/local/include /usr/local/include
-COPY --from=json-schema-validator-build /usr/local/lib /usr/local/lib
-COPY --from=aws-sdk-cpp-build /usr/local/include /usr/local/include
-COPY --from=aws-sdk-cpp-build /usr/local/lib /usr/local/lib
-
-WORKDIR /owfms
+WORKDIR /ucentralfms
 RUN mkdir cmake-build
-WORKDIR /owfms/cmake-build
-RUN cmake .. \
-          -Dcrypto_LIBRARY=/usr/lib/libcrypto.so \
-          -DBUILD_SHARED_LIBS=ON
+WORKDIR /ucentralfms/cmake-build
+RUN cmake ..
 RUN cmake --build . --config Release -j8

-FROM alpine:3.15
+FROM alpine

-ENV OWFMS_USER=owfms \
-    OWFMS_ROOT=/owfms-data \
-    OWFMS_CONFIG=/owfms-data
+ENV UCENTRALFMS_USER=ucentralfms \
+    UCENTRALFMS_ROOT=/ucentralfms-data \
+    UCENTRALFMS_CONFIG=/ucentralfms-data

-RUN addgroup -S "$OWFMS_USER" && \
-    adduser -S -G "$OWFMS_USER" "$OWFMS_USER"
+RUN addgroup -S "$UCENTRALFMS_USER" && \
+    adduser -S -G "$UCENTRALFMS_USER" "$UCENTRALFMS_USER"

-RUN mkdir /openwifi
-RUN mkdir -p "$OWFMS_ROOT" "$OWFMS_CONFIG" && \
-    chown "$OWFMS_USER": "$OWFMS_ROOT" "$OWFMS_CONFIG"
+RUN mkdir /ucentral
+RUN mkdir -p "$UCENTRALFMS_ROOT" "$UCENTRALFMS_CONFIG" && \
+    chown "$UCENTRALFMS_USER": "$UCENTRALFMS_ROOT" "$UCENTRALFMS_CONFIG"
+RUN apk add --update --no-cache librdkafka curl-dev mariadb-connector-c libpq unixodbc su-exec

-RUN apk add --update --no-cache librdkafka su-exec gettext ca-certificates bash jq curl \
-    mariadb-connector-c libpq unixodbc postgresql-client
-
-COPY readiness_check /readiness_check
-COPY test_scripts/curl/cli /cli
-
-COPY owfms.properties.tmpl /
-COPY docker-entrypoint.sh /
-COPY wait-for-postgres.sh /
-RUN wget https://raw.githubusercontent.com/Telecominfraproject/wlan-cloud-ucentral-deploy/main/docker-compose/certs/restapi-ca.pem \
-    -O /usr/local/share/ca-certificates/restapi-ca-selfsigned.pem
-
-COPY --from=owfms-build /owfms/cmake-build/owfms /openwifi/owfms
-COPY --from=cppkafka-build /cppkafka/cmake-build/src/lib/* /usr/local/lib
-COPY --from=poco-build /poco/cmake-build/lib/* /usr/local/lib
-COPY --from=aws-sdk-cpp-build /aws-sdk-cpp/cmake-build/aws-cpp-sdk-core/libaws-cpp-sdk-core.so /usr/local/lib
-COPY --from=aws-sdk-cpp-build /aws-sdk-cpp/cmake-build/aws-cpp-sdk-s3/libaws-cpp-sdk-s3.so /usr/local/lib
-COPY --from=aws-sdk-cpp-build /aws-sdk-cpp/cmake-build/aws-cpp-sdk-sns/libaws-cpp-sdk-sns.so /usr/local/lib
+COPY --from=builder /ucentralfms/cmake-build/ucentralfms /ucentral/ucentralfms
+COPY --from=builder /cppkafka/cmake-build/src/lib/* /lib/
+COPY --from=builder /poco/cmake-build/lib/* /lib/
+COPY --from=builder /aws-sdk-cpp/cmake-build/aws-cpp-sdk-core/libaws-cpp-sdk-core.so /lib/
+COPY --from=builder /aws-sdk-cpp/cmake-build/aws-cpp-sdk-s3/libaws-cpp-sdk-s3.so /lib/

 EXPOSE 16004 17004 16104

+COPY docker-entrypoint.sh /
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["/openwifi/owfms"]
+CMD ["/ucentral/ucentralfms"]
--- a/README.md
+++ b/README.md
@@ -128,6 +128,30 @@ cmake ..
 make -j
 ```

+### Raspberry
+The build on a rPI takes a while. You can shorten that build time and requirements by disabling all the larger database
+support. You can build with only SQLite support by not installing the packages for ODBC, PostgreSQL, and MySQL by
+adding -DSMALL_BUILD=1 on the cmake build line.
+
+```
+sudo apt install git cmake g++ libssl-dev libaprutil1-dev apache2-dev libboost-all-dev libyaml-cpp-dev
+git clone https://github.com/stephb9959/poco
+cd poco
+mkdir cmake-build
+cd cmake-build
+cmake ..
+cmake --build . --config Release
+sudo cmake --build . --target install
+
+cd ~
+git clone https://github.com/Telecominfraproject/wlan-cloud-ucentralfms
+cd wlan-cloud-ucentralfms
+mkdir cmake-build
+cd cmake-build
+cmake -DSMALL_BUILD=1 ..
+make
+```
+
 ### After completing the build
 After completing the build, you can remove the Poco source as it is no longer needed.

@@ -143,77 +167,11 @@ mkdir data
 Love'em of hate'em, we gotta use'em. So we tried to make this as easy as possible for you.

 #### The `certs` directory
-For all deployments, you will need the following `certs` directory, populated with the proper files.
+For all deployments, you will need the following certs directory, populated with the proper files.

 ```asm
-certs ---+--- 
+certs ---+--- root.pem
         +--- restapi-ca.pem
         +--- restapi-cert.pem
         +--- restapi-key.pem
 ```
-
-### Configuration
-The configuration is kep in the file `owfms.properties`. This is a text file read by the service at startup time.
-
-#### Basic configuration
-You must set the environment variables:
- OWFMS_ROOT: represents where the root of the installation is for this service.
- OWFMS_CONFIG: represents the path where the configuration is kept.
-
-#### The file section
-#### RESTAPI
-```json
-openwifi.restapi.host.0.backlog = 100
-openwifi.restapi.host.0.security = relaxed
-openwifi.restapi.host.0.rootca = $OWFMS_ROOT/certs/restapi-ca.pem
-openwifi.restapi.host.0.address = *
-openwifi.restapi.host.0.port = 16004
-openwifi.restapi.host.0.cert = $OWFMS_ROOT/certs/restapi-cert.pem
-openwifi.restapi.host.0.key = $OWFMS_ROOT/certs/restapi-key.pem
-openwifi.restapi.host.0.key.password = mypassword
-```
-Of importance are the `.port` which should point to the port used.
-
-#### Internal microservice interface
-```json
-openwifi.internal.restapi.host.0.backlog = 100
-openwifi.internal.restapi.host.0.security = relaxed
-openwifi.internal.restapi.host.0.rootca = $OWFMS_ROOT/certs/restapi-ca.pem
-openwifi.internal.restapi.host.0.address = *
-openwifi.internal.restapi.host.0.port = 17004
-openwifi.internal.restapi.host.0.cert = $OWFMS_ROOT/certs/restapi-cert.pem
-openwifi.internal.restapi.host.0.key = $OWFMS_ROOT/certs/restapi-key.pem
-openwifi.internal.restapi.host.0.key.password = mypassword
-```
-You can leave all the default values for this one. 
-
-#### System values
-In the following values, you need to change `.uri.public` and `uri.ui`. The `.uri.public` must point to an externally available FQDN to access the service. The `.uri.ui` must point to web server running 
-the UI for the service. `firmwaredb.refresh` tells the service how often to refresh the firmware database in seconds. `firmwaredb.maxage` tells the service how old you
-want to accept release for. This value is in days.
-
-```json
-openwifi.service.key = $OWFMS_ROOT/certs/restapi-key.pem
-openwifi.service.key.password = mypassword
-openwifi.system.data = $OWFMS_ROOT/data
-openwifi.system.debug = false
-openwifi.system.uri.private = https://localhost:17004
-openwifi.system.uri.public = https://ucentral.dpaas.arilia.com:16004
-openwifi.system.commandchannel = /tmp/app.owfms
-openwifi.system.uri.ui = ucentral-ui.arilia.com
-firmwaredb.refresh = 1800
-firmwaredb.maxage = 90
-```
-
-#### S3 configuration
-The service mua read the information about firmware from an Amazon S3 Bucket. You need to replace `s3.secret` and `s3.key` with your own. 
-
-```json
-s3.bucketname = ucentral-ap-firmware
-s3.region = us-east-1
-s3.secret = *******************************************
-s3.key =  *******************************************
-s3.retry = 60
-s3.bucket.uri = ucentral-ap-firmware.s3.amazonaws.com
-
-```
--- a/2
+++ b/2
@@ -1 +1 @@
-36
+14
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,53 +1,11 @@
 #!/bin/sh
 set -e

-if [ "$SELFSIGNED_CERTS" = 'true' ]; then
-    update-ca-certificates
-fi
-
-if [[ "$TEMPLATE_CONFIG" = 'true' && ! -f "$OWFMS_CONFIG"/owfms.properties ]]; then
-  RESTAPI_HOST_ROOTCA=${RESTAPI_HOST_ROOTCA:-"\$OWFMS_ROOT/certs/restapi-ca.pem"} \
-  RESTAPI_HOST_PORT=${RESTAPI_HOST_PORT:-"16004"} \
-  RESTAPI_HOST_CERT=${RESTAPI_HOST_CERT:-"\$OWFMS_ROOT/certs/restapi-cert.pem"} \
-  RESTAPI_HOST_KEY=${RESTAPI_HOST_KEY:-"\$OWFMS_ROOT/certs/restapi-key.pem"} \
-  RESTAPI_HOST_KEY_PASSWORD=${RESTAPI_HOST_KEY_PASSWORD:-"mypassword"} \
-  INTERNAL_RESTAPI_HOST_ROOTCA=${INTERNAL_RESTAPI_HOST_ROOTCA:-"\$OWFMS_ROOT/certs/restapi-ca.pem"} \
-  INTERNAL_RESTAPI_HOST_PORT=${INTERNAL_RESTAPI_HOST_PORT:-"17004"} \
-  INTERNAL_RESTAPI_HOST_CERT=${INTERNAL_RESTAPI_HOST_CERT:-"\$OWFMS_ROOT/certs/restapi-cert.pem"} \
-  INTERNAL_RESTAPI_HOST_KEY=${INTERNAL_RESTAPI_HOST_KEY:-"\$OWFMS_ROOT/certs/restapi-key.pem"} \
-  INTERNAL_RESTAPI_HOST_KEY_PASSWORD=${INTERNAL_RESTAPI_HOST_KEY_PASSWORD:-"mypassword"} \
-  SERVICE_KEY=${SERVICE_KEY:-"\$OWFMS_ROOT/certs/restapi-key.pem"} \
-  SERVICE_KEY_PASSWORD=${SERVICE_KEY_PASSWORD:-"mypassword"} \
-  SYSTEM_DATA=${SYSTEM_DATA:-"\$OWFMS_ROOT/data"} \
-  SYSTEM_URI_PRIVATE=${SYSTEM_URI_PRIVATE:-"https://localhost:17004"} \
-  SYSTEM_URI_PUBLIC=${SYSTEM_URI_PUBLIC:-"https://localhost:16004"} \
-  SYSTEM_URI_UI=${SYSTEM_URI_UI:-"http://localhost"} \
-  S3_BUCKETNAME=${S3_BUCKETNAME:-"ucentral-ap-firmware"} \
-  S3_REGION=${S3_REGION:-"us-east-1"} \
-  S3_SECRET=${S3_SECRET:-"*******************************************"} \
-  S3_KEY=${S3_KEY:-"*******************************************"} \
-  S3_BUCKET_URI=${S3_BUCKET_URI:-"ucentral-ap-firmware.s3.amazonaws.com"} \
-  KAFKA_ENABLE=${KAFKA_ENABLE:-"true"} \
-  KAFKA_BROKERLIST=${KAFKA_BROKERLIST:-"localhost:9092"} \
-  STORAGE_TYPE=${STORAGE_TYPE:-"sqlite"} \
-  STORAGE_TYPE_POSTGRESQL_HOST=${STORAGE_TYPE_POSTGRESQL_HOST:-"localhost"} \
-  STORAGE_TYPE_POSTGRESQL_USERNAME=${STORAGE_TYPE_POSTGRESQL_USERNAME:-"owfms"} \
-  STORAGE_TYPE_POSTGRESQL_PASSWORD=${STORAGE_TYPE_POSTGRESQL_PASSWORD:-"owfms"} \
-  STORAGE_TYPE_POSTGRESQL_DATABASE=${STORAGE_TYPE_POSTGRESQL_DATABASE:-"owfms"} \
-  STORAGE_TYPE_POSTGRESQL_PORT=${STORAGE_TYPE_POSTGRESQL_PORT:-"5432"} \
-  STORAGE_TYPE_MYSQL_HOST=${STORAGE_TYPE_MYSQL_HOST:-"localhost"} \
-  STORAGE_TYPE_MYSQL_USERNAME=${STORAGE_TYPE_MYSQL_USERNAME:-"owfms"} \
-  STORAGE_TYPE_MYSQL_PASSWORD=${STORAGE_TYPE_MYSQL_PASSWORD:-"owfms"} \
-  STORAGE_TYPE_MYSQL_DATABASE=${STORAGE_TYPE_MYSQL_DATABASE:-"owfms"} \
-  STORAGE_TYPE_MYSQL_PORT=${STORAGE_TYPE_MYSQL_PORT:-"3306"} \
-  envsubst < /owfms.properties.tmpl > $OWFMS_CONFIG/owfms.properties
-fi
-
-if [ "$1" = '/openwifi/owfms' -a "$(id -u)" = '0' ]; then
+if [ "$1" = '/ucentral/ucentralfms' -a "$(id -u)" = '0' ]; then
    if [ "$RUN_CHOWN" = 'true' ]; then
-      chown -R "$OWFMS_USER": "$OWFMS_ROOT" "$OWFMS_CONFIG"
+      chown -R "$UCENTRALFMS_USER": "$UCENTRALFMS_ROOT" "$UCENTRALFMS_CONFIG"
    fi
-    exec su-exec "$OWFMS_USER" "$@"
+    exec su-exec "$UCENTRALFMS_USER" "$@"
 fi

 exec "$@"
--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
@@ -1,18 +1,18 @@
 apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
-name: owfms
+name: ucentralfms
 version: 0.1.0
 dependencies:
 - name: postgresql
-  repository: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
+  repository: https://charts.bitnami.com/bitnami
  version: 10.9.2
  condition: postgresql.enabled
 - name: mysql
-  repository: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
+  repository: https://charts.bitnami.com/bitnami
  version: 8.8.3
  condition: mysql.enabled
 - name: mariadb
-  repository: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
+  repository: https://charts.bitnami.com/bitnami
  version: 9.4.2
  condition: mariadb.enabled
--- a/helm/README.md
+++ b/helm/README.md
@@ -1,6 +1,6 @@
-# owfms
+# ucentralfms

-This Helm chart helps to deploy OpenWIFI Firmware service (further on refered as __Firmware__) to the Kubernetes clusters. It is mainly used in [assembly chart](https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy/tree/main/chart) as uCentralSec requires other services as dependencies that are considered in that Helm chart. This chart is purposed to define deployment logic close to the application code itself and define default values that could be overriden during deployment.
+This Helm chart helps to deploy uCentralSec to the Kubernetes clusters. It is mainly used in [assembly chart](https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy/tree/main/chart) as uCentralSec requires other services as dependencies that are considered in that Helm chart. This chart is purposed to define deployment logic close to the application code itself and define default values that could be overriden during deployment.


 ## TL;DR;
@@ -11,7 +11,7 @@ $ helm install .

 ## Introduction

-This chart bootstraps the Firmware on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+This chart bootstraps an ucentralfms on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.

 ## Installing the Chart

@@ -20,10 +20,10 @@ Currently this chart is not assembled in charts archives, so [helm-git](https://
 To install the chart with the release name `my-release`:

 ```bash
-$ helm install --name my-release git+https://github.com/Telecominfraproject/wlan-cloud-ucentralfms@helm/owfms-0.1.0.tgz?ref=main
+$ helm install --name my-release git+https://github.com/Telecominfraproject/wlan-cloud-ucentralfms@helm?ref=main
 ```

-The command deploys the Firmware on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
+The command deploys ucentralfms on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.

 > **Tip**: List all releases using `helm list`

@@ -47,30 +47,30 @@ The following table lists the configurable parameters of the chart and their def
 | strategyType | string | Application deployment strategy | `'Recreate'` |
 | nameOverride | string | Override to be used for application deployment |  |
 | fullnameOverride | string | Override to be used for application deployment (has priority over nameOverride) |  |
-| images.owfms.repository | string | Docker image repository |  |
-| images.owfms.tag | string | Docker image tag | `'master'` |
-| images.owfms.pullPolicy | string | Docker image pull policy | `'Always'` |
-| services.owfms.type | string | OpenWIFI Firmware service type | `'LoadBalancer'` |
-| services.owfms.ports.restapi.servicePort | number | REST API endpoint port to be exposed on service | `16001` |
-| services.owfms.ports.restapi.targetPort | number | REST API endpoint port to be targeted by service | `16001` |
-| services.owfms.ports.restapi.protocol | string | REST API endpoint protocol | `'TCP'` |
-| services.owfms.ports.restapiinternal.servicePort | string | Internal REST API endpoint port to be exposed on service | `17001` |
-| services.owfms.ports.restapiinternal.targetPort | number | Internal REST API endpoint port to be targeted by service | `17001` |
-| services.owfms.ports.restapiinternal.protocol | string | Internal REST API endpoint protocol | `'TCP'` |
-| checks.owfms.liveness.httpGet.path | string | Liveness check path to be used | `'/'` |
-| checks.owfms.liveness.httpGet.port | number | Liveness check port to be used (should be pointint to ALB endpoint) | `16101` |
-| checks.owfms.readiness.httpGet.path | string | Readiness check path to be used | `'/'` |
-| checks.owfms.readiness.httpGet.port | number | Readiness check port to be used (should be pointint to ALB endpoint) | `16101` |
+| images.ucentralfms.repository | string | Docker image repository |  |
+| images.ucentralfms.tag | string | Docker image tag | `'master'` |
+| images.ucentralfms.pullPolicy | string | Docker image pull policy | `'Always'` |
+| services.ucentralfms.type | string | uCentralSec service type | `'LoadBalancer'` |
+| services.ucentralfms.ports.restapi.servicePort | number | REST API endpoint port to be exposed on service | `16001` |
+| services.ucentralfms.ports.restapi.targetPort | number | REST API endpoint port to be targeted by service | `16001` |
+| services.ucentralfms.ports.restapi.protocol | string | REST API endpoint protocol | `'TCP'` |
+| services.ucentralfms.ports.restapiinternal.servicePort | string | Internal REST API endpoint port to be exposed on service | `17001` |
+| services.ucentralfms.ports.restapiinternal.targetPort | number | Internal REST API endpoint port to be targeted by service | `17001` |
+| services.ucentralfms.ports.restapiinternal.protocol | string | Internal REST API endpoint protocol | `'TCP'` |
+| checks.ucentralfms.liveness.httpGet.path | string | Liveness check path to be used | `'/'` |
+| checks.ucentralfms.liveness.httpGet.port | number | Liveness check port to be used (should be pointint to ALB endpoint) | `16101` |
+| checks.ucentralfms.readiness.httpGet.path | string | Readiness check path to be used | `'/'` |
+| checks.ucentralfms.readiness.httpGet.port | number | Readiness check port to be used (should be pointint to ALB endpoint) | `16101` |
 | ingresses.restapi.enabled | boolean | Defines if REST API endpoint should be exposed via Ingress controller | `False` |
 | ingresses.restapi.hosts | array | List of hosts for exposed REST API |  |
 | ingresses.restapi.paths | array | List of paths to be exposed for REST API |  |
-| volumes.owfms | array | Defines list of volumes to be attached to the Firmware |  |
-| persistence.enabled | boolean | Defines if the Firmware requires Persistent Volume (required for permanent files storage and SQLite DB if enabled) | `True` |
+| volumes.ucentralfms | array | Defines list of volumes to be attached to uCentralSec |  |
+| persistence.enabled | boolean | Defines if uCentralSec requires Persistent Volume (required for permanent files storage and SQLite DB if enabled) | `True` |
 | persistence.accessModes | array | Defines PV access modes |  |
 | persistence.size | string | Defines PV size | `'10Gi'` |
-| public_env_variables | hash | Defines list of environment variables to be passed to the Firmware | |
-| configProperties | hash | Configuration properties that should be passed to the application in `owfms.properties`. May be passed by key in set (i.e. `configProperties."rtty\.token"`) | |
-| certs | hash | Defines files (keys and certificates) that should be passed to the Firmware (PEM format is adviced to be used) (see `volumes.owfms` on where it is mounted) |  |
+| public_env_variables | hash | Defines list of environment variables to be passed to uCentralSec | |
+| configProperties | hash | Configuration properties that should be passed to the application in `ucentralfms.properties`. May be passed by key in set (i.e. `configProperties."rtty\.token"`) | |
+| certs | hash | Defines files (keys and certificates) that should be passed to uCentralSec (PEM format is adviced to be used) (see `volumes.ucentralfms` on where it is mounted) |  |


 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
--- a/helm/templates/_config.tpl
+++ b/helm/templates/_config.tpl
@@ -1,4 +1,4 @@
-{{- define "owfms.config" -}}
+{{- define "ucentralfms.config" -}}
 {{- range $key, $value := .Values.configProperties }}
 {{ $key }} = {{ $value }}
 {{- end }}
--- a/helm/templates/_helpers.tpl
+++ b/helm/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "owfms.name" -}}
+{{- define "ucentralfms.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

@@ -11,7 +11,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "owfms.fullname" -}}
+{{- define "ucentralfms.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -27,16 +27,6 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "owfms.chart" -}}
+{{- define "ucentralfms.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
-
-{{- define "owfms.ingress.apiVersion" -}}
-  {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" -}}
-      {{- print "networking.k8s.io/v1" -}}
-  {{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" -}}
-    {{- print "networking.k8s.io/v1beta1" -}}
-  {{- else -}}
-    {{- print "extensions/v1beta1" -}}
-  {{- end -}}
-{{- end -}}
--- a/helm/templates/deployment.yaml
+++ b/helm/templates/deployment.yaml
@@ -3,54 +3,40 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "owfms.fullname" . }}
+  name: {{ include "ucentralfms.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "owfms.name" . }}
-    helm.sh/chart: {{ include "owfms.chart" . }}
+    app.kubernetes.io/name: {{ include "ucentralfms.name" . }}
+    helm.sh/chart: {{ include "ucentralfms.chart" . }}
    app.kubernetes.io/instance: {{ .Release.Name }}
    app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
  replicas: {{ .Values.replicaCount }}
  strategy:
    type: {{ .Values.strategyType }}
-  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
  selector:
    matchLabels:
-      app.kubernetes.io/name: {{ include "owfms.name" . }}
+      app.kubernetes.io/name: {{ include "ucentralfms.name" . }}
      app.kubernetes.io/instance: {{ .Release.Name }}
-      {{- with .Values.services.owfms.labels }}
+      {{- with .Values.services.ucentralfms.labels }}
      {{- toYaml . | nindent 6 }}
      {{- end }}
  template:
    metadata:
      annotations:
-        checksum/config: {{ include "owfms.config" . | sha256sum }}
-        {{- with .Values.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
+        checksum/config: {{ include "ucentralfms.config" . | sha256sum }}
      labels:
-        app.kubernetes.io/name: {{ include "owfms.name" . }}
+        app.kubernetes.io/name: {{ include "ucentralfms.name" . }}
        app.kubernetes.io/instance: {{ .Release.Name }}
-        {{- with .Values.services.owfms.labels }}
+        {{- with .Values.services.ucentralfms.labels }}
        {{- toYaml . | nindent 8 }}
        {{- end }}
    spec:

-      initContainers:
-        - name: wait-kafka
-          image: "{{ .Values.images.dockerize.repository }}:{{ .Values.images.dockerize.tag }}"
-          imagePullPolicy: {{ .Values.images.dockerize.pullPolicy }}
-          args:
-            - -wait
-            - tcp://{{ index .Values.configProperties "openwifi.kafka.brokerlist" }}
-            - -timeout
-            - 600s
-
      containers:

-        - name: owfms
-          image: "{{ .Values.images.owfms.repository }}:{{ .Values.images.owfms.tag }}"
-          imagePullPolicy: {{ .Values.images.owfms.pullPolicy }}
+        - name: ucentralfms
+          image: "{{ .Values.images.ucentralfms.repository }}:{{ .Values.images.ucentralfms.tag }}"
+          imagePullPolicy: {{ .Values.images.ucentralfms.pullPolicy }}

          env:
            - name: KUBERNETES_DEPLOYED
@@ -63,19 +49,19 @@ spec:
            - name: {{ $key }}
              valueFrom:
                secretKeyRef:
-                  name: {{ include "owfms.fullname" $root }}-env
+                  name: {{ include "ucentralfms.fullname" $root }}-env
                  key: {{ $key }}
          {{- end }}

          ports:
-          {{- range $port, $portValue := .Values.services.owfms.ports }}
+          {{- range $port, $portValue := .Values.services.ucentralfms.ports }}
            - name: {{ $port }}
              containerPort: {{ $portValue.targetPort }}
              protocol: {{ $portValue.protocol }}
          {{- end }}

          volumeMounts:
-          {{- range .Values.volumes.owfms }}
+          {{- range .Values.volumes.ucentralfms }}
          - name: {{ .name }}
            mountPath: {{ .mountPath }}
            {{- if .subPath }}
@@ -83,13 +69,13 @@ spec:
            {{- end }}
          {{- end }}

-          {{- if .Values.checks.owfms.liveness }}
+          {{- if .Values.checks.ucentralfms.liveness }}
          livenessProbe:
-            {{- toYaml .Values.checks.owfms.liveness | nindent 12 }}
+            {{- toYaml .Values.checks.ucentralfms.liveness | nindent 12 }}
          {{- end }}
-          {{- if .Values.checks.owfms.readiness }}
+          {{- if .Values.checks.ucentralfms.readiness }}
          readinessProbe:
-            {{- toYaml .Values.checks.owfms.readiness | nindent 12 }}
+            {{- toYaml .Values.checks.ucentralfms.readiness | nindent 12 }}
          {{- end }}

          {{- with .Values.resources }}
@@ -103,7 +89,7 @@ spec:
      imagePullSecrets:
      {{- range $image, $imageValue := .Values.images }}
        {{- if $imageValue.regcred }}
-      - name: {{ include "owfms.fullname" $root }}-{{ $image }}-regcred
+      - name: {{ include "ucentralfms.fullname" $root }}-{{ $image }}-regcred
        {{- end }}
      {{- end }}

--- a/helm/templates/ingress.yaml
+++ b/helm/templates/ingress.yaml
@@ -2,13 +2,13 @@
 {{- range $ingress, $ingressValue := .Values.ingresses }}
 {{- if $ingressValue.enabled }}
 ---
-apiVersion: {{ include "owfms.ingress.apiVersion" $root }}
+apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: {{ include "owfms.fullname" $root }}-{{ $ingress }}
+  name: {{ include "ucentralfms.fullname" $root }}-{{ $ingress }}
  labels:
-    app.kubernetes.io/name: {{ include "owfms.name" $root }}
-    helm.sh/chart: {{ include "owfms.chart" $root }}
+    app.kubernetes.io/name: {{ include "ucentralfms.name" $root }}
+    helm.sh/chart: {{ include "ucentralfms.chart" $root }}
    app.kubernetes.io/instance: {{ $root.Release.Name }}
    app.kubernetes.io/managed-by: {{ $root.Release.Service }}
  {{- with $ingressValue.annotations }}
@@ -36,23 +36,9 @@ spec:
      paths:
      {{- range $ingressValue.paths }}
        - path: {{ .path }}
-          {{- if $root.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
-          pathType: {{ .pathType | default "ImplementationSpecific" }}
-          {{- end }}
          backend:
-            {{- if $root.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
-            service:
-              name: {{ include "owfms.fullname" $root }}-{{ .serviceName }}
-              port:
-              {{- if kindIs "string" .servicePort }}
-                name: {{ .servicePort }}
-              {{- else }}
-                number: {{ .servicePort }}
-              {{- end }}
-            {{- else }}
-            serviceName: {{ include "owfms.fullname" $root }}-{{ .serviceName }}
+            serviceName: {{ include "ucentralfms.fullname" $root }}-{{ .serviceName }}
            servicePort: {{ .servicePort }}
-            {{- end }}
      {{- end }}
  {{- end }}

--- a/helm/templates/pvc.yaml
+++ b/helm/templates/pvc.yaml
@@ -3,10 +3,10 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ template "owfms.fullname" . }}-pvc
+  name: {{ template "ucentralfms.fullname" . }}-pvc
  labels:
-    app.kubernetes.io/name: {{ include "owfms.name" . }}
-    helm.sh/chart: {{ include "owfms.chart" . }}
+    app.kubernetes.io/name: {{ include "ucentralfms.name" . }}
+    helm.sh/chart: {{ include "ucentralfms.chart" . }}
    app.kubernetes.io/instance: {{ .Release.Name }}
    app.kubernetes.io/managed-by: {{ .Release.Service }}
  {{- with .Values.persistence.annotations  }}
--- a/helm/templates/secret-certs.yaml
+++ b/helm/templates/secret-certs.yaml
@@ -2,11 +2,11 @@
 apiVersion: v1
 metadata:
  labels:
-    app.kuberentes.io/name: {{ include "owfms.name" . }}
-    helm.sh/chart: {{ include "owfms.chart" . }}
+    app.kuberentes.io/name: {{ include "ucentralfms.name" . }}
+    helm.sh/chart: {{ include "ucentralfms.chart" . }}
    app.kubernetes.io/instance: {{ .Release.Name }}
    app.kubernetes.io/managed-by: {{ .Release.Service }}
-  name: {{ include "owfms.fullname" . }}-certs
+  name: {{ include "ucentralfms.fullname" . }}-certs
 kind: Secret
 type: Opaque
 data:
--- a/helm/templates/secret-config.yaml
+++ b/helm/templates/secret-config.yaml
@@ -2,12 +2,12 @@
 apiVersion: v1
 metadata:
  labels:
-    app.kuberentes.io/name: {{ include "owfms.name" . }}
-    helm.sh/chart: {{ include "owfms.chart" . }}
+    app.kuberentes.io/name: {{ include "ucentralfms.name" . }}
+    helm.sh/chart: {{ include "ucentralfms.chart" . }}
    app.kubernetes.io/instance: {{ .Release.Name }}
    app.kubernetes.io/managed-by: {{ .Release.Service }}
-  name: {{ include "owfms.fullname" . }}-config
+  name: {{ include "ucentralfms.fullname" . }}-config
 kind: Secret
 type: Opaque
 data:
-  owfms.properties: {{ include "owfms.config" . | b64enc }}
+  ucentralfms.properties: {{ include "ucentralfms.config" . | b64enc }}
--- a/helm/templates/secret-env.yaml
+++ b/helm/templates/secret-env.yaml
@@ -2,11 +2,11 @@
 apiVersion: v1
 metadata:
  labels:
-    app.kuberentes.io/name: {{ include "owfms.name" . }}
-    helm.sh/chart: {{ include "owfms.chart" . }}
+    app.kuberentes.io/name: {{ include "ucentralfms.name" . }}
+    helm.sh/chart: {{ include "ucentralfms.chart" . }}
    app.kubernetes.io/instance: {{ .Release.Name }}
    app.kubernetes.io/managed-by: {{ .Release.Service }}
-  name: {{ include "owfms.fullname" . }}-env
+  name: {{ include "ucentralfms.fullname" . }}-env
 kind: Secret
 type: Opaque
 data:
--- a/helm/templates/secret-regcred.yaml
+++ b/helm/templates/secret-regcred.yaml
@@ -10,11 +10,11 @@ kind: Secret
 type: kubernetes.io/dockerconfigjson
 metadata:
  labels:
-    app.kuberentes.io/name: {{ include "owfms.name" $root }}
-    helm.sh/chart: {{ include "owfms.chart" $root }}
+    app.kuberentes.io/name: {{ include "ucentralfms.name" $root }}
+    helm.sh/chart: {{ include "ucentralfms.chart" $root }}
    app.kubernetes.io/instance: {{ $root.Release.Name }}
    app.kubernetes.io/managed-by: {{ $root.Release.Service }}
-  name: {{ include "owfms.fullname" $root }}-{{ $image }}-regcred
+  name: {{ include "ucentralfms.fullname" $root }}-{{ $image }}-regcred
 data:
  .dockerconfigjson: {{ template "imagePullSecret" $imageValue.regcred }}
 {{- end }}
--- a/helm/templates/service.yaml
+++ b/helm/templates/service.yaml
@@ -4,14 +4,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "owfms.fullname" $root }}-{{ $service }}
+  name: {{ include "ucentralfms.fullname" $root }}-{{ $service }}
  {{- with $serviceValue.annotations }}
  annotations:
    {{- toYaml . | nindent 4 }}
  {{- end }}
  labels:
-    app.kubernetes.io/name: {{ include "owfms.name" $root }}
-    helm.sh/chart: {{ include "owfms.chart" $root }}
+    app.kubernetes.io/name: {{ include "ucentralfms.name" $root }}
+    helm.sh/chart: {{ include "ucentralfms.chart" $root }}
    app.kubernetes.io/instance: {{ $root.Release.Name }}
    app.kubernetes.io/managed-by: {{ $root.Release.Service }}

@@ -39,7 +39,7 @@ spec:
      {{- end }}
  {{- end }}
  selector:
-    app.kubernetes.io/name: {{ include "owfms.name" $root }}
+    app.kubernetes.io/name: {{ include "ucentralfms.name" $root }}
    app.kubernetes.io/instance: {{ $root.Release.Name }}
    {{- with $serviceValue.labels }}
    {{- toYaml . | nindent 4 }}
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -1,28 +1,23 @@
 # System
 replicaCount: 1
 strategyType: Recreate
-revisionHistoryLimit: 2

 nameOverride: ""
 fullnameOverride: ""

 images:
-  owfms:
-    repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owfms
-    tag: v2.5.2
+  ucentralfms:
+    repository: tip-tip-wlan-cloud-ucentral.jfrog.io/ucentralfms
+    tag: v2.1.0-RC1
    pullPolicy: Always
 #    regcred:
 #      registry: tip-tip-wlan-cloud-ucentral.jfrog.io
 #      username: username
 #      password: password
-  dockerize:
-    repository: tip-tip-wlan-cloud-ucentral.jfrog.io/dockerize
-    tag: 0.16.0
-    pullPolicy: IfNotPresent

 services:
-  owfms:
-    type: ClusterIP
+  ucentralfms:
+    type: LoadBalancer
    ports:
      restapi:
        servicePort: 16004
@@ -34,15 +29,15 @@ services:
        protocol: TCP

 checks:
-  owfms:
+  ucentralfms:
    liveness:
      httpGet:
        path: /
        port: 16104
    readiness:
-      exec:
-        command:
-          - /readiness_check
+      httpGet:
+        path: /
+        port: 16104

 ingresses:
  restapi:
@@ -54,30 +49,29 @@ ingresses:
    - restapi.chart-example.local
    paths:
    - path: /
-      pathType: ImplementationSpecific
-      serviceName: owfms
+      serviceName: ucentralfms
      servicePort: restapi

 volumes:
-  owfms:
+  ucentralfms:
    - name: config
-      mountPath: /owfms-data/owfms.properties
-      subPath: owfms.properties
+      mountPath: /ucentralfms-data/ucentralfms.properties
+      subPath: ucentralfms.properties
      # Template below will be rendered in template
      volumeDefinition: |
        secret:
-          secretName: {{ include "owfms.fullname" . }}-config
+          secretName: {{ include "ucentralfms.fullname" . }}-config
    - name: certs
-      mountPath: /owfms-data/certs
+      mountPath: /ucentralfms-data/certs
      volumeDefinition: |
        secret:
-          secretName: {{ include "owfms.fullname" . }}-certs
+          secretName: {{ include "ucentralfms.fullname" . }}-certs
    # Change this if you want to use another volume type
    - name: persist
-      mountPath: /owfms-data/persist
+      mountPath: /ucentralfms-data/persist
      volumeDefinition: |
        persistentVolumeClaim:
-          claimName: {{ template "owfms.fullname" . }}-pvc
+          claimName: {{ template "ucentralfms.fullname" . }}-pvc

 resources: {}
  # We usually recommend not to specify default resources and to leave this as a conscious
@@ -97,8 +91,6 @@ tolerations: []

 affinity: {}

-podAnnotations: {}
-
 persistence:
  enabled: true
  # storageClassName: "-"
@@ -109,36 +101,28 @@ persistence:

 # Application
 public_env_variables:
-  OWFMS_ROOT: /owfms-data
-  OWFMS_CONFIG: /owfms-data
-  # Environment variables required for the readiness checks using script
-  FLAGS: "-s --connect-timeout 3"
-  # NOTE in order for readiness check to use system info you need to set READINESS_METHOD to "systeminfo" and set OWSEC to the OWSEC's REST API endpoint
-  #READINESS_METHOD: systeminfo
-  #OWSEC: gw-qa01.cicd.lab.wlan.tip.build:16001
+  UCENTRALSEC_ROOT: /ucentralfms-data
+  UCENTRALSEC_CONFIG: /ucentralfms-data

-secret_env_variables:
-  # NOTE in order for readiness check to use system info method you need to override these values to the real OWSEC credentials
-  OWSEC_USERNAME: tip@ucentral.com
-  OWSEC_PASSWORD: openwifi
+secret_env_variables: {}

 configProperties:
  # -> Public part
  # REST API
-  openwifi.restapi.host.0.backlog: 100
-  openwifi.restapi.host.0.security: relaxed
-  openwifi.restapi.host.0.rootca: $OWFMS_ROOT/certs/restapi-ca.pem
-  openwifi.restapi.host.0.address: "*"
-  openwifi.restapi.host.0.port: 16004
-  openwifi.restapi.host.0.cert: $OWFMS_ROOT/certs/restapi-cert.pem
-  openwifi.restapi.host.0.key: $OWFMS_ROOT/certs/restapi-key.pem
-  openwifi.internal.restapi.host.0.backlog: 100
-  openwifi.internal.restapi.host.0.security: relaxed
-  openwifi.internal.restapi.host.0.rootca: $OWFMS_ROOT/certs/restapi-ca.pem
-  openwifi.internal.restapi.host.0.address: "*"
-  openwifi.internal.restapi.host.0.port: 17004
-  openwifi.internal.restapi.host.0.cert: $OWFMS_ROOT/certs/restapi-cert.pem
-  openwifi.internal.restapi.host.0.key: $OWFMS_ROOT/certs/restapi-key.pem
+  ucentralfws.restapi.host.0.backlog: 100
+  ucentralfws.restapi.host.0.security: relaxed
+  ucentralfws.restapi.host.0.rootca: $UCENTRALFMS_ROOT/certs/restapi-ca.pem
+  ucentralfws.restapi.host.0.address: "*"
+  ucentralfws.restapi.host.0.port: 16004
+  ucentralfws.restapi.host.0.cert: $UCENTRALFMS_ROOT/certs/restapi-cert.pem
+  ucentralfws.restapi.host.0.key: $UCENTRALFMS_ROOT/certs/restapi-key.pem
+  ucentral.internal.restapi.host.0.backlog: 100
+  ucentral.internal.restapi.host.0.security: relaxed
+  ucentral.internal.restapi.host.0.rootca: $UCENTRALFMS_ROOT/certs/restapi-ca.pem
+  ucentral.internal.restapi.host.0.address: "*"
+  ucentral.internal.restapi.host.0.port: 17004
+  ucentral.internal.restapi.host.0.cert: $UCENTRALFMS_ROOT/certs/restapi-cert.pem
+  ucentral.internal.restapi.host.0.key: $UCENTRALFMS_ROOT/certs/restapi-key.pem
  # Firmware Microservice Specific Section
  s3.bucketname: ucentral-ap-firmware
  s3.region: us-east-1
@@ -149,12 +133,12 @@ configProperties:
  alb.enable: "true"
  alb.port: 16104
  # Kafka
-  openwifi.kafka.enable: "false"
-  openwifi.kafka.group.id: firmware
-  openwifi.kafka.client.id: firmware1
-  openwifi.kafka.brokerlist: localhost:9092
-  openwifi.kafka.auto.commit: false
-  openwifi.kafka.queue.buffering.max.ms: 50
+  ucentral.kafka.enable: "false"
+  ucentral.kafka.group.id: firmware
+  ucentral.kafka.client.id: firmware1
+  ucentral.kafka.brokerlist: localhost:9092
+  ucentral.kafka.auto.commit: false
+  ucentral.kafka.queue.buffering.max.ms: 50
  # Storage
  storage.type: sqlite # (sqlite|postgresql|mysql|odbc)
  ## SQLite
@@ -165,33 +149,46 @@ configProperties:
  storage.type.postgresql.maxsessions: 64
  storage.type.postgresql.idletime: 60
  storage.type.postgresql.host: localhost
-  storage.type.postgresql.database: owfms
+  storage.type.postgresql.database: ucentral
  storage.type.postgresql.port: 5432
  storage.type.postgresql.connectiontimeout: 60
  ## MySQL
  storage.type.mysql.maxsessions: 64
  storage.type.mysql.idletime: 60
  storage.type.mysql.host: localhost
-  storage.type.mysql.database: owfms
+  storage.type.mysql.database: ucentral
  storage.type.mysql.port: 3306
  storage.type.mysql.connectiontimeout: 60
  # System
-  openwifi.service.key: $OWFMS_ROOT/certs/restapi-key.pem
-  openwifi.system.data: $OWFMS_ROOT/persist
-  openwifi.system.debug: "true"
-  openwifi.system.uri.private: https://localhost:17004
-  openwifi.system.uri.public: https://localhost:16004
-  openwifi.system.uri.ui: https://localhost
-  openwifi.system.commandchannel: /tmp/app_owfms
+  ucentral.service.key: $UCENTRALFMS_ROOT/certs/restapi-key.pem
+  ucentral.system.data: $UCENTRALFMS_ROOT/persist
+  ucentral.system.debug: "true"
+  ucentral.system.uri.private: https://localhost:17004
+  ucentral.system.uri.public: https://localhost:16004
+  ucentral.system.uri.ui: https://localhost
+  ucentral.system.commandchannel: /tmp/app_ucentralfms
  # Logging
-  logging.type: console
-  logging.path: $OWFMS_ROOT/logs
-  logging.level: debug
+  logging.formatters.f1.class: PatternFormatter
+  logging.formatters.f1.pattern: "%Y-%m-%d %H:%M:%S %s: [%p] %t"
+  logging.formatters.f1.times: UTC
+  logging.channels.c1.class: ConsoleChannel
+  logging.channels.c1.formatter: f1
+  logging.channels.c2.class: FileChannel
+  logging.channels.c2.path: /tmp/log_ucentralfms
+  logging.channels.c2.formatter.class: PatternFormatter
+  logging.channels.c2.formatter.pattern: "%Y-%m-%d %H:%M:%S %s: [%p] %t"
+  logging.channels.c2.rotation: "20 M"
+  logging.channels.c2.archive: timestamp
+  logging.channels.c2.purgeCount: 20
+  logging.channels.c3.class: ConsoleChannel
+  logging.channels.c3.pattern: "%s: [%p] %t"
+  logging.loggers.root.channel: c1
+  logging.loggers.root.level: debug

  # -> Secret part
  # REST API
-  openwifi.restapi.host.0.key.password: mypassword
-  openwifi.internal.restapi.host.0.key.password: mypassword
+  ucentral.restapi.host.0.key.password: mypassword
+  ucentral.internal.restapi.host.0.key.password: mypassword
  # Firmware Microservice Specific Section
  s3.secret: TOFILL
  s3.key: TOFILL
--- a/openapi/ucentralfws.yaml
+++ b/openapi/ucentralfws.yaml
@@ -2,7 +2,7 @@ openapi: 3.0.1
 info:
  title: uCentral Firmware Service API
  description: A process to manage new uCentral firmware distribution.
-  version: 2.5.0
+  version: 2.0.0
  license:
    name: BSD3
    url: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
@@ -50,21 +50,6 @@ components:
            properties:
              ErrorCode:
                type: integer
-                enum:
-                  - 0     # Success
-                  - 1     # PASSWORD_CHANGE_REQUIRED,
-                  - 2     # INVALID_CREDENTIALS,
-                  - 3     # PASSWORD_ALREADY_USED,
-                  - 4     # USERNAME_PENDING_VERIFICATION,
-                  - 5     # PASSWORD_INVALID,
-                  - 6     # INTERNAL_ERROR,
-                  - 7     # ACCESS_DENIED,
-                  - 8     # INVALID_TOKEN
-                  - 9     # EXPIRED_TOKEN
-                  - 10    # RATE_LIMIT_EXCEEDED
-                  - 11    # BAD_MFA_TRANSACTION
-                  - 12    # MFA_FAILURE
-                  - 13    # SECURITY_SERVICE_UNREACHABLE
              ErrorDetails:
                type: string
              ErrorDescription:
@@ -309,6 +294,28 @@ components:
          items:
            $ref: '#/components/schemas/TagIntPair'

+    SystemCommandDetails:
+      type: object
+      properties:
+        command:
+          type: string
+          enum:
+            - setloglevels
+            - getloglevels
+            - getSubSystemNames
+            - getLogLevelNames
+            - stats
+        parameters:
+          oneOf:
+            - $ref: '#/components/schemas/StringList'
+            - $ref: '#/components/schemas/TagValuePairList'
+
+    SystemCommandResults:
+      type: object
+      oneOf:
+        - $ref: '#/components/schemas/StringList'
+        - $ref: '#/components/schemas/TagValuePairList'
+
    NoteInfo:
      type: object
      properties:
@@ -320,112 +327,12 @@ components:
        note:
          type: string

-    SystemInfoResults:
-      type: object
-      properties:
-        version:
-          type: string
-        uptime:
-          type: integer
-          format: integer64
-        start:
-          type: integer
-          format: integer64
-        os:
-          type: string
-        processors:
-          type: integer
-        hostname:
-          type: string
-        certificates:
-          type: array
-          items:
-            type: object
-            properties:
-              filename:
-                type: string
-              expires:
-                type: integer
-                format: int64
-
-    SystemCommandSetLogLevel:
-      type: object
-      properties:
-        command:
-          type: string
-          enum:
-            - setloglevel
-        subsystems:
-          type: array
-          items:
-            $ref: '#/components/schemas/TagValuePair'
-
-    SystemCommandReload:
-      type: object
-      properties:
-        command:
-          type: string
-          enum:
-            - reload
-        subsystems:
-          type: array
-          items:
-            type: string
-            example: these are the SubSystems names retrieve with the GetSubSystemsNamesResult.
-
-    SystemCommandGetLogLevels:
-      type: object
-      properties:
-        command:
-          type: string
-          enum:
-            - getloglevels
-
-    SystemGetLogLevelsResult:
-      type: object
-      properties:
-        taglist:
-          type: array
-          items:
-            $ref: '#/components/schemas/TagValuePair'
-
-    SystemCommandGetLogLevelNames:
-      type: object
-      properties:
-        command:
-          type: string
-          enum:
-            - getloglevelnames
-
-    SystemCommandGetSubsystemNames:
-      type: object
-      properties:
-        command:
-          type: string
-          enum:
-            - getsubsystemnames
-
-    SystemCommandGetLogLevelNamesResult:
-      type: object
-      properties:
-        list:
-          type: array
-          items:
-            type: string
-
-    SystemGetSubSystemNemesResult:
-      type: object
-      properties:
-        taglist:
-          type: array
-          items:
-            $ref: '#/components/schemas/TagValuePair'
-
 #########################################################################################
 ##
-## End of uCentral system-wide values
+## End of uCentral system wide values
 ##
 #########################################################################################
+
 paths:
  /firmwares:
    get:
@@ -797,29 +704,21 @@ paths:
    post:
      tags:
        - System Commands
-      summary: Perform some system wide commands
+      summary: Perform some systeme wide commands
      operationId: systemCommand
      requestBody:
        description: Command details
        content:
          application/json:
            schema:
-              oneOf:
-                - $ref: '#/components/schemas/SystemCommandSetLogLevel'
-                - $ref: '#/components/schemas/SystemCommandReload'
-                - $ref: '#/components/schemas/SystemCommandGetLogLevels'
-                - $ref: '#/components/schemas/SystemCommandGetLogLevelNames'
-                - $ref: '#/components/schemas/SystemCommandGetSubsystemNames'
+              $ref: '#/components/schemas/SystemCommandDetails'
      responses:
        200:
          description: Successfull command execution
          content:
            application/json:
              schema:
-                oneOf:
-                  - $ref: '#/components/schemas/SystemGetLogLevelsResult'
-                  - $ref: '#/components/schemas/SystemCommandGetLogLevelNamesResult'
-                  - $ref: '#/components/schemas/SystemGetSubSystemNemesResult'
+                $ref: '#/components/schemas/SystemCommandResults'
        403:
          $ref: '#/components/responses/Unauthorized'
        404:
@@ -836,7 +735,8 @@ paths:
          schema:
            type: string
            enum:
-              - info
+              - version
+              - times
          required: true

      responses:
@@ -845,8 +745,7 @@ paths:
          content:
            application/json:
              schema:
-                oneOf:
-                  - $ref: '#/components/schemas/SystemInfoResults'
+                $ref: '#/components/schemas/TagValuePair'
        403:
          $ref: '#/components/responses/Unauthorized'
        404:
--- a/owfms.properties
+++ b/owfms.properties
@@ -1,117 +0,0 @@
-#
-# uCentral protocol server for devices. This is where you point
-# all your devices. You can replace the * for address by the specific
-# address of one of your interfaces
-#
-#
-# REST API access
-#
-openwifi.restapi.host.0.backlog = 100
-openwifi.restapi.host.0.security = relaxed
-openwifi.restapi.host.0.rootca = $OWFMS_ROOT/certs/restapi-ca.pem
-openwifi.restapi.host.0.address = *
-openwifi.restapi.host.0.port = 16004
-openwifi.restapi.host.0.cert = $OWFMS_ROOT/certs/restapi-cert.pem
-openwifi.restapi.host.0.key = $OWFMS_ROOT/certs/restapi-key.pem
-openwifi.restapi.host.0.key.password = mypassword
-
-openwifi.internal.restapi.host.0.backlog = 100
-openwifi.internal.restapi.host.0.security = relaxed
-openwifi.internal.restapi.host.0.rootca = $OWFMS_ROOT/certs/restapi-ca.pem
-openwifi.internal.restapi.host.0.address = *
-openwifi.internal.restapi.host.0.port = 17004
-openwifi.internal.restapi.host.0.cert = $OWFMS_ROOT/certs/restapi-cert.pem
-openwifi.internal.restapi.host.0.key = $OWFMS_ROOT/certs/restapi-key.pem
-openwifi.internal.restapi.host.0.key.password = mypassword
-
-#
-# Generic section that all microservices must have
-#
-openwifi.service.key = $OWFMS_ROOT/certs/restapi-key.pem
-openwifi.service.key.password = mypassword
-openwifi.system.data = $OWFMS_ROOT/data
-openwifi.system.debug = false
-openwifi.system.uri.private = https://localhost:17004
-openwifi.system.uri.public = https://ucentral.dpaas.arilia.com:16004
-openwifi.system.commandchannel = /tmp/app.owfms
-openwifi.system.uri.ui = ucentral-ui.arilia.com
-
-firmwaredb.refresh = 1800
-firmwaredb.maxage = 90
-
-#
-# Firmware Microservice Specific Section
-#
-s3.bucketname = ucentral-ap-firmware
-s3.region = us-east-1
-s3.secret = *******************************************
-s3.key =  *******************************************
-s3.retry = 60
-s3.bucket.uri = ucentral-ap-firmware.s3.amazonaws.com
-
-autoupdater.enabled = true
-
-#############################
-# Generic information for all micro services
-#############################
-#
-# NLB Support
-#
-alb.enable = true
-alb.port = 16104
-
-#
-# Kafka
-#
-openwifi.kafka.group.id = firmware
-openwifi.kafka.client.id = firmware1
-openwifi.kafka.enable = true
-openwifi.kafka.brokerlist = a1.arilia.com:9092
-openwifi.kafka.auto.commit = false
-openwifi.kafka.queue.buffering.max.ms = 50
-
-#
-# This section select which form of persistence you need
-# Only one selected at a time. If you select multiple, this service will die if a horrible
-# death and might make your beer flat.
-#
-storage.type = sqlite
-#storage.type = postgresql
-#storage.type = mysql
-#storage.type = odbc
-
-storage.type.sqlite.db = firmware.db
-storage.type.sqlite.idletime = 120
-storage.type.sqlite.maxsessions = 128
-
-storage.type.postgresql.maxsessions = 64
-storage.type.postgresql.idletime = 60
-storage.type.postgresql.host = localhost
-storage.type.postgresql.username = stephb
-storage.type.postgresql.password = snoopy99
-storage.type.postgresql.database = ucentral
-storage.type.postgresql.port = 5432
-storage.type.postgresql.connectiontimeout = 60
-
-storage.type.mysql.maxsessions = 64
-storage.type.mysql.idletime = 60
-storage.type.mysql.host = localhost
-storage.type.mysql.username = stephb
-storage.type.mysql.password = snoopy99
-storage.type.mysql.database = ucentral
-storage.type.mysql.port = 3306
-storage.type.mysql.connectiontimeout = 60
-
-
-########################################################################
-########################################################################
-#
-# Logging: please leave as is for now.
-#
-########################################################################
-logging.type = file
-logging.path = $OWFMS_ROOT/logs
-logging.level = debug
-
-
-
--- a/owfms.properties.tmpl
+++ b/owfms.properties.tmpl
@@ -1,109 +0,0 @@
-#
-# uCentral protocol server for devices. This is where you point
-# all your devices. You can replace the * for address by the specific
-# address of one of your interfaces
-#
-
-#
-# REST API access
-#
-openwifi.restapi.host.0.backlog = 100
-openwifi.restapi.host.0.security = relaxed
-openwifi.restapi.host.0.rootca = ${RESTAPI_HOST_ROOTCA}
-openwifi.restapi.host.0.address = *
-openwifi.restapi.host.0.port = ${RESTAPI_HOST_PORT}
-openwifi.restapi.host.0.cert = ${RESTAPI_HOST_CERT}
-openwifi.restapi.host.0.key = ${RESTAPI_HOST_KEY}
-openwifi.restapi.host.0.key.password = ${RESTAPI_HOST_KEY_PASSWORD}
-
-openwifi.internal.restapi.host.0.backlog = 100
-openwifi.internal.restapi.host.0.security = relaxed
-openwifi.internal.restapi.host.0.rootca = ${INTERNAL_RESTAPI_HOST_ROOTCA}
-openwifi.internal.restapi.host.0.address = *
-openwifi.internal.restapi.host.0.port = ${INTERNAL_RESTAPI_HOST_PORT}
-openwifi.internal.restapi.host.0.cert = ${INTERNAL_RESTAPI_HOST_CERT}
-openwifi.internal.restapi.host.0.key = ${INTERNAL_RESTAPI_HOST_KEY}
-openwifi.internal.restapi.host.0.key.password = ${INTERNAL_RESTAPI_HOST_KEY_PASSWORD}
-
-#
-# Generic section that all microservices must have
-#
-openwifi.service.key = ${SERVICE_KEY}
-openwifi.service.key.password = ${SERVICE_KEY_PASSWORD}
-openwifi.system.data = ${SYSTEM_DATA}
-openwifi.system.debug = false
-openwifi.system.uri.private = ${SYSTEM_URI_PRIVATE}
-openwifi.system.uri.public = ${SYSTEM_URI_PUBLIC}
-openwifi.system.commandchannel = /tmp/app.ucentralfms
-openwifi.system.uri.ui = ${SYSTEM_URI_UI}
-firmwaredb.refresh = 1800
-firmwaredb.maxage = 90
-
-#
-# Firmware Microservice Specific Section
-#
-s3.bucketname = ${S3_BUCKETNAME}
-s3.region = ${S3_REGION}
-s3.secret = ${S3_SECRET}
-s3.key = ${S3_KEY}
-s3.retry = 60
-s3.bucket.uri = ${S3_BUCKET_URI}
-
-#############################
-# Generic information for all micro services
-#############################
-#
-# NLB Support
-#
-alb.enable = true
-alb.port = 16104
-
-#
-# Kafka
-#
-openwifi.kafka.group.id = firmware
-openwifi.kafka.client.id = firmware1
-openwifi.kafka.enable = ${KAFKA_ENABLE}
-openwifi.kafka.brokerlist = ${KAFKA_BROKERLIST}
-openwifi.kafka.auto.commit = false
-openwifi.kafka.queue.buffering.max.ms = 50
-
-#
-# This section select which form of persistence you need
-# Only one selected at a time. If you select multiple, this service will die if a horrible
-# death and might make your beer flat.
-#
-storage.type = ${STORAGE_TYPE}
-
-storage.type.sqlite.db = firmware.db
-storage.type.sqlite.idletime = 120
-storage.type.sqlite.maxsessions = 128
-
-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}
-storage.type.postgresql.password = ${STORAGE_TYPE_POSTGRESQL_PASSWORD}
-storage.type.postgresql.database = ${STORAGE_TYPE_POSTGRESQL_DATABASE}
-storage.type.postgresql.port = ${STORAGE_TYPE_POSTGRESQL_PORT}
-storage.type.postgresql.connectiontimeout = 60
-
-storage.type.mysql.maxsessions = 64
-storage.type.mysql.idletime = 60
-storage.type.mysql.host = ${STORAGE_TYPE_MYSQL_HOST}
-storage.type.mysql.username = ${STORAGE_TYPE_MYSQL_USERNAME}
-storage.type.mysql.password = ${STORAGE_TYPE_MYSQL_PASSWORD}
-storage.type.mysql.database = ${STORAGE_TYPE_MYSQL_DATABASE}
-storage.type.mysql.port = ${STORAGE_TYPE_MYSQL_PORT}
-storage.type.mysql.connectiontimeout = 60
-
-
-########################################################################
-########################################################################
-#
-# Logging: please leave as is for now.
-#
-########################################################################
-logging.type = console
-logging.path = $OWFMS_ROOT/logs
-logging.level = debug
--- a/65
+++ b/65
@@ -1,65 +0,0 @@
-#!/bin/bash
-set -e
-
-if [[ "$(which jq)" == "" ]]
-then
-  echo "You need the package jq installed to use this script."
-  exit 1
-fi
-
-if [[ "$(which curl)" == "" ]]
-then
-  echo "You need the package curl installed to use this script."
-  exit 1
-fi
-
-if [[ "${READINESS_METHOD}" == "systeminfo" ]]
-then
-  if [[ "${OWSEC}" == "" ]]
-  then
-    echo "You must set the variable OWSEC in order to use this script. Something like"
-    echo "OWSEC=security.isp.com:16001"
-    exit 1
-  fi
-
-  if [[ "${OWSEC_USERNAME}" == "" ]]
-  then
-    echo "You must set the variable OWSEC_USERNAME in order to use this script. Something like"
-    echo "OWSEC_USERNAME=tip@ucentral.com"
-    exit 1
-  fi
-
-  if [[ "${OWSEC_PASSWORD}" == "" ]]
-  then
-    echo "You must set the variable OWSEC_PASSWORD in order to use this script. Something like"
-    echo "OWSEC_PASSWORD=openwifi"
-    exit 1
-  fi
-
-  # Get OAuth token from OWSEC and cache it or use cached one
-  payload="{ \"userId\" : \"$OWSEC_USERNAME\" , \"password\" : \"$OWSEC_PASSWORD\" }"
-  if [[ -f "/tmp/token" ]]
-  then
-    token=$(cat /tmp/token)
-  else
-    token=$(curl ${FLAGS} -X POST -H "Content-Type: application/json" -d "$payload" "https://${OWSEC}/api/v1/oauth2" | jq -r '.access_token')
-  fi
-  if [[ "${token}" == "" ]]
-  then
-    echo "Could not login. Please verify the host and username/password."
-    exit 13
-  fi
-  echo -n $token > /tmp/token
-
-  # Make systeminfo request to the local owfms instance
-  export RESTAPI_PORT=$(grep 'openwifi.restapi.host.0.port' $OWFMS_CONFIG/owfms.properties | awk -F '=' '{print $2}' | xargs | envsubst)
-  curl ${FLAGS} -k -X GET "https://localhost:$RESTAPI_PORT/api/v1/system?command=info" \
-    -H "accept: application/json" \
-    -H "Authorization: Bearer ${token}" > /tmp/result.json
-  exit_code=$?
-  jq < /tmp/result.json
-  exit $exit_code
-else
-  export ALB_PORT=$(grep 'alb.port' $OWFMS_CONFIG/owfms.properties | awk -F '=' '{print $2}' | xargs | envsubst)
-  curl localhost:$ALB_PORT
-fi
--- a/set_env.sh
+++ b/set_env.sh
@@ -1,4 +1,4 @@
 #!/bin/bash

-export OWFMS_CONFIG=`pwd`
-export OWFMS_ROOT=`pwd`
+export UCENTRALFMS_CONFIG=`pwd`
+export UCENTRALFMS_ROOT=`pwd`
--- a/src/ALBHealthCheckServer.h
+++ b/src/ALBHealthCheckServer.h
@@ -0,0 +1,114 @@
+//
+// Created by stephane bourque on 2021-06-04.
+//
+
+#ifndef UCENTRALGW_ALBHEALTHCHECKSERVER_H
+#define UCENTRALGW_ALBHEALTHCHECKSERVER_H
+
+#include <memory>
+#include <iostream>
+#include <fstream>
+#include <sstream>
+
+#include "Poco/Thread.h"
+#include "Poco/Net/HTTPServer.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Net/HTTPServerResponse.h"
+#include "Poco/Net/HTTPRequestHandler.h"
+#include "Poco/Logger.h"
+
+#include "Daemon.h"
+#include "SubSystemServer.h"
+
+namespace OpenWifi {
+
+	class ALBRequestHandler: public Poco::Net::HTTPRequestHandler
+			/// Return a HTML document with the current date and time.
+		{
+		  public:
+			ALBRequestHandler(Poco::Logger & L)
+				: Logger_(L)
+			{
+			}
+
+			void handleRequest(Poco::Net::HTTPServerRequest& Request, Poco::Net::HTTPServerResponse& Response)
+			{
+				Logger_.information(Poco::format("ALB-REQUEST(%s): New ALB request.",Request.clientAddress().toString()));
+				Response.setChunkedTransferEncoding(true);
+				Response.setContentType("text/html");
+				Response.setDate(Poco::Timestamp());
+				Response.setStatus(Poco::Net::HTTPResponse::HTTP_OK);
+				Response.setKeepAlive(true);
+				Response.set("Connection","keep-alive");
+				Response.setVersion(Poco::Net::HTTPMessage::HTTP_1_1);
+				std::ostream &Answer = Response.send();
+				Answer << "uCentralGW Alive and kicking!" ;
+			}
+
+	  private:
+		Poco::Logger 	& Logger_;
+	};
+
+	class ALBRequestHandlerFactory: public Poco::Net::HTTPRequestHandlerFactory
+		{
+		  public:
+			explicit ALBRequestHandlerFactory(Poco::Logger & L):
+				Logger_(L)
+			{
+			}
+
+			ALBRequestHandler* createRequestHandler(const Poco::Net::HTTPServerRequest& request) override
+			{
+				if (request.getURI() == "/")
+					return new ALBRequestHandler(Logger_);
+				else
+					return nullptr;
+			}
+
+		  private:
+			Poco::Logger	&Logger_;
+		};
+
+    class ALBHealthCheckServer : public SubSystemServer {
+        public:
+            ALBHealthCheckServer() noexcept:
+                    SubSystemServer("ALBHealthCheckServer", "ALB-SVR", "alb")
+            {
+            }
+
+            static ALBHealthCheckServer *instance() {
+                if (instance_ == nullptr) {
+                    instance_ = new ALBHealthCheckServer;
+                }
+                return instance_;
+            }
+
+            int Start() {
+                if(Daemon()->ConfigGetBool("alb.enable",false)) {
+                    Port_ = (int)Daemon()->ConfigGetInt("alb.port",15015);
+                    Socket_ = std::make_unique<Poco::Net::ServerSocket>(Port_);
+                    auto Params = new Poco::Net::HTTPServerParams;
+                    Server_ = std::make_unique<Poco::Net::HTTPServer>(new ALBRequestHandlerFactory(Logger_), *Socket_, Params);
+                    Server_->start();
+                }
+
+                return 0;
+            }
+
+            void Stop() {
+                if(Server_)
+                    Server_->stop();
+            }
+
+          private:
+            static ALBHealthCheckServer *instance_;
+            std::unique_ptr<Poco::Net::HTTPServer>   	Server_;
+            std::unique_ptr<Poco::Net::ServerSocket> 	Socket_;
+            int                                     	Port_ = 0;
+        };
+
+    inline ALBHealthCheckServer * ALBHealthCheckServer() { return ALBHealthCheckServer::instance(); }
+    inline class ALBHealthCheckServer * ALBHealthCheckServer::instance_ = nullptr;
+}
+
+#endif // UCENTRALGW_ALBHEALTHCHECKSERVER_H
--- a/src/AuthClient.cpp
+++ b/src/AuthClient.cpp
@@ -0,0 +1,88 @@
+//
+// Created by stephane bourque on 2021-06-30.
+//
+#include <utility>
+
+#include "AuthClient.h"
+#include "RESTAPI_SecurityObjects.h"
+#include "Daemon.h"
+#include "OpenAPIRequest.h"
+
+namespace OpenWifi {
+	class AuthClient * AuthClient::instance_ = nullptr;
+
+	int AuthClient::Start() {
+		return 0;
+	}
+
+	void AuthClient::Stop() {
+
+	}
+
+	void AuthClient::RemovedCachedToken(const std::string &Token) {
+		SubMutexGuard G(Mutex_);
+		UserCache_.erase(Token);
+	}
+
+	bool IsTokenExpired(const SecurityObjects::WebToken &T) {
+		return ((T.expires_in_+T.created_)<std::time(nullptr));
+	}
+
+	bool AuthClient::IsAuthorized(Poco::Net::HTTPServerRequest & Request, std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo ) {
+		SubMutexGuard G(Mutex_);
+
+		auto User = UserCache_.find(SessionToken);
+		if(User != UserCache_.end() && !IsTokenExpired(User->second.webtoken)) {
+			UInfo = User->second;
+			return true;
+		} else {
+			Types::StringPairVec QueryData;
+			QueryData.push_back(std::make_pair("token",SessionToken));
+			OpenAPIRequestGet	Req(    uSERVICE_SECURITY,
+								  	"/api/v1/validateToken",
+									 QueryData,
+								  5000);
+			Poco::JSON::Object::Ptr Response;
+			if(Req.Do(Response)==Poco::Net::HTTPResponse::HTTP_OK) {
+				if(Response->has("tokenInfo") && Response->has("userInfo")) {
+					SecurityObjects::UserInfoAndPolicy	P;
+					P.from_json(Response);
+					UserCache_[SessionToken] = P;
+					UInfo = P;
+				}
+				return true;
+			}
+
+		}
+		return false;
+	}
+
+	bool AuthClient::IsTokenAuthorized(const std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo) {
+		SubMutexGuard G(Mutex_);
+
+		auto User = UserCache_.find(SessionToken);
+		if(User != UserCache_.end() && !IsTokenExpired(User->second.webtoken)) {
+			UInfo = User->second;
+			return true;
+		} else {
+			Types::StringPairVec QueryData;
+			QueryData.push_back(std::make_pair("token",SessionToken));
+			OpenAPIRequestGet	Req(uSERVICE_SECURITY,
+									 "/api/v1/validateToken",
+									 QueryData,
+									 5000);
+			Poco::JSON::Object::Ptr Response;
+			if(Req.Do(Response)==Poco::Net::HTTPResponse::HTTP_OK) {
+				if(Response->has("tokenInfo") && Response->has("userInfo")) {
+					SecurityObjects::UserInfoAndPolicy	P;
+					P.from_json(Response);
+					UserCache_[SessionToken] = P;
+					UInfo = P;
+				}
+				return true;
+			}
+
+		}
+		return false;
+	}
+}
--- a/src/AuthClient.h
+++ b/src/AuthClient.h
@@ -0,0 +1,45 @@
+//
+// Created by stephane bourque on 2021-06-30.
+//
+
+#ifndef UCENTRALGW_AUTHCLIENT_H
+#define UCENTRALGW_AUTHCLIENT_H
+
+#include "Poco/JSON/Object.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Net/HTTPServerResponse.h"
+#include "Poco/JWT/Signer.h"
+#include "Poco/SHA2Engine.h"
+#include "RESTAPI_SecurityObjects.h"
+#include "SubSystemServer.h"
+
+namespace OpenWifi {
+
+class AuthClient : public SubSystemServer {
+	  public:
+		explicit AuthClient() noexcept:
+			SubSystemServer("Authentication", "AUTH-CLNT", "authentication")
+		{
+		}
+
+		static AuthClient *instance() {
+			if (instance_ == nullptr) {
+				instance_ = new AuthClient;
+			}
+			return instance_;
+		}
+
+		int Start() override;
+		void Stop() override;
+		bool IsAuthorized(Poco::Net::HTTPServerRequest & Request, std::string &SessionToken, OpenWifi::SecurityObjects::UserInfoAndPolicy & UInfo );
+		void RemovedCachedToken(const std::string &Token);
+		bool IsTokenAuthorized(const std::string &Token, SecurityObjects::UserInfoAndPolicy & UInfo);
+	  private:
+		static AuthClient 					*instance_;
+		OpenWifi::SecurityObjects::UserInfoCache 		UserCache_;
+	};
+
+	inline AuthClient * AuthClient() { return AuthClient::instance(); }
+}
+
+#endif // UCENTRALGW_AUTHCLIENT_H
--- a/src/AutoUpdater.cpp
+++ b/src/AutoUpdater.cpp
@@ -1,103 +0,0 @@
-//
-// Created by stephane bourque on 2021-10-04.
-//
-
-#include "AutoUpdater.h"
-#include "SDK/Prov_SDK.h"
-#include "SDK/GW_SDK.h"
-#include "LatestFirmwareCache.h"
-#include "StorageService.h"
-
-namespace OpenWifi {
-
-    int AutoUpdater::Start() {
-        AutoUpdaterEnabled_ = MicroService::instance().ConfigGetBool("autoupdater.enabled", false);
-        if(AutoUpdaterEnabled_) {
-            Running_ = false;
-            AutoUpdaterFrequency_ = MicroService::instance().ConfigGetInt("autoupdater.frequency",600);
-            AutoUpdaterCallBack_ = std::make_unique<Poco::TimerCallback<AutoUpdater>>(*this, &AutoUpdater::onTimer);
-            Timer_.setStartInterval(5 * 60 * 1000);  // first run in 5 minutes
-            Timer_.setPeriodicInterval(AutoUpdaterFrequency_ * 1000);
-            Timer_.start(*AutoUpdaterCallBack_);
-        }
-        return 0;
-    }
-
-    void AutoUpdater::Stop() {
-        Running_ = false;
-        if(AutoUpdaterEnabled_) {
-            Timer_.stop();
-        }
-    }
-
-    void AutoUpdater::ToBeUpgraded(std::string serialNumber, std::string DeviceType) {
-        if(!AutoUpdaterEnabled_)
-            return;
-        std::lock_guard G(Mutex_);
-        Queue_.emplace_back(std::make_pair(std::move(serialNumber),std::move(DeviceType)));
-    }
-
-    void AutoUpdater::onTimer(Poco::Timer & timer) {
-        Running_ = true;
-        std::unique_lock    L(Mutex_);
-        while(!Queue_.empty() && Running_) {
-            auto Entry = Queue_.front();
-            Queue_.pop_front();
-            try {
-                Logger().debug(Poco::format("Preparing to upgrade %s",Entry.first));
-                auto CacheEntry = Cache_.find(Entry.first);
-                uint64_t Now = std::time(nullptr);
-                std::string firmwareUpgrade;
-                if(CacheEntry == Cache_.end() || (CacheEntry->second.LastCheck-Now)>300) {
-                    //  get the firmware settings for that device.
-                    SerialCache     C;
-                    C.LastCheck = Now;
-                    bool        firmwareRCOnly;
-                    if(OpenWifi::SDK::Prov::GetFirmwareOptions(Entry.first, firmwareUpgrade, firmwareRCOnly)) {
-                        Logger().debug(Poco::format("Found firmware options for %s",Entry.first));
-                        C.firmwareRCOnly = firmwareRCOnly;
-                        C.firmwareUpgrade = firmwareUpgrade;
-                    } else {
-                        Logger().debug(Poco::format("Found no firmware options for %s",Entry.first));
-                        C.firmwareRCOnly = firmwareRCOnly;
-                        C.firmwareUpgrade = firmwareUpgrade;
-                    }
-                    Cache_[Entry.first] = C;
-                } else {
-
-                }
-
-                if(firmwareUpgrade=="no") {
-                    Logger().information(Poco::format("Device %s not upgradable. Provisioning service settings.",Entry.first));
-                    continue;
-                }
-
-                LatestFirmwareCacheEntry    fwEntry;
-                FMSObjects::Firmware        fwDetails;
-                auto LF = LatestFirmwareCache()->FindLatestFirmware(Entry.second, fwEntry );
-                if(LF) {
-                    if(StorageService()->FirmwaresDB().GetFirmware(fwEntry.Id,fwDetails)) {
-                        //  send the command to upgrade this device...
-                        Logger().information(Poco::format("Upgrading %s to version %s", Entry.first, fwEntry.Revision));
-                        if(OpenWifi::SDK::GW::SendFirmwareUpgradeCommand(Entry.first,fwDetails.uri)) {
-                            Logger().information(Poco::format("Upgrade command sent for %s",Entry.first));
-                        } else {
-                            Logger().information(Poco::format("Upgrade command not sent for %s",Entry.first));
-                        }
-                    } else {
-                        Logger().information(Poco::format("Firmware for device %s (%s) cannot be found.", Entry.first, Entry.second ));
-                    }
-                } else {
-                    Logger().information(Poco::format("Firmware for device %s (%s) cannot be found.", Entry.first, Entry.second ));
-                }
-            } catch (...) {
-                Logger().information(Poco::format("Exception during auto update for device %s.", Entry.first ));
-            }
-        }
-    }
-
-    void AutoUpdater::reinitialize(Poco::Util::Application &self) {
-        Logger().information("Reinitializing.");
-        Reset();
-    }
-}
--- a/src/AutoUpdater.h
+++ b/src/AutoUpdater.h
@@ -1,58 +0,0 @@
-//
-// Created by stephane bourque on 2021-10-04.
-//
-
-#ifndef OWFMS_AUTOUPDATER_H
-#define OWFMS_AUTOUPDATER_H
-
-#include "framework/MicroService.h"
-#include <deque>
-#include "Poco/Util/Application.h"
-#include "Poco/Timer.h"
-
-namespace OpenWifi {
-
-    class AutoUpdater : public SubSystemServer { // };, Poco::Runnable {
-    public:
-
-    struct SerialCache {
-            uint64_t        LastCheck=0;
-            std::string     firmwareUpgrade;
-            bool            firmwareRCOnly=false;
-        };
-
-        static auto instance() {
-            static auto instance_ = new AutoUpdater;
-            return instance_;
-        }
-
-        int Start() override;
-        void Stop() override;
-        void ToBeUpgraded(std::string serialNumber, std::string DeviceType);
-        inline void Reset() {
-            std::lock_guard   G(Mutex_);
-            Cache_.clear();
-            Queue_.clear();
-        }
-        void reinitialize(Poco::Util::Application &self) final;
-        void onTimer(Poco::Timer & timer);
-
-    private:
-        std::atomic_bool                                    Running_=false;
-        std::map<std::string,SerialCache>                   Cache_;
-        std::deque<std::pair<std::string,std::string>>      Queue_;
-        uint64_t                                            AutoUpdaterFrequency_=600;
-        bool                                                AutoUpdaterEnabled_=true;
-        Poco::Timer                                         Timer_;
-        std::unique_ptr<Poco::TimerCallback<AutoUpdater>>   AutoUpdaterCallBack_;
-
-        explicit AutoUpdater() noexcept:
-        SubSystemServer("AutoUpdater", "AUTO-UPDATER", "autoupdater")
-            {
-            }
-    };
-
-    inline auto AutoUpdater() { return AutoUpdater::instance(); }
-}
-
-#endif //OWFMS_AUTOUPDATER_H
--- a/src/Daemon.cpp
+++ b/src/Daemon.cpp
@@ -2,6 +2,8 @@
 // Created by Stephane Bourque on 2021-05-07.
 //

+#include <boost/algorithm/string.hpp>
+
 #include <aws/core/Aws.h>
 #include <aws/s3/model/CreateBucketRequest.h>
 #include <aws/s3/model/PutObjectRequest.h>
@@ -9,15 +11,20 @@
 #include <aws/s3/model/PutBucketAclRequest.h>
 #include <aws/s3/model/GetBucketAclRequest.h>

+
+#include "Poco/Util/Application.h"
+#include "Poco/Net/SSLManager.h"
+
 #include "Daemon.h"
 #include "StorageService.h"
+#include "RESTAPI_server.h"
+#include "RESTAPI_InternalServer.h"
 #include "ManifestCreator.h"
+#include "KafkaManager.h"
 #include "NewConnectionHandler.h"
 #include "LatestFirmwareCache.h"
 #include "DeviceCache.h"
 #include "FirmwareCache.h"
-#include "AutoUpdater.h"
-#include "NewCommandHandler.h"

 namespace OpenWifi {
    class Daemon *Daemon::instance_ = nullptr;
@@ -29,15 +36,14 @@ namespace OpenWifi {
                                   vDAEMON_CONFIG_ENV_VAR,
                                   vDAEMON_APP_NAME,
                                   vDAEMON_BUS_TIMER,
-                                   SubSystemVec{
-                                            StorageService(),
-                                            FirmwareCache(),
-                                            LatestFirmwareCache(),
-                                            DeviceCache(),
-                                            NewConnectionHandler(),
-                                            ManifestCreator(),
-                                            AutoUpdater(),
-                                            NewCommandHandler()
+                                   Types::SubSystemVec{Storage(),
+                                                       FirmwareCache(),
+                                                       LatestFirmwareCache(),
+                                                       DeviceCache(),
+                                                       NewConnectionHandler(),
+                                                       RESTAPI_server(),
+                                                       RESTAPI_InternalServer(),
+                                                       ManifestCreator()
                                   });
        }
        return instance_;
@@ -47,9 +53,6 @@ namespace OpenWifi {
        MicroService::initialize(*this);
    }

-    void MicroServicePostInitialization() {
-
-    }
 }

 int main(int argc, char **argv) {
--- a/src/Daemon.h
+++ b/src/Daemon.h
@@ -2,30 +2,40 @@
 // Created by stephane bourque on 2021-05-07.
 //

+#include <list>
+
 #ifndef UCENTRALFWS_DAEMON_H
 #define UCENTRALFWS_DAEMON_H

-#include "framework/MicroService.h"
-#include "framework/OpenWifiTypes.h"
-#include "RESTObjects/RESTAPI_FMSObjects.h"
+#include "Poco/Util/Application.h"
+#include "Poco/Util/ServerApplication.h"
+#include "Poco/ErrorHandler.h"
+#include "Poco/UUIDGenerator.h"
+#include "Poco/Crypto/RSAKey.h"
+#include "Poco/Crypto/CipherFactory.h"
+#include "Poco/Crypto/Cipher.h"
+
+#include "MicroService.h"
+#include "OpenWifiTypes.h"
+#include "RESTAPI_FMSObjects.h"
 #include "Dashboard.h"

 namespace OpenWifi {

-    static const char * vDAEMON_PROPERTIES_FILENAME = "owfms.properties";
-    static const char * vDAEMON_ROOT_ENV_VAR = "OWFMS_ROOT";
-    static const char * vDAEMON_CONFIG_ENV_VAR = "OWFMS_CONFIG";
+    static const char * vDAEMON_PROPERTIES_FILENAME = "ucentralfms.properties";
+    static const char * vDAEMON_ROOT_ENV_VAR = "UCENTRALFMS_ROOT";
+    static const char * vDAEMON_CONFIG_ENV_VAR = "UCENTRALFMS_CONFIG";
    static const char * vDAEMON_APP_NAME = uSERVICE_FIRMWARE.c_str();
    static const uint64_t vDAEMON_BUS_TIMER = 10000;

    class Daemon : public MicroService {
    public:
-        explicit Daemon(const std::string & PropFile,
-                        const std::string & RootEnv,
-                        const std::string & ConfigEnv,
-                        const std::string & AppName,
+        explicit Daemon(std::string PropFile,
+                        std::string RootEnv,
+                        std::string ConfigEnv,
+                        std::string AppName,
                        uint64_t 	BusTimer,
-                        const SubSystemVec & SubSystems) :
+                        Types::SubSystemVec SubSystems) :
                MicroService( PropFile, RootEnv, ConfigEnv, AppName, BusTimer, SubSystems) {};

        void initialize(Poco::Util::Application &self);
--- a/src/Dashboard.cpp
+++ b/src/Dashboard.cpp
@@ -11,7 +11,7 @@ namespace OpenWifi {

 		if(LastRun_==0 || (Now-LastRun_)>120) {
 			DB_.reset();
-			StorageService()->DevicesDB().GenerateDeviceReport(DB_);
+            Storage()->GenerateDeviceReport(DB_);
 			LastRun_ = Now;
 		}
 	}
--- a/src/Dashboard.h
+++ b/src/Dashboard.h
@@ -5,8 +5,8 @@
 #ifndef UCENTRALGW_DASHBOARD_H
 #define UCENTRALGW_DASHBOARD_H

-#include "framework/OpenWifiTypes.h"
-#include "RESTObjects/RESTAPI_FMSObjects.h"
+#include "OpenWifiTypes.h"
+#include "RESTAPI_FMSObjects.h"

 namespace OpenWifi {
 	class DeviceDashboard {
--- a/src/DeviceCache.cpp
+++ b/src/DeviceCache.cpp
@@ -5,6 +5,7 @@
 #include "DeviceCache.h"

 namespace OpenWifi {
+    class DeviceCache *DeviceCache::instance_ = nullptr;

    int DeviceCache::Start() {
        return 0;
@@ -16,7 +17,7 @@ namespace OpenWifi {
    void DeviceCache::AddToCache(
                        const std::string &SerialNumber, const std::string & DeviceType,
                        const std::string &Host, const std::string &Revision) {
-        std::lock_guard G(Mutex_);
+        SubMutexGuard G(Mutex_);
        auto Device = DeviceCache_.find(SerialNumber);

        if(Device==DeviceCache_.end()) {
@@ -32,7 +33,7 @@ namespace OpenWifi {
    }

    bool DeviceCache::GetDevice(const std::string &SerialNumber, DeviceCacheEntry & E) {
-        std::lock_guard G(Mutex_);
+        SubMutexGuard G(Mutex_);
        auto Device = DeviceCache_.find(SerialNumber);
        if(Device==DeviceCache_.end())
            return false;
--- a/src/DeviceCache.h
+++ b/src/DeviceCache.h
@@ -6,7 +6,8 @@
 #define UCENTRALFMS_DEVICECACHE_H

 #include <string>
-#include "framework/MicroService.h"
+#include "SubSystemServer.h"
+#include "OpenWifiTypes.h"

 namespace OpenWifi {

@@ -19,8 +20,10 @@ namespace OpenWifi {

    class DeviceCache : public SubSystemServer {
    public:
-        static auto instance() {
-            static auto instance_ = new DeviceCache;
+        static DeviceCache *instance() {
+            if (instance_ == nullptr) {
+                instance_ = new DeviceCache;
+            }
            return instance_;
        }

@@ -32,6 +35,7 @@ namespace OpenWifi {
        bool GetDevice(const std::string &SerialNumber, DeviceCacheEntry & E);

    private:
+        static DeviceCache 	*instance_;
        std::atomic_bool    Running_=false;
        DeviceCacheMap      DeviceCache_;
        explicit DeviceCache() noexcept:
@@ -40,7 +44,7 @@ namespace OpenWifi {
        }
    };

-    inline auto DeviceCache() { return DeviceCache::instance(); }
+    inline DeviceCache * DeviceCache() { return DeviceCache::instance(); }
 }


--- a/src/FirmwareCache.cpp
+++ b/src/FirmwareCache.cpp
@@ -5,6 +5,7 @@
 #include "FirmwareCache.h"

 namespace OpenWifi {
+    class FirmwareCache *FirmwareCache::instance_ = nullptr;

    int FirmwareCache::Start() {
        return 0;
--- a/src/FirmwareCache.h
+++ b/src/FirmwareCache.h
@@ -8,8 +8,8 @@
 #include <map>
 #include <memory>

-#include "RESTObjects/RESTAPI_FMSObjects.h"
-#include "framework/MicroService.h"
+#include "RESTAPI_FMSObjects.h"
+#include "SubSystemServer.h"

 namespace OpenWifi {

@@ -17,8 +17,10 @@ namespace OpenWifi {

    class FirmwareCache: public SubSystemServer {
    public:
-        static auto instance() {
-            static auto instance_= new FirmwareCache;
+        static FirmwareCache *instance() {
+            if (instance_ == nullptr) {
+                instance_ = new FirmwareCache;
+            }
            return instance_;
        }

@@ -30,6 +32,7 @@ namespace OpenWifi {


    private:
+        static FirmwareCache 	*instance_;
        std::atomic_bool        Running_=false;
        FirmwareCacheMap        Cache_;
        explicit FirmwareCache() noexcept:
@@ -38,7 +41,7 @@ namespace OpenWifi {
        }
    };

-    inline auto FirmwareCache() { return FirmwareCache::instance(); }
+    inline FirmwareCache * FirmwareCache() { return FirmwareCache::instance(); }

 }

--- a/src/KafkaManager.cpp
+++ b/src/KafkaManager.cpp
@@ -0,0 +1,221 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+#include <thread>
+
+#include "KafkaManager.h"
+
+#include "Daemon.h"
+#include "Utils.h"
+
+namespace OpenWifi {
+
+	class KafkaManager *KafkaManager::instance_ = nullptr;
+
+	KafkaManager::KafkaManager() noexcept:
+		SubSystemServer("KafkaManager", "KAFKA-SVR", "ucentral.kafka")
+	{
+	}
+
+	void KafkaManager::initialize(Poco::Util::Application & self) {
+		SubSystemServer::initialize(self);
+		KafkaEnabled_ = Daemon()->ConfigGetBool("ucentral.kafka.enable",false);
+	}
+
+#ifdef SMALL_BUILD
+
+	int KafkaManager::Start() {
+		return 0;
+	}
+	void KafkaManager::Stop() {
+	}
+
+#else
+
+	int KafkaManager::Start() {
+		if(!KafkaEnabled_)
+			return 0;
+		ProducerThr_ = std::make_unique<std::thread>([this]() { this->ProducerThr(); });
+		ConsumerThr_ = std::make_unique<std::thread>([this]() { this->ConsumerThr(); });
+		return 0;
+	}
+
+	void KafkaManager::Stop() {
+		if(KafkaEnabled_) {
+			ProducerRunning_ = ConsumerRunning_ = false;
+			ProducerThr_->join();
+			ConsumerThr_->join();
+			return;
+		}
+	}
+
+	void KafkaManager::ProducerThr() {
+		cppkafka::Configuration Config({
+										   { "client.id", Daemon()->ConfigGetString("ucentral.kafka.client.id") },
+										   { "metadata.broker.list", Daemon()->ConfigGetString("ucentral.kafka.brokerlist") }
+									   });
+		SystemInfoWrapper_ = 	R"lit({ "system" : { "id" : )lit" +
+								  	std::to_string(Daemon()->ID()) +
+									R"lit( , "host" : ")lit" + Daemon()->PrivateEndPoint() +
+									R"lit(" } , "payload" : )lit" ;
+		cppkafka::Producer	Producer(Config);
+		ProducerRunning_ = true;
+		while(ProducerRunning_) {
+			std::this_thread::sleep_for(std::chrono::milliseconds(200));
+			try
+			{
+				SubMutexGuard G(ProducerMutex_);
+				auto Num=0;
+				while (!Queue_.empty()) {
+					const auto M = Queue_.front();
+					Producer.produce(
+						cppkafka::MessageBuilder(M.Topic).key(M.Key).payload(M.PayLoad));
+					Queue_.pop();
+					Num++;
+				}
+				if(Num)
+					Producer.flush();
+			} catch (const cppkafka::HandleException &E ) {
+				Logger_.warning(Poco::format("Caught a Kafka exception (producer): %s",std::string{E.what()}));
+			} catch (const Poco::Exception &E) {
+				Logger_.log(E);
+			}
+		}
+	}
+
+	void KafkaManager::PartitionAssignment(const cppkafka::TopicPartitionList& partitions) {
+		Logger_.information(Poco::format("Partition assigned: %Lu...",(uint64_t )partitions.front().get_partition()));
+	}
+	void KafkaManager::PartitionRevocation(const cppkafka::TopicPartitionList& partitions) {
+		Logger_.information(Poco::format("Partition revocation: %Lu...",(uint64_t )partitions.front().get_partition()));
+	}
+
+	void KafkaManager::ConsumerThr() {
+		cppkafka::Configuration Config({
+										   { "client.id", Daemon()->ConfigGetString("ucentral.kafka.client.id") },
+										   { "metadata.broker.list", Daemon()->ConfigGetString("ucentral.kafka.brokerlist") },
+										   { "group.id", Daemon()->ConfigGetString("ucentral.kafka.group.id") },
+										   { "enable.auto.commit", Daemon()->ConfigGetBool("ucentral.kafka.auto.commit",false) },
+										   { "auto.offset.reset", "latest" } ,
+										   { "enable.partition.eof", false }
+									   });
+
+		cppkafka::TopicConfiguration topic_config = {
+			{ "auto.offset.reset", "smallest" }
+		};
+
+		// Now configure it to be the default topic config
+		Config.set_default_topic_configuration(topic_config);
+
+		cppkafka::Consumer Consumer(Config);
+		Consumer.set_assignment_callback([this](cppkafka::TopicPartitionList& partitions) {
+			if(!partitions.empty()) {
+				Logger_.information(Poco::format("Partition assigned: %Lu...",
+												 (uint64_t)partitions.front().get_partition()));
+			}
+		});
+		Consumer.set_revocation_callback([this](const cppkafka::TopicPartitionList& partitions) {
+			if(!partitions.empty()) {
+				Logger_.information(Poco::format("Partition revocation: %Lu...",
+												 (uint64_t)partitions.front().get_partition()));
+			}
+		});
+
+        bool AutoCommit = Daemon()->ConfigGetBool("ucentral.kafka.auto.commit",false);
+        auto BatchSize = Daemon()->ConfigGetInt("ucentral.kafka.consumer.batchsize",20);
+
+        Types::StringVec    Topics;
+		for(const auto &i:Notifiers_)
+			Topics.push_back(i.first);
+
+		Consumer.subscribe(Topics);
+
+		ConsumerRunning_ = true;
+		while(ConsumerRunning_) {
+			try {
+				std::vector<cppkafka::Message> MsgVec = Consumer.poll_batch(BatchSize, std::chrono::milliseconds(200));
+				for(auto const &Msg:MsgVec) {
+                    if (!Msg)
+                        continue;
+                    if (Msg.get_error()) {
+                        if (!Msg.is_eof()) {
+                            Logger_.error(Poco::format("Error: %s", Msg.get_error().to_string()));
+                        }if(!AutoCommit)
+                            Consumer.async_commit(Msg);
+                        continue;
+                    }
+                    SubMutexGuard G(ConsumerMutex_);
+                    auto It = Notifiers_.find(Msg.get_topic());
+                    if (It != Notifiers_.end()) {
+                        Types::TopicNotifyFunctionList &FL = It->second;
+                        std::string Key{Msg.get_key()};
+                        std::string Payload{Msg.get_payload()};
+                        for (auto &F : FL) {
+                            std::thread T(F.first, Key, Payload);
+                            T.detach();
+                        }
+                    }
+                    if (!AutoCommit)
+                        Consumer.async_commit(Msg);
+                }
+			} catch (const cppkafka::HandleException &E) {
+				Logger_.warning(Poco::format("Caught a Kafka exception (consumer): %s",std::string{E.what()}));
+			} catch (const Poco::Exception &E) {
+				Logger_.log(E);
+			}
+		}
+	}
+
+	std::string KafkaManager::WrapSystemId(const std::string & PayLoad) {
+		return std::move( SystemInfoWrapper_ + PayLoad + "}");
+	}
+
+	void KafkaManager::PostMessage(std::string topic, std::string key, std::string PayLoad, bool WrapMessage ) {
+		if(KafkaEnabled_) {
+			SubMutexGuard G(Mutex_);
+			KMessage M{
+				.Topic = topic,
+				.Key = key,
+				.PayLoad = WrapMessage ? WrapSystemId(PayLoad) : PayLoad };
+			Queue_.push(M);
+		}
+	}
+
+	int KafkaManager::RegisterTopicWatcher(const std::string &Topic, Types::TopicNotifyFunction &F) {
+		if(KafkaEnabled_) {
+			SubMutexGuard G(Mutex_);
+			auto It = Notifiers_.find(Topic);
+			if(It == Notifiers_.end()) {
+				Types::TopicNotifyFunctionList L;
+				L.emplace(L.end(),std::make_pair(F,FunctionId_));
+				Notifiers_[Topic] = std::move(L);
+			} else {
+				It->second.emplace(It->second.end(),std::make_pair(F,FunctionId_));
+			}
+			return FunctionId_++;
+		} else {
+			return 0;
+		}
+	}
+
+	void KafkaManager::UnregisterTopicWatcher(const std::string &Topic, int Id) {
+		if(KafkaEnabled_) {
+			SubMutexGuard G(Mutex_);
+			auto It = Notifiers_.find(Topic);
+			if(It != Notifiers_.end()) {
+				Types::TopicNotifyFunctionList & L = It->second;
+				for(auto it=L.begin(); it!=L.end(); it++)
+					if(it->second == Id) {
+						L.erase(it);
+						break;
+					}
+			}
+		}
+	}
+
+#endif
+} // namespace
--- a/src/KafkaManager.h
+++ b/src/KafkaManager.h
@@ -0,0 +1,74 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#ifndef UCENTRALGW_KAFKAMANAGER_H
+#define UCENTRALGW_KAFKAMANAGER_H
+
+#include <queue>
+#include <thread>
+
+#include "SubSystemServer.h"
+#include "OpenWifiTypes.h"
+
+#include "cppkafka/cppkafka.h"
+
+namespace OpenWifi {
+
+	class KafkaManager : public SubSystemServer {
+	  public:
+
+		struct KMessage {
+					std::string Topic,
+								Key,
+								PayLoad;
+		};
+
+		void initialize(Poco::Util::Application & self) override;
+		static KafkaManager *instance() {
+			if(instance_== nullptr)
+				instance_ = new KafkaManager;
+			return instance_;
+		}
+
+		void ProducerThr();
+		void ConsumerThr();
+
+		int Start() override;
+		void Stop() override;
+
+		void PostMessage(std::string topic, std::string key, std::string payload, bool WrapMessage = true);
+		[[nodiscard]] std::string WrapSystemId(const std::string & PayLoad);
+		[[nodiscard]] bool Enabled() { return KafkaEnabled_; }
+		int RegisterTopicWatcher(const std::string &Topic, Types::TopicNotifyFunction & F);
+		void UnregisterTopicWatcher(const std::string &Topic, int FunctionId);
+		void WakeUp();
+		void PartitionAssignment(const cppkafka::TopicPartitionList& partitions);
+		void PartitionRevocation(const cppkafka::TopicPartitionList& partitions);
+
+	  private:
+		static KafkaManager 			*instance_;
+		SubMutex 						ProducerMutex_;
+		SubMutex 						ConsumerMutex_;
+		bool 							KafkaEnabled_ = false;
+		std::atomic_bool 				ProducerRunning_ = false;
+		std::atomic_bool 				ConsumerRunning_ = false;
+		std::queue<KMessage>			Queue_;
+		std::string 					SystemInfoWrapper_;
+		std::unique_ptr<std::thread>	ConsumerThr_;
+		std::unique_ptr<std::thread>	ProducerThr_;
+		int                       		FunctionId_=1;
+		Types::NotifyTable        		Notifiers_;
+		std::unique_ptr<cppkafka::Configuration>    Config_;
+
+		KafkaManager() noexcept;
+	};
+
+	inline KafkaManager * KafkaManager() { return KafkaManager::instance(); }
+}	// NameSpace
+
+#endif // UCENTRALGW_KAFKAMANAGER_H
--- a/src/framework/KafkaTopics.h
+++ b/src/framework/KafkaTopics.h
@@ -1,12 +1,9 @@
 //
-//	License type: BSD 3-Clause License
-//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
-//
-//	Created by Stephane Bourque on 2021-03-04.
-//	Arilia Wireless Inc.
+// Created by stephane bourque on 2021-06-07.
 //

-#pragma once
+#ifndef UCENTRALGW_KAFKA_TOPICS_H
+#define UCENTRALGW_KAFKA_TOPICS_H

 namespace OpenWifi::KafkaTopics {
 	static const std::string HEALTHCHECK{"healthcheck"};
@@ -17,7 +14,6 @@ namespace OpenWifi::KafkaTopics {
 	static const std::string COMMAND{"command"};
 	static const std::string SERVICE_EVENTS{"service_events"};
 	static const std::string DEVICE_EVENT_QUEUE{"device_event_queue"};
-	static const std::string DEVICE_TELEMETRY{"device_telemetry"};

 	namespace ServiceEvents {
 		static const std::string EVENT_JOIN{"join"};
@@ -38,3 +34,4 @@ namespace OpenWifi::KafkaTopics {
 	}
 }

+#endif // UCENTRALGW_KAFKA_TOPICS_H
--- a/src/LatestFirmwareCache.cpp
+++ b/src/LatestFirmwareCache.cpp
@@ -6,9 +6,10 @@
 #include "StorageService.h"

 namespace OpenWifi {
+    class LatestFirmwareCache *LatestFirmwareCache::instance_ = nullptr;

    int LatestFirmwareCache::Start() {
-        StorageService()->FirmwaresDB().PopulateLatestFirmwareCache();
+        Storage()->PopulateLatestFirmwareCache();
        return 0;
    }

@@ -16,7 +17,7 @@ namespace OpenWifi {
    }

    bool LatestFirmwareCache::AddToCache(const std::string & DeviceType, const std::string &Revision, const std::string &Id, uint64_t TimeStamp) {
-        std::lock_guard G(Mutex_);
+        SubMutexGuard G(Mutex_);

        RevisionSet_.insert(Revision);
        DeviceSet_.insert(DeviceType);
@@ -31,7 +32,7 @@ namespace OpenWifi {
    }

    bool LatestFirmwareCache::FindLatestFirmware(const std::string &DeviceType, LatestFirmwareCacheEntry &Entry )  {
-        std::lock_guard G(Mutex_);
+        SubMutexGuard G(Mutex_);

        auto E=Cache_.find(DeviceType);
        if(E!=Cache_.end()) {
@@ -43,7 +44,7 @@ namespace OpenWifi {
    }

    bool LatestFirmwareCache::IsLatest(const std::string &DeviceType, const std::string &Revision) {
-        std::lock_guard G(Mutex_);
+        SubMutexGuard G(Mutex_);

        auto E=Cache_.find(DeviceType);
        if(E!=Cache_.end()) {
@@ -54,7 +55,7 @@ namespace OpenWifi {


    void LatestFirmwareCache::DumpCache() {
-        std::lock_guard G(Mutex_);
+        SubMutexGuard G(Mutex_);

        for( auto &[Id,E]:Cache_) {
            std::cout << "Device: " << Id << "    ID:" << E.Id << std::endl;
--- a/src/LatestFirmwareCache.h
+++ b/src/LatestFirmwareCache.h
@@ -10,8 +10,8 @@
 #include "Poco/Net/HTTPServerResponse.h"
 #include "Poco/JWT/Signer.h"
 #include "Poco/SHA2Engine.h"
-#include "RESTObjects/RESTAPI_SecurityObjects.h"
-#include "framework/MicroService.h"
+#include "RESTAPI_SecurityObjects.h"
+#include "SubSystemServer.h"

 namespace OpenWifi {

@@ -24,8 +24,10 @@ namespace OpenWifi {

    class LatestFirmwareCache : public SubSystemServer {
    public:
-        static auto instance() {
-            static auto instance_ = new LatestFirmwareCache;
+        static LatestFirmwareCache *instance() {
+            if (instance_ == nullptr) {
+                instance_ = new LatestFirmwareCache;
+            }
            return instance_;
        }

@@ -35,11 +37,12 @@ namespace OpenWifi {
        // void AddRevision(const std::string &Revision);
        bool FindLatestFirmware(const std::string &DeviceType, LatestFirmwareCacheEntry &Entry );
        void DumpCache();
-        inline Types::StringSet GetRevisions() { std::lock_guard G(Mutex_); return RevisionSet_; };
-        inline Types::StringSet GetDevices() { std::lock_guard G(Mutex_); return DeviceSet_; };
+        inline Types::StringSet GetRevisions() { SubMutexGuard G(Mutex_); return RevisionSet_; };
+        inline Types::StringSet GetDevices() { SubMutexGuard G(Mutex_); return DeviceSet_; };
        bool IsLatest(const std::string &DeviceType, const std::string &Revision);

    private:
+        static LatestFirmwareCache 	*instance_;
        LatestFirmwareCacheMap      Cache_;
        Types::StringSet            RevisionSet_;
        Types::StringSet            DeviceSet_;
@@ -49,7 +52,7 @@ namespace OpenWifi {
        }
    };

-    inline auto LatestFirmwareCache() { return LatestFirmwareCache::instance(); }
+    inline LatestFirmwareCache * LatestFirmwareCache() { return LatestFirmwareCache::instance(); }
 }


--- a/src/ManifestCreator.cpp
+++ b/src/ManifestCreator.cpp
@@ -6,29 +6,42 @@
 #include "Poco/JSON/Parser.h"
 #include "Poco/JSON/Stringifier.h"

+#include "ManifestCreator.h"
+#include "Utils.h"
+
 #include <aws/s3/model/ListObjectsRequest.h>
 #include <aws/s3/model/ListObjectsV2Request.h>
 #include <aws/s3/model/GetObjectRequest.h>

-#include "ManifestCreator.h"
+#include "Daemon.h"
 #include "StorageService.h"
 #include "LatestFirmwareCache.h"

 namespace OpenWifi {
+    class ManifestCreator *ManifestCreator::instance_ = nullptr;

-    void ManifestCreator::onTimer(Poco::Timer &timer) {
-        Logger().information("Performing DB refresh");
-        S3BucketContent BucketList;
-        StorageService()->FirmwaresDB().RemoveOldFirmware();
-        ReadBucket(BucketList);
-        Logger().information(Poco::format("Found %Lu firmware entries in S3 repository.",(uint64_t)BucketList.size()));
-        ComputeManifest(BucketList);
-        AddManifestToDB(BucketList);
+    void ManifestCreator::run() {
+        Running_ = true;
+        bool FirstRun = true;
+
+        while(Running_) {
+            Poco::Thread::trySleep(FirstRun ? 10000 : DBRefresh_*1000);
+            if(!Running_)
+                break;
+            FirstRun = false;
+            Logger_.information("Performing DB refresh");
+            S3BucketContent BucketList;
+            ReadBucket(BucketList);
+            if(!Running_)
+                break;
+            Logger_.information(Poco::format("Found %Lu firmware entries in S3 repository.",(uint64_t)BucketList.size()));
+            ComputeManifest(BucketList);
+            AddManifestToDB(BucketList);
+        }
    }

    bool ManifestCreator::ComputeManifest(S3BucketContent &BucketContent) {

-        uint64_t Limit = std::time(nullptr) - MaxAge_, Rejected=0, Accepted=0, BadFormat=0, MissingJson=0;
        for(auto &[Name,Entry]:BucketContent) {
            std::string C = Entry.S3ContentManifest;

@@ -42,38 +55,24 @@ namespace OpenWifi {
                    ParsedContent->has("timestamp"))
                {
                    Entry.Timestamp = ParsedContent->get("timestamp");
-                    if(Entry.Timestamp>Limit) {
-                        Entry.Compatible = ParsedContent->get("compatible").toString();
-                        Entry.Revision = ParsedContent->get("revision").toString();
-                        Entry.Image = ParsedContent->get("image").toString();
-                        auto FullNme = Name + "-upgrade.bin";
-                        if(FullNme!=Entry.Image) {
-                            Logger().error(Poco::format("MANIFEST(%s): Image name does not match manifest name (%s).",Name,Entry.Image));
-                            Entry.Valid = false;
-                            BadFormat++;
-                            continue;
-                        }
-                        Accepted++;
-                        Entry.Valid = true;
-                    } else {
-                        Rejected++;
+                    Entry.Compatible = ParsedContent->get("compatible").toString();
+                    Entry.Revision = ParsedContent->get("revision").toString();
+                    Entry.Image = ParsedContent->get("image").toString();
+                    auto FullNme = Name + "-upgrade.bin";
+                    if(FullNme!=Entry.Image) {
+                        Logger_.error(Poco::format("MANIFEST(%s): Image name does not match manifest name (%s).",Name,Entry.Image));
                        Entry.Valid = false;
+                        continue;
                    }
+                    Entry.Valid = true;
                } else {
-                    Logger().error(Poco::format("MANIFEST(%s): Entry does not have a valid JSON manifest.",Name));
-                    MissingJson++;
-                    Entry.Valid = false;
+                    Logger_.error(Poco::format("MANIFEST(%s): Entry does not have a valid JSON manifest.",Name));
                }
            } catch (const Poco::Exception  &E ) {
-                Logger().log(E);
+                std::cout << "Exception parsing: " << C << std::endl;
+                Logger_.log(E);
            }
        }
-
-        Logger().information(Poco::format("Accepted %Lu firmwares.", Accepted));
-        Logger().information(Poco::format("Rejected %Lu too old firmwares.", Rejected));
-        Logger().information(Poco::format("Rejected %Lu bad JSON.", BadFormat));
-        Logger().information(Poco::format("Rejected %Lu missing JSON.", MissingJson));
-
        return true;
    }

@@ -82,13 +81,8 @@ namespace OpenWifi {
        for(auto &[Release,BucketEntry]:BucketContent) {
            FMSObjects::Firmware    F;
            auto R = Release;
-
-            // skip staging releases.
-            if(BucketEntry.URI.find("-staging-")!=std::string::npos)
-                continue;
-
-            if(BucketEntry.Valid && !StorageService()->FirmwaresDB().GetFirmwareByName(R,BucketEntry.Compatible,F)) {
-                F.id = MicroService::instance().CreateUUID();
+            if(BucketEntry.Valid && !Storage()->GetFirmwareByName(R,BucketEntry.Compatible,F)) {
+                F.id = Daemon()->CreateUUID();
                F.release = Release;
                F.size = BucketEntry.S3Size;
                F.created = std::time(nullptr);
@@ -97,8 +91,8 @@ namespace OpenWifi {
                F.uri = BucketEntry.URI;
                F.revision = BucketEntry.Revision;
                F.deviceType = BucketEntry.Compatible;
-                if(StorageService()->FirmwaresDB().AddFirmware(F)) {
-                    Logger().information(Poco::format("Adding firmware '%s'",Release));
+                if(Storage()->AddFirmware(F)) {
+                    Logger_.information(Poco::format("Adding firmware '%s'",Release));
                } else {
                }
            }
@@ -107,15 +101,13 @@ namespace OpenWifi {
    }

    int ManifestCreator::Start() {
-        Running_ = true;
-        S3BucketName_ = MicroService::instance().ConfigGetString("s3.bucketname");
-        S3Region_ = MicroService::instance().ConfigGetString("s3.region");
-        S3Secret_ = MicroService::instance().ConfigGetString("s3.secret");
-        S3Key_ = MicroService::instance().ConfigGetString("s3.key");
-        S3Retry_ = MicroService::instance().ConfigGetInt("s3.retry",60);
+        S3BucketName_ = Daemon()->ConfigGetString("s3.bucketname");
+        S3Region_ = Daemon()->ConfigGetString("s3.region");
+        S3Secret_ = Daemon()->ConfigGetString("s3.secret");
+        S3Key_ = Daemon()->ConfigGetString("s3.key");
+        S3Retry_ = Daemon()->ConfigGetInt("s3.retry",60);

-        DBRefresh_ = MicroService::instance().ConfigGetInt("firmwaredb.refresh",30*60);
-        MaxAge_ = MicroService::instance().ConfigGetInt("firmwaredb.maxage",90) * 24 * 60 * 60;
+        DBRefresh_ = Daemon()->ConfigGetInt("firmwaredb.refresh",30*60);

        AwsConfig_.enableTcpKeepAlive = true;
        AwsConfig_.enableEndpointDiscovery = true;
@@ -125,21 +117,23 @@ namespace OpenWifi {
        AwsCreds_.SetAWSAccessKeyId(S3Key_);
        AwsCreds_.SetAWSSecretKey(S3Secret_);

-        ManifestCreatorCallBack_ = std::make_unique<Poco::TimerCallback<ManifestCreator>>(*this, &ManifestCreator::onTimer);
-        Timer_.setStartInterval(5 * 60 * 1000);  // first run in 5 minutes
-        Timer_.setPeriodicInterval(DBRefresh_ * 1000);
-        Timer_.start(*ManifestCreatorCallBack_);
-
+        Worker_.start(*this);
        return 0;
    }

    void ManifestCreator::Stop() {
        if(Running_) {
            Running_ = false;
-            Timer_.stop();
+            Worker_.wakeUp();
+            Worker_.join();
        }
    }

+    bool ManifestCreator::Update() {
+        Worker_.wakeUp();
+        return true;
+    }
+
    void ManifestCreator::CloseBucket() {
    }

@@ -168,7 +162,7 @@ namespace OpenWifi {
        static const std::string UPGRADE("-upgrade.bin");

        std::string     URIBase = "https://";
-        URIBase += MicroService::instance().ConfigGetString("s3.bucket.uri");
+        URIBase += Daemon()->ConfigGetString("s3.bucket.uri");

        Bucket.clear();

@@ -184,7 +178,7 @@ namespace OpenWifi {
        while(!isDone) {
            Outcome = S3Client.ListObjectsV2(Request);
            if(!Outcome.IsSuccess()) {
-                Logger().error(Poco::format("Error while doing ListObjectsV2: %s, %s",
+                Logger_.error(Poco::format("Error while doing ListObjectsV2: %s, %s",
                                           std::string{Outcome.GetError().GetExceptionName()},
                                           std::string{Outcome.GetError().GetMessage()}));
                return false;
@@ -268,7 +262,7 @@ namespace OpenWifi {

        // std::cout << "Count:" << Count << "  Runs:" << Runs << std::endl;
        if(!Outcome.IsSuccess()) {
-            Logger().error(Poco::format("Error while doing ListObjectsV2: %s, %s",
+            Logger_.error(Poco::format("Error while doing ListObjectsV2: %s, %s",
                                       std::string{Outcome.GetError().GetExceptionName()},
                                       std::string{Outcome.GetError().GetMessage()}));
            return false;
--- a/src/ManifestCreator.h
+++ b/src/ManifestCreator.h
@@ -9,8 +9,7 @@
 #include <aws/s3/S3Client.h>
 #include <aws/core/auth/AWSCredentials.h>

-#include "framework/MicroService.h"
-#include "Poco/Timer.h"
+#include "SubSystemServer.h"

 namespace OpenWifi {

@@ -29,15 +28,19 @@ namespace OpenWifi {
    };
    typedef std::map<const std::string, S3BucketEntry>    S3BucketContent;

-    class ManifestCreator : public SubSystemServer {
+    class ManifestCreator : public SubSystemServer, Poco::Runnable {
    public:
-        static auto instance() {
-            static auto instance_ = new ManifestCreator;
+        static ManifestCreator *instance() {
+            if (instance_ == nullptr) {
+                instance_ = new ManifestCreator;
+            }
            return instance_;
        }

+        void run() override;
        int Start() override;
        void Stop() override;
+        bool Update();

        bool ComputeManifest(S3BucketContent & BucketContent);
        bool AddManifestToDB(S3BucketContent & BucketContent);
@@ -46,10 +49,10 @@ namespace OpenWifi {
        bool GetBucketObjectContent(Aws::S3::S3Client &S3Client, const std::string &ObjectName, std::string & ObjectContent);
        void CloseBucket();
        void Print(const S3BucketContent &B);
-        uint64_t MaxAge() const { return MaxAge_; }
-        void onTimer(Poco::Timer & timer);

    private:
+        static ManifestCreator      *instance_;
+        Poco::Thread                Worker_;
        std::atomic_bool            Running_ = false;
        Aws::String                 S3BucketName_;
        Aws::String                 S3Region_;
@@ -59,16 +62,13 @@ namespace OpenWifi {
        Aws::Client::ClientConfiguration    AwsConfig_{"ARILIA"};
        Aws::Auth::AWSCredentials           AwsCreds_;
        uint64_t                     DBRefresh_ = 30 * 60;
-        uint64_t                    MaxAge_ = 0 ;
-        Poco::Timer                                             Timer_;
-        std::unique_ptr<Poco::TimerCallback<ManifestCreator>>   ManifestCreatorCallBack_;

        ManifestCreator() noexcept:
                SubSystemServer("ManifestCreator", "MANIFEST-MGR", "manifestcreator") {
        }
    };

-    inline auto ManifestCreator() { return ManifestCreator::instance(); };
+    inline ManifestCreator * ManifestCreator() { return ManifestCreator::instance(); };

 }

--- a/src/MicroService.cpp
+++ b/src/MicroService.cpp
@@ -0,0 +1,501 @@
+//
+// Created by stephane bourque on 2021-06-22.
+//
+#include <cstdlib>
+#include <boost/algorithm/string.hpp>
+
+#include "Poco/Util/Application.h"
+#include "Poco/Util/ServerApplication.h"
+#include "Poco/Util/Option.h"
+#include "Poco/Util/OptionSet.h"
+#include "Poco/Util/HelpFormatter.h"
+#include "Poco/Environment.h"
+#include "Poco/Net/HTTPSStreamFactory.h"
+#include "Poco/Net/HTTPStreamFactory.h"
+#include "Poco/Net/FTPSStreamFactory.h"
+#include "Poco/Net/FTPStreamFactory.h"
+#include "Poco/Path.h"
+#include "Poco/File.h"
+#include "Poco/String.h"
+#include "Poco/JSON/Object.h"
+#include "Poco/JSON/Parser.h"
+#include "Poco/JSON/Stringifier.h"
+
+#include "ALBHealthCheckServer.h"
+#ifndef SMALL_BUILD
+#include "KafkaManager.h"
+#endif
+#include "Kafka_topics.h"
+
+#include "MicroService.h"
+#include "Utils.h"
+
+#ifndef TIP_SECURITY_SERVICE
+#include "AuthClient.h"
+#endif
+
+namespace OpenWifi {
+
+	void MyErrorHandler::exception(const Poco::Exception & E) {
+		Poco::Thread * CurrentThread = Poco::Thread::current();
+		App_.logger().log(E);
+		App_.logger().error(Poco::format("Exception occurred in %s",CurrentThread->getName()));
+	}
+
+	void MyErrorHandler::exception(const std::exception & E) {
+		Poco::Thread * CurrentThread = Poco::Thread::current();
+		App_.logger().warning(Poco::format("std::exception on %s",CurrentThread->getName()));
+	}
+
+	void MyErrorHandler::exception() {
+		Poco::Thread * CurrentThread = Poco::Thread::current();
+		App_.logger().warning(Poco::format("exception on %s",CurrentThread->getName()));
+	}
+
+	void MicroService::Exit(int Reason) {
+		std::exit(Reason);
+	}
+
+	void MicroService::BusMessageReceived(const std::string &Key, const std::string & Message) {
+		SubMutexGuard G(InfraMutex_);
+		try {
+			Poco::JSON::Parser P;
+			auto Object = P.parse(Message).extract<Poco::JSON::Object::Ptr>();
+			if (Object->has(KafkaTopics::ServiceEvents::Fields::ID) &&
+				Object->has(KafkaTopics::ServiceEvents::Fields::EVENT)) {
+				uint64_t 	ID = Object->get(KafkaTopics::ServiceEvents::Fields::ID);
+				auto 		Event = Object->get(KafkaTopics::ServiceEvents::Fields::EVENT).toString();
+				if (ID != ID_) {
+					if(	Event==KafkaTopics::ServiceEvents::EVENT_JOIN ||
+						Event==KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE ||
+						Event==KafkaTopics::ServiceEvents::EVENT_LEAVE ) {
+						if(	Object->has(KafkaTopics::ServiceEvents::Fields::TYPE) &&
+						   	Object->has(KafkaTopics::ServiceEvents::Fields::PUBLIC) &&
+							Object->has(KafkaTopics::ServiceEvents::Fields::PRIVATE) &&
+						   	Object->has(KafkaTopics::ServiceEvents::Fields::VRSN) &&
+							Object->has(KafkaTopics::ServiceEvents::Fields::KEY)) {
+
+							if (Event == KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE && Services_.find(ID) != Services_.end()) {
+								Services_[ID].LastUpdate = std::time(nullptr);
+							} else if (Event == KafkaTopics::ServiceEvents::EVENT_LEAVE) {
+								Services_.erase(ID);
+								logger().information(Poco::format("Service %s ID=%Lu leaving system.",Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE).toString(),ID));
+							} else if (Event == KafkaTopics::ServiceEvents::EVENT_JOIN || Event == KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE) {
+								logger().information(Poco::format("Service %s ID=%Lu joining system.",Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE).toString(),ID));
+								Services_[ID] = MicroServiceMeta{
+									.Id = ID,
+									.Type = Poco::toLower(Object->get(KafkaTopics::ServiceEvents::Fields::TYPE).toString()),
+									.PrivateEndPoint = Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE).toString(),
+									.PublicEndPoint = Object->get(KafkaTopics::ServiceEvents::Fields::PUBLIC).toString(),
+									.AccessKey = Object->get(KafkaTopics::ServiceEvents::Fields::KEY).toString(),
+									.Version = Object->get(KafkaTopics::ServiceEvents::Fields::VRSN).toString(),
+									.LastUpdate = (uint64_t)std::time(nullptr)};
+								for (const auto &[Id, Svc] : Services_) {
+									logger().information(Poco::format("ID: %Lu Type: %s EndPoint: %s",Id,Svc.Type,Svc.PrivateEndPoint));
+								}
+							}
+						} else {
+							logger().error(Poco::format("KAFKA-MSG: invalid event '%s', missing a field.",Event));
+						}
+					} else if (Event==KafkaTopics::ServiceEvents::EVENT_REMOVE_TOKEN) {
+						if(Object->has(KafkaTopics::ServiceEvents::Fields::TOKEN)) {
+#ifndef TIP_SECURITY_SERVICE
+							AuthClient()->RemovedCachedToken(Object->get(KafkaTopics::ServiceEvents::Fields::TOKEN).toString());
+#endif
+						} else {
+							logger().error(Poco::format("KAFKA-MSG: invalid event '%s', missing token",Event));
+						}
+					} else {
+						logger().error(Poco::format("Unknown Event: %s Source: %Lu", Event, ID));
+					}
+				}
+			} else {
+				logger().error("Bad bus message.");
+			}
+
+			auto i=Services_.begin();
+			auto Now = (uint64_t )std::time(nullptr);
+			for(;i!=Services_.end();) {
+			    if((Now - i->second.LastUpdate)>60) {
+			        i = Services_.erase(i);
+			    } else
+			        ++i;
+			}
+
+		} catch (const Poco::Exception &E) {
+			logger().log(E);
+		}
+	}
+
+	MicroServiceMetaVec MicroService::GetServices(const std::string & Type) {
+		SubMutexGuard G(InfraMutex_);
+
+		auto T = Poco::toLower(Type);
+		MicroServiceMetaVec	Res;
+		for(const auto &[Id,ServiceRec]:Services_) {
+			if(ServiceRec.Type==T)
+				Res.push_back(ServiceRec);
+		}
+		return Res;
+	}
+
+	MicroServiceMetaVec MicroService::GetServices() {
+		SubMutexGuard G(InfraMutex_);
+
+		MicroServiceMetaVec	Res;
+		for(const auto &[Id,ServiceRec]:Services_) {
+			Res.push_back(ServiceRec);
+		}
+		return Res;
+	}
+
+	void MicroService::initialize(Poco::Util::Application &self) {
+		// add the default services
+		SubSystems_.push_back(KafkaManager());
+		SubSystems_.push_back(ALBHealthCheckServer());
+
+		Poco::Net::initializeSSL();
+		Poco::Net::HTTPStreamFactory::registerFactory();
+		Poco::Net::HTTPSStreamFactory::registerFactory();
+		Poco::Net::FTPStreamFactory::registerFactory();
+		Poco::Net::FTPSStreamFactory::registerFactory();
+		std::string Location = Poco::Environment::get(DAEMON_CONFIG_ENV_VAR,".");
+		Poco::Path ConfigFile;
+
+		ConfigFile = ConfigFileName_.empty() ? Location + "/" + DAEMON_PROPERTIES_FILENAME : ConfigFileName_;
+
+		if(!ConfigFile.isFile())
+		{
+			std::cerr << DAEMON_APP_NAME << ": Configuration "
+					  << ConfigFile.toString() << " does not seem to exist. Please set " + DAEMON_CONFIG_ENV_VAR
+												  + " env variable the path of the " + DAEMON_PROPERTIES_FILENAME + " file." << std::endl;
+			std::exit(Poco::Util::Application::EXIT_CONFIG);
+		}
+
+		static const char * LogFilePathKey = "logging.channels.c2.path";
+
+		loadConfiguration(ConfigFile.toString());
+
+		if(LogDir_.empty()) {
+			std::string OriginalLogFileValue = ConfigPath(LogFilePathKey);
+			config().setString(LogFilePathKey, OriginalLogFileValue);
+		} else {
+			config().setString(LogFilePathKey, LogDir_);
+		}
+		Poco::File	DataDir(ConfigPath("ucentral.system.data"));
+		DataDir_ = DataDir.path();
+		if(!DataDir.exists()) {
+			try {
+				DataDir.createDirectory();
+			} catch (const Poco::Exception &E) {
+				logger().log(E);
+			}
+		}
+		std::string KeyFile = ConfigPath("ucentral.service.key");
+		std::string KeyFilePassword = ConfigPath("ucentral.service.key.password" , "" );
+		AppKey_ = Poco::SharedPtr<Poco::Crypto::RSAKey>(new Poco::Crypto::RSAKey("", KeyFile, KeyFilePassword));
+		Cipher_ = CipherFactory_.createCipher(*AppKey_);
+		ID_ = Utils::GetSystemId();
+		if(!DebugMode_)
+			DebugMode_ = ConfigGetBool("ucentral.system.debug",false);
+		MyPrivateEndPoint_ = ConfigGetString("ucentral.system.uri.private");
+		MyPublicEndPoint_ = ConfigGetString("ucentral.system.uri.public");
+		UIURI_ = ConfigGetString("ucentral.system.uri.ui");
+		MyHash_ = CreateHash(MyPublicEndPoint_);
+		InitializeSubSystemServers();
+		ServerApplication::initialize(self);
+
+		Types::TopicNotifyFunction F = [this](std::string s1,std::string s2) { this->BusMessageReceived(s1,s2); };
+		KafkaManager()->RegisterTopicWatcher(KafkaTopics::SERVICE_EVENTS, F);
+	}
+
+	void MicroService::uninitialize() {
+		// add your own uninitialization code here
+		ServerApplication::uninitialize();
+	}
+
+	void MicroService::reinitialize(Poco::Util::Application &self) {
+		ServerApplication::reinitialize(self);
+		// add your own reinitialization code here
+	}
+
+	void MicroService::defineOptions(Poco::Util::OptionSet &options) {
+		ServerApplication::defineOptions(options);
+
+		options.addOption(
+			Poco::Util::Option("help", "", "display help information on command line arguments")
+				.required(false)
+				.repeatable(false)
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleHelp)));
+
+		options.addOption(
+			Poco::Util::Option("file", "", "specify the configuration file")
+				.required(false)
+				.repeatable(false)
+				.argument("file")
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleConfig)));
+
+		options.addOption(
+			Poco::Util::Option("debug", "", "to run in debug, set to true")
+				.required(false)
+				.repeatable(false)
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleDebug)));
+
+		options.addOption(
+			Poco::Util::Option("logs", "", "specify the log directory and file (i.e. dir/file.log)")
+				.required(false)
+				.repeatable(false)
+				.argument("dir")
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleLogs)));
+
+		options.addOption(
+			Poco::Util::Option("version", "", "get the version and quit.")
+				.required(false)
+				.repeatable(false)
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleVersion)));
+
+	}
+
+	void MicroService::handleHelp(const std::string &name, const std::string &value) {
+		HelpRequested_ = true;
+		displayHelp();
+		stopOptionsProcessing();
+	}
+
+	void MicroService::handleVersion(const std::string &name, const std::string &value) {
+		HelpRequested_ = true;
+		std::cout << Version() << std::endl;
+		stopOptionsProcessing();
+	}
+
+	void MicroService::handleDebug(const std::string &name, const std::string &value) {
+		if(value == "true")
+			DebugMode_ = true ;
+	}
+
+	void MicroService::handleLogs(const std::string &name, const std::string &value) {
+		LogDir_ = value;
+	}
+
+	void MicroService::handleConfig(const std::string &name, const std::string &value) {
+		ConfigFileName_ = value;
+	}
+
+	void MicroService::displayHelp() {
+		Poco::Util::HelpFormatter helpFormatter(options());
+		helpFormatter.setCommand(commandName());
+		helpFormatter.setUsage("OPTIONS");
+		helpFormatter.setHeader("A " + DAEMON_APP_NAME + " implementation for TIP.");
+		helpFormatter.format(std::cout);
+	}
+
+	void MicroService::InitializeSubSystemServers() {
+		for(auto i:SubSystems_)
+			addSubsystem(i);
+	}
+
+	void MicroService::StartSubSystemServers() {
+		for(auto i:SubSystems_) {
+			i->Start();
+		}
+		BusEventManager_.Start();
+	}
+
+	void MicroService::StopSubSystemServers() {
+		BusEventManager_.Stop();
+		for(auto i=SubSystems_.rbegin(); i!=SubSystems_.rend(); ++i)
+			(*i)->Stop();
+	}
+
+	std::string MicroService::CreateUUID() {
+		return UUIDGenerator_.create().toString();
+	}
+
+	bool MicroService::SetSubsystemLogLevel(const std::string &SubSystem, const std::string &Level) {
+		try {
+			auto P = Poco::Logger::parseLevel(Level);
+			auto Sub = Poco::toLower(SubSystem);
+
+			if (Sub == "all") {
+				for (auto i : SubSystems_) {
+					i->Logger().setLevel(P);
+				}
+				return true;
+			} else {
+				// std::cout << "Sub:" << SubSystem << " Level:" << Level << std::endl;
+				for (auto i : SubSystems_) {
+					if (Sub == Poco::toLower(i->Name())) {
+						i->Logger().setLevel(P);
+						return true;
+					}
+				}
+			}
+		} catch (const Poco::Exception & E) {
+			std::cout << "Exception" << std::endl;
+		}
+		return false;
+	}
+
+	Types::StringVec MicroService::GetSubSystems() const {
+		Types::StringVec Result;
+		for(auto i:SubSystems_)
+			Result.push_back(i->Name());
+		return Result;
+	}
+
+	Types::StringPairVec MicroService::GetLogLevels() const {
+		Types::StringPairVec Result;
+
+		for(auto &i:SubSystems_) {
+			auto P = std::make_pair( i->Name(), Utils::LogLevelToString(i->GetLoggingLevel()));
+			Result.push_back(P);
+		}
+		return Result;
+	}
+
+	const Types::StringVec & MicroService::GetLogLevelNames() const {
+		static Types::StringVec LevelNames{"none", "fatal", "critical", "error", "warning", "notice", "information", "debug", "trace" };
+		return LevelNames;
+	}
+
+	uint64_t MicroService::ConfigGetInt(const std::string &Key,uint64_t Default) {
+		return (uint64_t) config().getInt64(Key,Default);
+	}
+
+	uint64_t MicroService::ConfigGetInt(const std::string &Key) {
+		return config().getInt(Key);
+	}
+
+	uint64_t MicroService::ConfigGetBool(const std::string &Key,bool Default) {
+		return config().getBool(Key,Default);
+	}
+
+	uint64_t MicroService::ConfigGetBool(const std::string &Key) {
+		return config().getBool(Key);
+	}
+
+	std::string MicroService::ConfigGetString(const std::string &Key,const std::string & Default) {
+		return config().getString(Key, Default);
+	}
+
+	std::string MicroService::ConfigGetString(const std::string &Key) {
+		return config().getString(Key);
+	}
+
+	std::string MicroService::ConfigPath(const std::string &Key,const std::string & Default) {
+		std::string R = config().getString(Key, Default);
+		return Poco::Path::expand(R);
+	}
+
+	std::string MicroService::ConfigPath(const std::string &Key) {
+		std::string R = config().getString(Key);
+		return Poco::Path::expand(R);
+	}
+
+	std::string MicroService::Encrypt(const std::string &S) {
+		return Cipher_->encryptString(S, Poco::Crypto::Cipher::Cipher::ENC_BASE64);;
+	}
+
+	std::string MicroService::Decrypt(const std::string &S) {
+		return Cipher_->decryptString(S, Poco::Crypto::Cipher::Cipher::ENC_BASE64);;
+	}
+
+	std::string MicroService::CreateHash(const std::string &S) {
+		SHA2_.update(S);
+		return Utils::ToHex(SHA2_.digest());
+	}
+
+	std::string MicroService::MakeSystemEventMessage( const std::string & Type ) const {
+		Poco::JSON::Object	Obj;
+		Obj.set(KafkaTopics::ServiceEvents::Fields::EVENT,Type);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::ID,ID_);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::TYPE,Poco::toLower(DAEMON_APP_NAME));
+		Obj.set(KafkaTopics::ServiceEvents::Fields::PUBLIC,MyPublicEndPoint_);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::PRIVATE,MyPrivateEndPoint_);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::KEY,MyHash_);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::VRSN,Version_);
+		std::stringstream ResultText;
+		Poco::JSON::Stringifier::stringify(Obj, ResultText);
+		return ResultText.str();
+	}
+
+	void BusEventManager::run() {
+		Running_ = true;
+		auto Msg = Daemon()->MakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_JOIN);
+		KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS,Daemon()->PrivateEndPoint(),Msg, false);
+		while(Running_) {
+			Poco::Thread::trySleep((unsigned long)Daemon()->DaemonBusTimer());
+			if(!Running_)
+				break;
+			auto Msg = Daemon()->MakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE);
+			KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS,Daemon()->PrivateEndPoint(),Msg, false);
+		}
+		Msg = Daemon()->MakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_LEAVE);
+		KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS,Daemon()->PrivateEndPoint(),Msg, false);
+	};
+
+	void BusEventManager::Start() {
+		if(KafkaManager()->Enabled()) {
+			Thread_.start(*this);
+		}
+	}
+
+	void BusEventManager::Stop() {
+		if(KafkaManager()->Enabled()) {
+			Running_ = false;
+			Thread_.wakeUp();
+			Thread_.join();
+		}
+	}
+
+	[[nodiscard]] bool MicroService::IsValidAPIKEY(const Poco::Net::HTTPServerRequest &Request) {
+		try {
+			auto APIKEY = Request.get("X-API-KEY");
+			return APIKEY == MyHash_;
+		} catch (const Poco::Exception &E) {
+			logger().log(E);
+		}
+		return false;
+	}
+
+	void MicroService::SavePID() {
+		try {
+			std::ofstream O;
+			O.open(Daemon()->DataDir() + "/pidfile",std::ios::binary | std::ios::trunc);
+			O << Poco::Process::id();
+			O.close();
+		} catch (...)
+		{
+			std::cout << "Could not save system ID" << std::endl;
+		}
+	}
+
+	int MicroService::main(const ArgVec &args) {
+
+		MyErrorHandler	ErrorHandler(*this);
+		Poco::ErrorHandler::set(&ErrorHandler);
+
+		if (!HelpRequested_) {
+			SavePID();
+			Poco::Logger &logger = Poco::Logger::get(DAEMON_APP_NAME);
+			logger.notice(Poco::format("Starting %s version %s.",DAEMON_APP_NAME, Version()));
+
+			if(Poco::Net::Socket::supportsIPv6())
+				logger.information("System supports IPv6.");
+			else
+				logger.information("System does NOT support IPv6.");
+
+			if (config().getBool("application.runAsDaemon", false)) {
+				logger.information("Starting as a daemon.");
+			}
+			logger.information(Poco::format("System ID set to %Lu",ID_));
+			StartSubSystemServers();
+			waitForTerminationRequest();
+			StopSubSystemServers();
+
+			logger.notice(Poco::format("Stopped %s...",DAEMON_APP_NAME));
+		}
+
+		return Application::EXIT_OK;
+	}
+}
--- a/src/MicroService.h
+++ b/src/MicroService.h
@@ -0,0 +1,174 @@
+//
+// Created by stephane bourque on 2021-06-22.
+//
+
+#ifndef UCENTRALGW_MICROSERVICE_H
+#define UCENTRALGW_MICROSERVICE_H
+
+#include <array>
+#include <iostream>
+#include <cstdlib>
+#include <vector>
+#include <set>
+
+#include "Poco/Util/Application.h"
+#include "Poco/Util/ServerApplication.h"
+#include "Poco/Util/Option.h"
+#include "Poco/Util/OptionSet.h"
+#include "Poco/UUIDGenerator.h"
+#include "Poco/ErrorHandler.h"
+#include "Poco/Crypto/RSAKey.h"
+#include "Poco/Crypto/CipherFactory.h"
+#include "Poco/Crypto/Cipher.h"
+#include "Poco/SHA2Engine.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Process.h"
+
+#include "OpenWifiTypes.h"
+#include "SubSystemServer.h"
+
+namespace OpenWifi {
+
+	static const std::string uSERVICE_SECURITY{"ucentralsec"};
+	static const std::string uSERVICE_GATEWAY{"ucentralgw"};
+	static const std::string uSERVICE_FIRMWARE{ "ucentralfms"};
+    static const std::string uSERVICE_TOPOLOGY{ "owtopo"};
+    static const std::string uSERVICE_PROVISIONING{ "owprov"};
+
+	class MyErrorHandler : public Poco::ErrorHandler {
+	  public:
+		explicit MyErrorHandler(Poco::Util::Application &App) : App_(App) {}
+		void exception(const Poco::Exception & E) override;
+		void exception(const std::exception & E) override;
+		void exception() override;
+	  private:
+		Poco::Util::Application	&App_;
+	};
+
+	class BusEventManager : public Poco::Runnable {
+	  public:
+		void run() override;
+		void Start();
+		void Stop();
+	  private:
+		std::atomic_bool 	Running_ = false;
+		Poco::Thread		Thread_;
+	};
+
+	struct MicroServiceMeta {
+		uint64_t 		Id=0;
+		std::string 	Type;
+		std::string 	PrivateEndPoint;
+		std::string 	PublicEndPoint;
+		std::string 	AccessKey;
+		std::string		Version;
+		uint64_t 		LastUpdate=0;
+	};
+
+	typedef std::map<uint64_t, MicroServiceMeta>	MicroServiceMetaMap;
+	typedef std::vector<MicroServiceMeta>			MicroServiceMetaVec;
+
+	class MicroService : public Poco::Util::ServerApplication {
+	  public:
+		explicit MicroService( 	std::string PropFile,
+					 	std::string RootEnv,
+					 	std::string ConfigVar,
+					 	std::string AppName,
+					  	uint64_t BusTimer,
+					  	Types::SubSystemVec Subsystems) :
+			DAEMON_PROPERTIES_FILENAME(std::move(PropFile)),
+			DAEMON_ROOT_ENV_VAR(std::move(RootEnv)),
+			DAEMON_CONFIG_ENV_VAR(std::move(ConfigVar)),
+			DAEMON_APP_NAME(std::move(AppName)),
+			DAEMON_BUS_TIMER(BusTimer),
+			SubSystems_(std::move(Subsystems)) {
+			std::string V{APP_VERSION};
+			std::string B{BUILD_NUMBER};
+			Version_ =  V + "(" + B +  ")";
+		}
+
+		int main(const ArgVec &args) override;
+		void initialize(Application &self) override;
+		void uninitialize() override;
+		void reinitialize(Application &self) override;
+		void defineOptions(Poco::Util::OptionSet &options) override;
+		void handleHelp(const std::string &name, const std::string &value);
+		void handleVersion(const std::string &name, const std::string &value);
+		void handleDebug(const std::string &name, const std::string &value);
+		void handleLogs(const std::string &name, const std::string &value);
+		void handleConfig(const std::string &name, const std::string &value);
+		void displayHelp();
+
+		void InitializeSubSystemServers();
+		void StartSubSystemServers();
+		void StopSubSystemServers();
+		void Exit(int Reason);
+		bool SetSubsystemLogLevel(const std::string & SubSystem, const std::string & Level);
+		[[nodiscard]] std::string Version() { return Version_; }
+		[[nodiscard]] const Poco::SharedPtr<Poco::Crypto::RSAKey> & Key() { return AppKey_; }
+		[[nodiscard]] inline const std::string & DataDir() { return DataDir_; }
+		[[nodiscard]] std::string CreateUUID();
+		[[nodiscard]] bool Debug() const { return DebugMode_; }
+		[[nodiscard]] uint64_t ID() const { return ID_; }
+		[[nodiscard]] Types::StringVec GetSubSystems() const;
+		[[nodiscard]] Types::StringPairVec GetLogLevels() const;
+		[[nodiscard]] const Types::StringVec & GetLogLevelNames() const;
+		[[nodiscard]] std::string ConfigGetString(const std::string &Key,const std::string & Default);
+		[[nodiscard]] std::string ConfigGetString(const std::string &Key);
+		[[nodiscard]] std::string ConfigPath(const std::string &Key,const std::string & Default);
+		[[nodiscard]] std::string ConfigPath(const std::string &Key);
+		[[nodiscard]] uint64_t ConfigGetInt(const std::string &Key,uint64_t Default);
+		[[nodiscard]] uint64_t ConfigGetInt(const std::string &Key);
+		[[nodiscard]] uint64_t ConfigGetBool(const std::string &Key,bool Default);
+		[[nodiscard]] uint64_t ConfigGetBool(const std::string &Key);
+		[[nodiscard]] std::string Encrypt(const std::string &S);
+		[[nodiscard]] std::string Decrypt(const std::string &S);
+		[[nodiscard]] std::string CreateHash(const std::string &S);
+		[[nodiscard]] std::string Hash() const { return MyHash_; };
+		[[nodiscard]] std::string ServiceType() const { return DAEMON_APP_NAME; };
+		[[nodiscard]] std::string PrivateEndPoint() const { return MyPrivateEndPoint_; };
+		[[nodiscard]] std::string PublicEndPoint() const { return MyPublicEndPoint_; };
+		[[nodiscard]] std::string MakeSystemEventMessage( const std::string & Type ) const ;
+		inline uint64_t DaemonBusTimer() const { return DAEMON_BUS_TIMER; };
+
+		void BusMessageReceived( const std::string & Key, const std::string & Message);
+		[[nodiscard]] MicroServiceMetaVec GetServices(const std::string & type);
+		[[nodiscard]] MicroServiceMetaVec GetServices();
+		[[nodiscard]] bool IsValidAPIKEY(const Poco::Net::HTTPServerRequest &Request);
+
+		void SavePID();
+		inline uint64_t GetPID() { return Poco::Process::id(); };
+		[[nodiscard]] inline const std::string GetPublicAPIEndPoint() const { return MyPublicEndPoint_ + "/api/v1"; };
+		[[nodiscard]] inline const std::string & GetUIURI() const { return UIURI_;};
+
+	  private:
+		bool                        HelpRequested_ = false;
+		std::string                 LogDir_;
+		std::string                 ConfigFileName_;
+		Poco::UUIDGenerator         UUIDGenerator_;
+		uint64_t                    ID_ = 1;
+		Poco::SharedPtr<Poco::Crypto::RSAKey>	AppKey_ = nullptr;
+		bool                        DebugMode_ = false;
+		std::string 				DataDir_;
+		Types::SubSystemVec			SubSystems_;
+		Poco::Crypto::CipherFactory & CipherFactory_ = Poco::Crypto::CipherFactory::defaultFactory();
+		Poco::Crypto::Cipher        * Cipher_ = nullptr;
+		Poco::SHA2Engine			SHA2_;
+		MicroServiceMetaMap			Services_;
+		std::string 				MyHash_;
+		std::string 				MyPrivateEndPoint_;
+		std::string 				MyPublicEndPoint_;
+		std::string                 UIURI_;
+		std::string 				Version_;
+		BusEventManager				BusEventManager_;
+		SubMutex 					InfraMutex_;
+
+		std::string DAEMON_PROPERTIES_FILENAME;
+		std::string DAEMON_ROOT_ENV_VAR;
+		std::string DAEMON_CONFIG_ENV_VAR;
+		std::string DAEMON_APP_NAME;
+		uint64_t 	DAEMON_BUS_TIMER;
+	};
+}
+
+#endif // UCENTRALGW_MICROSERVICE_H
--- a/src/NewCommandHandler.cpp
+++ b/src/NewCommandHandler.cpp
@@ -1,86 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-21.
-//
-
-#include "NewCommandHandler.h"
-#include "StorageService.h"
-
-namespace OpenWifi {
-
-    void NewCommandHandler::run() {
-        Running_ = true ;
-        while(Running_) {
-            Poco::Thread::trySleep(2000);
-
-            if(!Running_)
-                break;
-
-            while(!NewCommands_.empty()) {
-                if(!Running_)
-                    break;
-
-                Types::StringPair  S;
-                {
-                    std::lock_guard G(Mutex_);
-                    S = NewCommands_.front();
-                    NewCommands_.pop();
-                }
-
-                try {
-                    auto SerialNumber = S.first;
-                    auto M = nlohmann::json::parse(S.second);
-
-                    std::string EndPoint;
-
-                    if(M.contains(uCentralProtocol::SYSTEM)) {
-                        auto SystemObj = M[uCentralProtocol::SYSTEM];
-                        if(SystemObj.contains(uCentralProtocol::HOST))
-                            EndPoint = SystemObj[uCentralProtocol::HOST];
-                    }
-
-                    if(M.contains(uCentralProtocol::PAYLOAD)) {
-                        auto PayloadSection = M[uCentralProtocol::PAYLOAD];
-                        if(PayloadSection.contains("command")) {
-                            auto Command = PayloadSection["command"];
-                            if(Command=="delete_device") {
-                                auto pSerialNumber = PayloadSection["payload"]["serialNumber"];
-                                if(pSerialNumber==SerialNumber) {
-                                    Logger().debug(Poco::format("Removing device '%s' from upgrade history.",SerialNumber));
-                                    StorageService()->HistoryDB().DeleteHistory(SerialNumber);
-                                    Logger().debug(Poco::format("Removing device '%s' from device table.",SerialNumber));
-                                    StorageService()->DevicesDB().DeleteDevice(SerialNumber);
-                                }
-                            }
-                        }
-                    }
-                } catch (const Poco::Exception &E) {
-                    Logger().log(E);
-                }
-            }
-        }
-    };
-
-    int NewCommandHandler::Start() {
-        Types::TopicNotifyFunction F = [this](std::string s1,std::string s2) { this->CommandReceived(s1,s2); };
-        WatcherId_ = KafkaManager()->RegisterTopicWatcher(KafkaTopics::COMMAND, F);
-        Worker_.start(*this);
-        return 0;
-    };
-
-    void NewCommandHandler::Stop() {
-        KafkaManager()->UnregisterTopicWatcher(KafkaTopics::COMMAND, WatcherId_);
-        Running_ = false;
-        Worker_.wakeUp();
-        Worker_.join();
-    };
-
-    bool NewCommandHandler::Update() {
-        Worker_.wakeUp();
-        return true;
-    }
-
-    void NewCommandHandler::CommandReceived( const std::string & Key, const std::string & Message) {
-        std::lock_guard G(Mutex_);
-        NewCommands_.push(std::make_pair(Key,Message));
-    }
-}
--- a/src/NewCommandHandler.h
+++ b/src/NewCommandHandler.h
@@ -1,41 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-21.
-//
-
-#ifndef OWFMS_NEWCOMMANDHANDLER_H
-#define OWFMS_NEWCOMMANDHANDLER_H
-
-#include "framework/MicroService.h"
-#include "framework/OpenWifiTypes.h"
-
-namespace OpenWifi {
-
-    class NewCommandHandler : public SubSystemServer, Poco::Runnable {
-    public:
-        static auto instance() {
-            static auto instance_ = new NewCommandHandler;
-            return instance_;
-        }
-
-        void run() override;
-        int Start() override;
-        void Stop() override;
-        bool Update();
-        void CommandReceived( const std::string & Key, const std::string & Message);
-
-    private:
-        Poco::Thread                Worker_;
-        std::atomic_bool            Running_ = false;
-        int                         WatcherId_=0;
-        Types::StringPairQueue      NewCommands_;
-
-        NewCommandHandler() noexcept:
-            SubSystemServer("NewCommandHandler", "NEWCOM-MGR", "commanmdhandler") {
-        }
-
-    };
-    inline auto NewCommandHandler() { return NewCommandHandler::instance(); };
-
-}
-
-#endif //OWFMS_NEWCOMMANDHANDLER_H
--- a/src/NewConnectionHandler.cpp
+++ b/src/NewConnectionHandler.cpp
@@ -3,23 +3,24 @@
 //

 #include "NewConnectionHandler.h"
-#include "framework/KafkaTopics.h"
-#include "framework/OpenWifiTypes.h"
+#include "Kafka_topics.h"
+#include "KafkaManager.h"
+#include "OpenWifiTypes.h"
 #include "Poco/JSON/Object.h"
 #include "Poco/JSON/Parser.h"
 #include "StorageService.h"
 #include "LatestFirmwareCache.h"
-#include "framework/uCentral_Protocol.h"
+#include "Utils.h"
+#include "uCentralProtocol.h"
 #include "DeviceCache.h"
-#include "AutoUpdater.h"

 /*
 { "system" : { "id" : 6715803232063 , "host" : "https://localhost:17002" } ,
 "payload" : "{"capabilities":{"compatible":"linksys_ea8300","model":"Linksys EA8300 (Dallas)","network":{"lan":["eth0"],"wan":["eth1"]},"platform":"ap","switch":{"switch0":{"enable":true,"ports":[{"device":"eth0","need_tag":false,"num":0,"want_untag":true},{"num":1,"role":"lan"},{"num":2,"role":"lan"},{"num":3,"role":"lan"},{"num":4,"role":"lan"}],"reset":true,"roles":[{"device":"eth0","ports":"1 2 3 4 0","role":"lan"}]}},"wifi":{"platform/soc/a000000.wifi":{"band":["2G"],"channels":[1,2,3,4,5,6,7,8,9,10,11],"frequencies":[2412,2417,2422,2427,2432,2437,2442,2447,2452,2457,2462],"ht_capa":6639,"htmode":["HT20","HT40","VHT20","VHT40","VHT80"],"rx_ant":3,"tx_ant":3,"vht_capa":865687986},"platform/soc/a800000.wifi":{"band":["5G"],"channels":[36,40,44,48,52,56,60,64],"frequencies":[5180,5200,5220,5240,5260,5280,5300,5320],"ht_capa":6639,"htmode":["HT20","HT40","VHT20","VHT40","VHT80"],"rx_ant":3,"tx_ant":3,"vht_capa":865687986},"soc/40000000.pci/pci0000:00/0000:00:00.0/0000:01:00.0":{"band":["5G"],"channels":[100,104,108,112,116,120,124,128,132,136,140,144,149,153,157,161,165],"frequencies":[5500,5520,5540,5560,5580,5600,5620,5640,5660,5680,5700,5720,5745,5765,5785,5805,5825],"ht_capa":6639,"htmode":["HT20","HT40","VHT20","VHT40","VHT80"],"rx_ant":3,"tx_ant":3,"vht_capa":865696178}}},"firmware":"OpenWrt 21.02-SNAPSHOT r16011+53-6fd65c6573 / TIP-devel-0825cb93","serial":"24f5a207a130","uuid":1623866223}}
 */

-
 namespace OpenWifi {
+    class NewConnectionHandler *NewConnectionHandler::instance_ = nullptr;

    void NewConnectionHandler::run() {
        Running_ = true ;
@@ -35,80 +36,63 @@ namespace OpenWifi {

                Types::StringPair  S;
                {
-                    std::lock_guard G(Mutex_);
+                    SubMutexGuard G(Mutex_);
                    S = NewConnections_.front();
                    NewConnections_.pop();
                }
+                auto SerialNumber = S.first;
+                Poco::JSON::Parser  Parser;
+                auto Object = Parser.parse(S.second).extract<Poco::JSON::Object::Ptr>();

-                try {
-                    auto SerialNumber = S.first;
-                    Poco::JSON::Parser  Parser;
-                    auto Object = Parser.parse(S.second).extract<Poco::JSON::Object::Ptr>();
+                std::string EndPoint;

-                    std::string EndPoint;
+                if(Object->has(uCentralProtocol::SYSTEM)) {
+                    auto SystemObj = Object->getObject(uCentralProtocol::SYSTEM);
+                    if(SystemObj->has(uCentralProtocol::HOST))
+                        EndPoint = SystemObj->get(uCentralProtocol::HOST).toString();
+                }

-                    if(Object->has(uCentralProtocol::SYSTEM)) {
-                        auto SystemObj = Object->getObject(uCentralProtocol::SYSTEM);
-                        if(SystemObj->has(uCentralProtocol::HOST))
-                            EndPoint = SystemObj->get(uCentralProtocol::HOST).toString();
-                    }
-
-                    if(Object->has(uCentralProtocol::PAYLOAD)) {
-                        auto PayloadObj = Object->getObject(uCentralProtocol::PAYLOAD);
-                        if(PayloadObj->has(uCentralProtocol::CAPABILITIES)) {
-                            // std::cout << "CAPABILITIES:" << SerialNumber << std::endl;
-                            auto CapObj = PayloadObj->getObject(uCentralProtocol::CAPABILITIES);
-                            if(CapObj->has(uCentralProtocol::COMPATIBLE)) {
-                                auto DeviceType = CapObj->get(uCentralProtocol::COMPATIBLE).toString();
-                                auto Serial = PayloadObj->get(uCentralProtocol::SERIAL).toString();
-                                auto Revision = Storage::TrimRevision(PayloadObj->get(uCentralProtocol::FIRMWARE).toString());
-                                // std::cout << "ConnectionEvent: SerialNumber: " << SerialNumber << " DeviceType: " << DeviceType << " Revision:" << Revision << std::endl;
-                                FMSObjects::FirmwareAgeDetails  FA;
-                                if(StorageService()->FirmwaresDB().ComputeFirmwareAge(DeviceType, Revision, FA)) {
-                                    StorageService()->DevicesDB().SetDeviceRevision(SerialNumber, Revision, DeviceType, EndPoint);
-                                    if(FA.age)
-                                        Logger().information(Poco::format("Device %s connection. Firmware is %s older than latest.",SerialNumber, Utils::SecondsToNiceText(FA.age)));
-                                    else
-                                        Logger().information(Poco::format("Device %s connection. Device firmware is up to date.",SerialNumber));
-                                }
-                                else {
-                                    Logger().information(Poco::format("Device %s connection. Firmware age cannot be determined",SerialNumber));
-                                }
-
-                                if(!LatestFirmwareCache()->IsLatest(DeviceType, Revision)) {
-                                    // std::cout << "Device (connection): " << SerialNumber << " to be upgraded ... " << std::endl;
-                                    AutoUpdater()->ToBeUpgraded(SerialNumber, DeviceType);
-                                }
-                                DeviceCache()->AddToCache(Serial, DeviceType, EndPoint, Revision);
+                if(Object->has(uCentralProtocol::PAYLOAD)) {
+                    auto PayloadObj = Object->getObject(uCentralProtocol::PAYLOAD);
+                    if(PayloadObj->has(uCentralProtocol::CAPABILITIES)) {
+                        // std::cout << "CAPABILITIES:" << SerialNumber << std::endl;
+                        auto CapObj = PayloadObj->getObject(uCentralProtocol::CAPABILITIES);
+                        if(CapObj->has(uCentralProtocol::COMPATIBLE)) {
+                            auto DeviceType = CapObj->get(uCentralProtocol::COMPATIBLE).toString();
+                            auto Serial = PayloadObj->get(uCentralProtocol::SERIAL).toString();
+                            auto Revision = Storage::TrimRevision(PayloadObj->get(uCentralProtocol::FIRMWARE).toString());
+                            // std::cout << "ConnectionEvent: SerialNumber: " << SerialNumber << " DeviceType: " << DeviceType << " Revision:" << Revision << std::endl;
+                            FMSObjects::FirmwareAgeDetails  FA;
+                            if(Storage()->ComputeFirmwareAge(DeviceType, Revision, FA)) {
+                                Storage()->SetDeviceRevision(SerialNumber, Revision, DeviceType, EndPoint);
+                                if(FA.age)
+                                    Logger_.information(Poco::format("Device %s connection. Firmware is %s older than latest",SerialNumber, Utils::SecondsToNiceText(FA.age)));
+                                else
+                                    Logger_.information(Poco::format("Device %s connection. Firmware age cannot be determined",SerialNumber));
                            }
-                        } else if(PayloadObj->has(uCentralProtocol::DISCONNECTION)) {
-                            auto DisconnectMessage = PayloadObj->getObject(uCentralProtocol::DISCONNECTION);
-                            if(DisconnectMessage->has(uCentralProtocol::SERIALNUMBER) && DisconnectMessage->has(uCentralProtocol::TIMESTAMP)) {
-                                auto SNum = DisconnectMessage->get(uCentralProtocol::SERIALNUMBER).toString();
-                                auto Timestamp = DisconnectMessage->get(uCentralProtocol::TIMESTAMP);
-                                StorageService()->DevicesDB().SetDeviceDisconnected(SNum,EndPoint);
-                                // std::cout << "DISCONNECTION:" << SerialNumber << std::endl;
-                            }
-                        } else if(PayloadObj->has(uCentralProtocol::PING)) {
-                            // std::cout << "PING:" << SerialNumber << std::endl;
-                            auto PingMessage = PayloadObj->getObject(uCentralProtocol::PING);
-                            if( PingMessage->has(uCentralProtocol::FIRMWARE) &&
+                            DeviceCache()->AddToCache(Serial, DeviceType, EndPoint, Revision);
+                        }
+                    } else if(PayloadObj->has(uCentralProtocol::DISCONNECTION)) {
+                        auto DisconnectMessage = PayloadObj->getObject(uCentralProtocol::DISCONNECTION);
+                        if(DisconnectMessage->has(uCentralProtocol::SERIALNUMBER) && DisconnectMessage->has(uCentralProtocol::TIMESTAMP)) {
+                            auto SNum = DisconnectMessage->get(uCentralProtocol::SERIALNUMBER).toString();
+                            auto Timestamp = DisconnectMessage->get(uCentralProtocol::TIMESTAMP);
+                            Storage()->SetDeviceDisconnected(SNum,EndPoint);
+                            // std::cout << "DISCONNECTION:" << SerialNumber << std::endl;
+                        }
+                    } else if(PayloadObj->has(uCentralProtocol::PING)) {
+                        // std::cout << "PING:" << SerialNumber << std::endl;
+                        auto PingMessage = PayloadObj->getObject(uCentralProtocol::PING);
+                        if( PingMessage->has(uCentralProtocol::FIRMWARE) &&
                            PingMessage->has(uCentralProtocol::SERIALNUMBER) &&
                            PingMessage->has(uCentralProtocol::COMPATIBLE)) {
-                                auto Revision = Storage::TrimRevision(PingMessage->get(uCentralProtocol::FIRMWARE).toString());
-                                auto Serial = PingMessage->get( uCentralProtocol::SERIALNUMBER).toString();
-                                auto DeviceType = PingMessage->get( uCentralProtocol::COMPATIBLE).toString();
-                                StorageService()->DevicesDB().SetDeviceRevision(Serial, Revision, DeviceType, EndPoint);
-                                DeviceCache()->AddToCache(Serial, DeviceType, EndPoint, Revision);
-                                if(!LatestFirmwareCache()->IsLatest(DeviceType, Revision)) {
-                                    // std::cout << "Device(ping): " << SerialNumber << " to be upgraded ... " << std::endl;
-                                    AutoUpdater()->ToBeUpgraded(SerialNumber, DeviceType);
-                                }
-                            }
+                            auto Revision = Storage::TrimRevision(PingMessage->get(uCentralProtocol::FIRMWARE).toString());
+                            auto Serial = PingMessage->get( uCentralProtocol::SERIALNUMBER).toString();
+                            auto DeviceType = PingMessage->get( uCentralProtocol::COMPATIBLE).toString();
+                            Storage()->SetDeviceRevision(Serial, Revision, DeviceType, EndPoint);
+                            DeviceCache()->AddToCache(Serial, DeviceType, EndPoint, Revision);
                        }
                    }
-                } catch (const Poco::Exception &E) {
-                    Logger().log(E);
                }
            }
        }
@@ -134,7 +118,7 @@ namespace OpenWifi {
    }

    void NewConnectionHandler::ConnectionReceived( const std::string & Key, const std::string & Message) {
-        std::lock_guard G(Mutex_);
+        SubMutexGuard G(Mutex_);
        NewConnections_.push(std::make_pair(Key,Message));
    }
 }
--- a/src/NewConnectionHandler.h
+++ b/src/NewConnectionHandler.h
@@ -6,16 +6,18 @@
 #define UCENTRALFMS_NEWCONNECTIONHANDLER_H


-#include "framework/MicroService.h"
-#include "framework/OpenWifiTypes.h"
+#include "SubSystemServer.h"
+#include "OpenWifiTypes.h"

 namespace OpenWifi {

    class NewConnectionHandler : public SubSystemServer, Poco::Runnable {
    public:

-        static auto instance() {
-            static auto instance_ = new NewConnectionHandler;
+        static NewConnectionHandler *instance() {
+            if (instance_ == nullptr) {
+                instance_ = new NewConnectionHandler;
+            }
            return instance_;
        }

@@ -27,6 +29,7 @@ namespace OpenWifi {
        void ConnectionReceived( const std::string & Key, const std::string & Message);

    private:
+        static NewConnectionHandler      *instance_;
        Poco::Thread                Worker_;
        std::atomic_bool            Running_ = false;
        int                         ConnectionWatcherId_=0;
@@ -38,7 +41,7 @@ namespace OpenWifi {
        }

    };
-    inline auto NewConnectionHandler() { return NewConnectionHandler::instance(); };
+    inline NewConnectionHandler * NewConnectionHandler() { return NewConnectionHandler::instance(); };
 }

 #endif //UCENTRALFMS_NEWCONNECTIONHANDLER_H
--- a/src/OpenAPIRequest.cpp
+++ b/src/OpenAPIRequest.cpp
@@ -0,0 +1,68 @@
+//
+// Created by stephane bourque on 2021-07-01.
+//
+#include <iostream>
+
+#include "OpenAPIRequest.h"
+
+#include "Poco/Net/HTTPSClientSession.h"
+#include <Poco/Net/HTTPClientSession.h>
+#include <Poco/Net/HTTPRequest.h>
+#include <Poco/Net/HTTPResponse.h>
+#include <Poco/StreamCopier.h>
+#include <Poco/JSON/Parser.h>
+#include <Poco/Path.h>
+#include <Poco/URI.h>
+#include <Poco/Exception.h>
+#include "Utils.h"
+#include "Daemon.h"
+
+namespace OpenWifi {
+
+	OpenAPIRequestGet::OpenAPIRequestGet( 	const std::string & ServiceType,
+											const std::string & EndPoint,
+									 		Types::StringPairVec & QueryData,
+											uint64_t msTimeout):
+ 		Type_(ServiceType),
+ 		EndPoint_(EndPoint),
+		QueryData_(QueryData),
+		msTimeout_(msTimeout) {
+
+	}
+
+	int OpenAPIRequestGet::Do(Poco::JSON::Object::Ptr &ResponseObject) {
+		try {
+		    auto Services = Daemon()->GetServices(Type_);
+			for(auto const &Svc:Services) {
+				Poco::URI	URI(Svc.PrivateEndPoint);
+				Poco::Net::HTTPSClientSession Session(URI.getHost(), URI.getPort());
+
+				URI.setPath(EndPoint_);
+				for (const auto &qp : QueryData_)
+					URI.addQueryParameter(qp.first, qp.second);
+
+				std::string Path(URI.getPathAndQuery());
+				Session.setTimeout(Poco::Timespan(msTimeout_/1000, msTimeout_ % 1000));
+
+				Poco::Net::HTTPRequest Request(Poco::Net::HTTPRequest::HTTP_GET,
+											   Path,
+											   Poco::Net::HTTPMessage::HTTP_1_1);
+				Request.add("X-API-KEY", Svc.AccessKey);
+				Session.sendRequest(Request);
+
+				Poco::Net::HTTPResponse Response;
+				std::istream &is = Session.receiveResponse(Response);
+				if(Response.getStatus()==Poco::Net::HTTPResponse::HTTP_OK) {
+					Poco::JSON::Parser	P;
+					ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
+				}
+				return Response.getStatus();
+			}
+		}
+		catch (const Poco::Exception &E)
+		{
+			std::cerr << E.displayText() << std::endl;
+		}
+		return -1;
+	}
+}
--- a/src/OpenAPIRequest.h
+++ b/src/OpenAPIRequest.h
@@ -0,0 +1,29 @@
+//
+// Created by stephane bourque on 2021-07-01.
+//
+
+#ifndef UCENTRALGW_OPENAPIREQUEST_H
+#define UCENTRALGW_OPENAPIREQUEST_H
+
+#include "Poco/JSON/Object.h"
+
+#include "OpenWifiTypes.h"
+
+namespace OpenWifi {
+
+	class OpenAPIRequestGet {
+	  public:
+		explicit OpenAPIRequestGet( const std::string & Type,
+								   	const std::string & EndPoint,
+									Types::StringPairVec & QueryData,
+									uint64_t msTimeout);
+		int Do(Poco::JSON::Object::Ptr &ResponseObject);
+	  private:
+		std::string 			Type_;
+		std::string 			EndPoint_;
+		Types::StringPairVec 	QueryData_;
+		uint64_t 				msTimeout_;
+	};
+}
+
+#endif // UCENTRALGW_OPENAPIREQUEST_H
--- a/src/OpenWifiTypes.h
+++ b/src/OpenWifiTypes.h
@@ -0,0 +1,68 @@
+//
+// Created by stephane bourque on 2021-06-13.
+//
+
+#ifndef UCENTRALGW_UCENTRALTYPES_H
+#define UCENTRALGW_UCENTRALTYPES_H
+
+#include "SubSystemServer.h"
+
+#include <vector>
+#include <string>
+#include <map>
+#include <functional>
+#include <list>
+#include <utility>
+#include <queue>
+
+#include "Poco/StringTokenizer.h"
+
+namespace OpenWifi::Types {
+    typedef std::pair<std::string,std::string>              StringPair;
+	typedef std::vector<StringPair>	                        StringPairVec;
+    typedef std::queue<StringPair>	                        StringPairQueue;
+	typedef std::vector<std::string>						StringVec;
+	typedef std::set<std::string>                           StringSet;
+	typedef std::vector<SubSystemServer*>					SubSystemVec;
+	typedef std::map<std::string,std::set<std::string>>		StringMapStringSet;
+	typedef std::function<void(std::string, std::string)>   TopicNotifyFunction;
+	typedef std::list<std::pair<TopicNotifyFunction,int>>   TopicNotifyFunctionList;
+	typedef std::map<std::string, TopicNotifyFunctionList>  NotifyTable;
+    typedef std::map<std::string,uint64_t>                  CountedMap;
+
+    typedef std::string         UUID_t;
+    typedef std::vector<UUID_t> UUIDvec_t;
+
+    inline void UpdateCountedMap(CountedMap &M, const std::string &S, uint64_t Increment=1) {
+        auto it = M.find(S);
+        if(it==M.end())
+            M[S] = Increment;
+        else
+            it->second += Increment;
+    }
+
+    inline std::string to_string( const StringVec &V) {
+        std::string Result;
+
+        bool first=true;
+        for(const auto &i:V) {
+            if(first) {
+                Result += i;
+                first = false;
+            } else {
+                Result += ",";
+                Result += i;
+            }
+        }
+        return Result;
+    }
+
+    inline void from_string(const std::string &S, StringVec &V) {
+        Poco::StringTokenizer   Tokens(S,",",Poco::StringTokenizer::TOK_TRIM | Poco::StringTokenizer::TOK_IGNORE_EMPTY);
+
+        for(auto const &i:Tokens)
+            V.emplace_back(i);
+    }
+};
+
+#endif // UCENTRALGW_UCENTRALTYPES_H
--- a/src/RESTAPI/RESTAPI_Routers.cpp
+++ b/src/RESTAPI/RESTAPI_Routers.cpp
@@ -1,41 +0,0 @@
-//
-// Created by stephane bourque on 2021-10-23.
-//
-
-#include "framework/MicroService.h"
-
-#include "RESTAPI/RESTAPI_firmwareHandler.h"
-#include "RESTAPI/RESTAPI_firmwaresHandler.h"
-#include "RESTAPI/RESTAPI_firmwareAgeHandler.h"
-#include "RESTAPI/RESTAPI_connectedDeviceHandler.h"
-#include "RESTAPI/RESTAPI_connectedDevicesHandler.h"
-#include "RESTAPI/RESTAPI_historyHandler.h"
-#include "RESTAPI/RESTAPI_deviceReportHandler.h"
-
-namespace OpenWifi {
-
-    Poco::Net::HTTPRequestHandler * RESTAPI_ExtRouter(const char *Path, RESTAPIHandler::BindingMap &Bindings,
-                                                            Poco::Logger & L, RESTAPI_GenericServer & S, uint64_t TransactionId) {
-        return  RESTAPI_Router<
-            RESTAPI_firmwaresHandler,
-            RESTAPI_firmwareHandler,
-            RESTAPI_system_command,
-            RESTAPI_firmwareAgeHandler,
-            RESTAPI_connectedDevicesHandler,
-            RESTAPI_connectedDeviceHandler,
-            RESTAPI_historyHandler,
-            RESTAPI_deviceReportHandler
-            >(Path,Bindings,L, S, TransactionId);
-    }
-
-    Poco::Net::HTTPRequestHandler * RESTAPI_IntRouter(const char *Path, RESTAPIHandler::BindingMap &Bindings,
-                                                            Poco::Logger & L, RESTAPI_GenericServer & S, uint64_t TransactionId) {
-        return RESTAPI_Router_I<
-            RESTAPI_firmwaresHandler,
-            RESTAPI_firmwareHandler,
-            RESTAPI_system_command,
-            RESTAPI_connectedDevicesHandler,
-            RESTAPI_connectedDeviceHandler
-            >(Path, Bindings, L, S, TransactionId);
-    }
-}
--- a/src/RESTAPI/RESTAPI_connectedDeviceHandler.cpp
+++ b/src/RESTAPI/RESTAPI_connectedDeviceHandler.cpp
@@ -1,28 +0,0 @@
-//
-// Created by stephane bourque on 2021-07-18.
-//
-
-#include "RESTAPI_connectedDeviceHandler.h"
-#include "RESTObjects/RESTAPI_FMSObjects.h"
-#include "StorageService.h"
-#include "framework/RESTAPI_protocol.h"
-#include "framework/RESTAPI_errors.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_connectedDeviceHandler::DoGet() {
-        auto SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER,"");
-
-        if(SerialNumber.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingSerialNumber);
-        }
-
-        FMSObjects::DeviceConnectionInformation DevInfo;
-        if(StorageService()->DevicesDB().GetDevice(SerialNumber, DevInfo)) {
-            Poco::JSON::Object  Answer;
-            DevInfo.to_json(Answer);
-            return ReturnObject(Answer);
-        }
-        NotFound();
-    }
-}
--- a/src/RESTAPI/RESTAPI_connectedDevicesHandler.cpp
+++ b/src/RESTAPI/RESTAPI_connectedDevicesHandler.cpp
@@ -1,30 +0,0 @@
-//
-// Created by stephane bourque on 2021-07-18.
-//
-
-#include "Poco/JSON/Object.h"
-#include "Poco/JSON/Array.h"
-
-#include "RESTAPI_connectedDevicesHandler.h"
-#include "RESTObjects/RESTAPI_FMSObjects.h"
-#include "StorageService.h"
-#include "framework/RESTAPI_protocol.h"
-
-namespace OpenWifi {
-    void RESTAPI_connectedDevicesHandler::DoGet() {
-        std::vector<FMSObjects::DeviceConnectionInformation> Devices;
-        Poco::JSON::Object AnswerObj;
-        Poco::JSON::Array AnswerArr;
-        if (StorageService()->DevicesDB().GetDevices(QB_.Offset, QB_.Limit, Devices)) {
-            for (const auto &i:Devices) {
-                Poco::JSON::Object Obj;
-                i.to_json(Obj);
-                AnswerArr.add(Obj);
-            }
-            AnswerObj.set(RESTAPI::Protocol::DEVICES, AnswerArr);
-            return ReturnObject(AnswerObj);
-        }
-        AnswerObj.set(RESTAPI::Protocol::DEVICES, AnswerArr);
-        ReturnObject(AnswerObj);
-    }
-}
--- a/src/RESTAPI/RESTAPI_deviceReportHandler.cpp
+++ b/src/RESTAPI/RESTAPI_deviceReportHandler.cpp
@@ -1,18 +0,0 @@
-//
-// Created by stephane bourque on 2021-07-19.
-//
-
-#include "RESTAPI_deviceReportHandler.h"
-#include "StorageService.h"
-#include "RESTObjects/RESTAPI_FMSObjects.h"
-#include "Poco/JSON/Object.h"
-#include "Daemon.h"
-
-namespace OpenWifi {
-    void RESTAPI_deviceReportHandler::DoGet() {
-        Daemon()->CreateDashboard();
-        Poco::JSON::Object  O;
-        Daemon()->GetDashboard().to_json(O);
-        ReturnObject(O);
-    }
-}
--- a/src/RESTAPI/RESTAPI_firmwareAgeHandler.cpp
+++ b/src/RESTAPI/RESTAPI_firmwareAgeHandler.cpp
@@ -1,62 +0,0 @@
-//
-// Created by stephane bourque on 2021-07-16.
-//
-
-#include "RESTAPI_firmwareAgeHandler.h"
-
-#include "StorageService.h"
-#include "Poco/JSON/Parser.h"
-#include "DeviceCache.h"
-#include "framework/uCentral_Protocol.h"
-#include "framework/RESTAPI_protocol.h"
-#include "framework/RESTAPI_errors.h"
-
-
-namespace OpenWifi {
-    void RESTAPI_firmwareAgeHandler::DoGet() {
-        if (!QB_.Select.empty()) {
-            Poco::JSON::Array Objects;
-            for (auto &i : SelectedRecords()) {
-                DeviceCacheEntry E;
-                if (DeviceCache()->GetDevice(i, E)) {
-                    FMSObjects::FirmwareAgeDetails FA;
-                    if(StorageService()->FirmwaresDB().ComputeFirmwareAge(E.deviceType,E.revision,FA)) {
-                        Poco::JSON::Object  O;
-                        FA.to_json(O);
-                        O.set(uCentralProtocol::SERIALNUMBER,i);
-                        Objects.add(O);
-                    } else {
-                        Poco::JSON::Object  O;
-                        O.set(uCentralProtocol::SERIALNUMBER,i);
-                        Objects.add(O);
-                    }
-                } else {
-                    Poco::JSON::Object  O;
-                    O.set(uCentralProtocol::SERIALNUMBER,i);
-                    Objects.add(O);
-                }
-            }
-            Poco::JSON::Object Answer;
-            Answer.set(RESTAPI::Protocol::AGES, Objects);
-            return ReturnObject(Answer);
-        } else {
-            auto DeviceType = GetParameter(RESTAPI::Protocol::DEVICETYPE, "");
-            auto Revision = GetParameter(RESTAPI::Protocol::REVISION, "");
-
-            if (DeviceType.empty() || Revision.empty()) {
-                return BadRequest(RESTAPI::Errors::BothDeviceTypeRevision);
-            }
-
-            Revision = Storage::TrimRevision(Revision);
-
-            FMSObjects::FirmwareAgeDetails FA;
-            if (StorageService()->FirmwaresDB().ComputeFirmwareAge(DeviceType, Revision, FA)) {
-                Poco::JSON::Object Answer;
-
-                FA.to_json(Answer);
-                return ReturnObject(Answer);
-            }
-            NotFound();
-        }
-    }
-}
--- a/src/RESTAPI/RESTAPI_firmwareHandler.cpp
+++ b/src/RESTAPI/RESTAPI_firmwareHandler.cpp
@@ -1,95 +0,0 @@
-//
-// Created by stephane bourque on 2021-05-09.
-//
-
-#include "Poco/JSON/Parser.h"
-
-#include "RESTAPI_firmwareHandler.h"
-#include "StorageService.h"
-#include "framework/uCentral_Protocol.h"
-#include "framework/RESTAPI_protocol.h"
-#include "framework/RESTAPI_errors.h"
-
-namespace OpenWifi {
-    void
-    RESTAPI_firmwareHandler::DoPost() {
-        auto Obj = ParseStream();
-        FMSObjects::Firmware F;
-        if (!F.from_json(Obj)) {
-            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-        }
-        F.id = MicroService::instance().CreateUUID();
-        if(StorageService()->FirmwaresDB().AddFirmware(F)) {
-            Poco::JSON::Object  Answer;
-            F.to_json(Answer);
-            return ReturnObject(Answer);
-        }
-        BadRequest(RESTAPI::Errors::RecordNotCreated);
-    }
-
-    void
-    RESTAPI_firmwareHandler::DoGet() {
-        auto UUID = GetBinding(uCentralProtocol::ID, "");
-
-        if(UUID.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingUUID);
-        }
-
-        FMSObjects::Firmware F;
-        if (StorageService()->FirmwaresDB().GetFirmware(UUID, F)) {
-            Poco::JSON::Object Object;
-            F.to_json(Object);
-            return ReturnObject(Object);
-        }
-        NotFound();
-    }
-
-    void
-    RESTAPI_firmwareHandler::DoDelete() {
-        auto UUID = GetBinding(uCentralProtocol::ID, "");
-        if(UUID.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingUUID);
-        }
-
-        if (StorageService()->FirmwaresDB().DeleteFirmware(UUID)) {
-            return OK();
-        }
-        BadRequest(RESTAPI::Errors::CouldNotBeDeleted);
-    }
-
-    void RESTAPI_firmwareHandler::DoPut() {
-        auto UUID = GetBinding(uCentralProtocol::ID, "");
-        if(UUID.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingUUID);
-        }
-
-        FMSObjects::Firmware    F;
-        if(!StorageService()->FirmwaresDB().GetFirmware(UUID, F)) {
-            return NotFound();
-        }
-
-        auto Obj = ParseStream();
-        FMSObjects::Firmware    NewFirmware;
-        if(!NewFirmware.from_json(Obj)) {
-            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-        }
-
-        if(Obj->has(RESTAPI::Protocol::DESCRIPTION))
-            F.description = Obj->get(RESTAPI::Protocol::DESCRIPTION).toString();
-        if(Obj->has(RESTAPI::Protocol::NOTES)) {
-            SecurityObjects::NoteInfoVec NIV;
-            NIV = RESTAPI_utils::to_object_array<SecurityObjects::NoteInfo>(Obj->get(RESTAPI::Protocol::NOTES).toString());
-            for(auto const &i:NIV) {
-                SecurityObjects::NoteInfo   ii{.created=(uint64_t)std::time(nullptr), .createdBy=UserInfo_.userinfo.email, .note=i.note};
-                F.notes.push_back(ii);
-            }
-        }
-
-        if(StorageService()->FirmwaresDB().UpdateFirmware(UUID, F)) {
-            Poco::JSON::Object  Answer;
-            F.to_json(Answer);
-            return ReturnObject(Answer);
-        }
-        BadRequest(RESTAPI::Errors::RecordNotUpdated);
-    }
-}
--- a/src/RESTAPI/RESTAPI_firmwaresHandler.cpp
+++ b/src/RESTAPI/RESTAPI_firmwaresHandler.cpp
@@ -1,95 +0,0 @@
-//
-// Created by stephane bourque on 2021-05-09.
-//
-
-#include "RESTAPI_firmwaresHandler.h"
-#include "StorageService.h"
-#include "LatestFirmwareCache.h"
-#include "framework/RESTAPI_protocol.h"
-
-namespace OpenWifi {
-    void
-    RESTAPI_firmwaresHandler::DoGet() {
-        std::string DeviceType = GetParameter(RESTAPI::Protocol::DEVICETYPE, "");
-        bool IdOnly = GetBoolParameter(RESTAPI::Protocol::IDONLY, false);
-        bool RevisionSet = GetBoolParameter(RESTAPI::Protocol::REVISIONSET, false);
-        bool LatestOnly = GetBoolParameter(RESTAPI::Protocol::LATESTONLY, false);
-        bool DeviceSet = GetBoolParameter(RESTAPI::Protocol::DEVICESET, false);
-
-        if(DeviceSet) {
-            auto Revisions = LatestFirmwareCache()->GetDevices();
-            Poco::JSON::Array ObjectArray;
-            for (const auto &i:Revisions) {
-                ObjectArray.add(i);
-            }
-            Poco::JSON::Object RetObj;
-            RetObj.set(RESTAPI::Protocol::DEVICETYPES, ObjectArray);
-            return ReturnObject(RetObj);
-        }
-
-        if(RevisionSet) {
-            auto Revisions = LatestFirmwareCache()->GetRevisions();
-            Poco::JSON::Array ObjectArray;
-            for (const auto &i:Revisions) {
-                ObjectArray.add(i);
-            }
-            Poco::JSON::Object RetObj;
-            RetObj.set(RESTAPI::Protocol::REVISIONS, ObjectArray);
-            return ReturnObject(RetObj);
-        }
-
-        // special cases: if latestOnly and deviceType
-        if(!DeviceType.empty()) {
-            if(LatestOnly) {
-                LatestFirmwareCacheEntry    Entry;
-                if(!LatestFirmwareCache()->FindLatestFirmware(DeviceType,Entry)) {
-                    return NotFound();
-                }
-
-                FMSObjects::Firmware    F;
-                if(StorageService()->FirmwaresDB().GetFirmware(Entry.Id,F)) {
-                    Poco::JSON::Object  Answer;
-                    F.to_json(Answer);
-                    return ReturnObject(Answer);
-                }
-                return NotFound();
-            } else {
-                std::vector<FMSObjects::Firmware> List;
-                if (StorageService()->FirmwaresDB().GetFirmwares(QB_.Offset, QB_.Limit, DeviceType, List)) {
-                    Poco::JSON::Array ObjectArray;
-                    for (const auto &i:List) {
-                        if(IdOnly) {
-                            ObjectArray.add(i.id);
-                        } else {
-                            Poco::JSON::Object Obj;
-                            i.to_json(Obj);
-                            ObjectArray.add(Obj);
-                        }
-                    }
-                    Poco::JSON::Object RetObj;
-                    RetObj.set(RESTAPI::Protocol::FIRMWARES, ObjectArray);
-                    return ReturnObject(RetObj);
-                } else {
-                    return NotFound();
-                }
-            }
-        }
-
-        std::vector<FMSObjects::Firmware> List;
-        Poco::JSON::Array ObjectArray;
-        Poco::JSON::Object Answer;
-        if (StorageService()->FirmwaresDB().GetFirmwares(QB_.Offset, QB_.Limit, DeviceType, List)) {
-            for (const auto &i:List) {
-                if(IdOnly) {
-                    ObjectArray.add(i.id);
-                } else {
-                    Poco::JSON::Object Obj;
-                    i.to_json(Obj);
-                    ObjectArray.add(Obj);
-                }
-            }
-        }
-        Answer.set(RESTAPI::Protocol::FIRMWARES, ObjectArray);
-        ReturnObject(Answer);
-    }
-}
--- a/src/RESTAPI/RESTAPI_historyHandler.cpp
+++ b/src/RESTAPI/RESTAPI_historyHandler.cpp
@@ -1,46 +0,0 @@
-//
-// Created by stephane bourque on 2021-07-13.
-//
-
-#include "RESTAPI_historyHandler.h"
-#include "StorageService.h"
-#include "framework/RESTAPI_protocol.h"
-#include "framework/RESTAPI_errors.h"
-
-namespace OpenWifi {
-    void
-    RESTAPI_historyHandler::DoGet() {
-        auto SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER, "");
-
-        if(SerialNumber.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingSerialNumber);
-        }
-
-        FMSObjects::RevisionHistoryEntryVec H;
-        if (StorageService()->HistoryDB().GetHistory(SerialNumber, QB_.Offset, QB_.Limit, H)) {
-            Poco::JSON::Array A;
-            for (auto const &i:H) {
-                Poco::JSON::Object O;
-                i.to_json(O);
-                A.add(O);
-            }
-            Poco::JSON::Object Answer;
-            Answer.set(RESTAPI::Protocol::HISTORY, A);
-            return ReturnObject(Answer);
-        }
-        NotFound();
-    }
-
-    void RESTAPI_historyHandler::DoDelete() {
-        auto SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER, "");
-        auto Id = GetParameter(RESTAPI::Protocol::ID, "");
-        if (SerialNumber.empty() || Id.empty()) {
-            return BadRequest(RESTAPI::Errors::IdOrSerialEmpty);
-        }
-
-        if (!StorageService()->HistoryDB().DeleteHistory(SerialNumber, Id)) {
-            return OK();
-        }
-        NotFound();
-    }
-}
--- a/src/RESTObjects/RESTAPI_FMSObjects.cpp
+++ b/src/RESTObjects/RESTAPI_FMSObjects.cpp
@@ -3,7 +3,7 @@
 //

 #include "RESTAPI_FMSObjects.h"
-#include "framework/MicroService.h"
+#include "RESTAPI_utils.h"

 using OpenWifi::RESTAPI_utils::field_to_json;
 using OpenWifi::RESTAPI_utils::field_from_json;
--- a/src/RESTObjects/RESTAPI_FMSObjects.h
+++ b/src/RESTObjects/RESTAPI_FMSObjects.h
@@ -9,7 +9,7 @@


 #include "RESTAPI_SecurityObjects.h"
-#include "framework/OpenWifiTypes.h"
+#include "OpenWifiTypes.h"

 namespace OpenWifi::FMSObjects {

@@ -29,7 +29,7 @@ namespace OpenWifi::FMSObjects {
        std::string     location;
        std::string     uploader;
        std::string     digest;
-        bool            latest=0;
+        bool            latest=false;
        SecurityObjects::NoteInfoVec    notes;
        uint64_t        created=0;

--- a/src/RESTObjects/RESTAPI_GWobjects.cpp
+++ b/src/RESTObjects/RESTAPI_GWobjects.cpp
@@ -12,11 +12,12 @@
 #include "Daemon.h"
 #ifdef	TIP_GATEWAY_SERVICE
 #include "DeviceRegistry.h"
-#include "CapabilitiesCache.h"
 #endif

 #include "RESTAPI_GWobjects.h"
-#include "framework/MicroService.h"
+#include "RESTAPI_handler.h"
+#include "RESTAPI_utils.h"
+#include "Utils.h"

 using OpenWifi::RESTAPI_utils::field_to_json;
 using OpenWifi::RESTAPI_utils::field_from_json;
@@ -27,7 +28,7 @@ namespace OpenWifi::GWObjects {
 	void Device::to_json(Poco::JSON::Object &Obj) const {
 		field_to_json(Obj,"serialNumber", SerialNumber);
 #ifdef TIP_GATEWAY_SERVICE
-		field_to_json(Obj,"deviceType", CapabilitiesCache::instance()->Get(Compatible));
+		field_to_json(Obj,"deviceType", uCentral::Daemon::instance()->IdentifyDevice(Compatible));
 #endif
 		field_to_json(Obj,"macAddress", MACAddress);
 		field_to_json(Obj,"manufacturer", Manufacturer);
@@ -69,7 +70,7 @@ namespace OpenWifi::GWObjects {
 #endif
 	}

-	bool Device::from_json(Poco::JSON::Object::Ptr &Obj) {
+	bool Device::from_json(Poco::JSON::Object::Ptr Obj) {
 		try {
 			field_from_json(Obj,"serialNumber",SerialNumber);
 			field_from_json(Obj,"deviceType",DeviceType);
@@ -146,10 +147,9 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj,"custom", Custom);
 		field_to_json(Obj,"waitingForFile", WaitingForFile);
 		field_to_json(Obj,"attachFile", AttachDate);
-		field_to_json(Obj,"executionTime", executionTime);
 	}

-	bool DefaultConfiguration::from_json(Poco::JSON::Object::Ptr &Obj) {
+	bool DefaultConfiguration::from_json(Poco::JSON::Object::Ptr Obj) {
 		try {
 			field_from_json(Obj,"name",Name);
 			field_from_json(Obj,"configuration",Configuration);
@@ -162,25 +162,14 @@ namespace OpenWifi::GWObjects {
 	}

 	void BlackListedDevice::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj,"serialNumber", serialNumber);
-		field_to_json(Obj,"author", author);
-		field_to_json(Obj,"reason", reason);
-		field_to_json(Obj,"created", created);
-	}
-
-	bool BlackListedDevice::from_json(Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj,"serialNumber",serialNumber);
-			field_from_json(Obj,"author",author);
-			field_from_json(Obj,"reason",reason);
-			field_from_json(Obj,"created",created);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
+		field_to_json(Obj,"serialNumber", SerialNumber);
+		field_to_json(Obj,"author", Author);
+		field_to_json(Obj,"reason", Reason);
+		field_to_json(Obj,"created", Created);
 	}

 	void ConnectionState::to_json(Poco::JSON::Object &Obj) const {
+		field_to_json(Obj,"serialNumber", SerialNumber);
 		field_to_json(Obj,"ipAddress", Address);
 		field_to_json(Obj,"txBytes", TX);
 		field_to_json(Obj,"rxBytes", RX);
@@ -191,10 +180,6 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj,"lastContact", LastContact);
 		field_to_json(Obj,"associations_2G", Associations_2G);
 		field_to_json(Obj,"associations_5G", Associations_5G);
-		field_to_json(Obj,"webSocketClients", webSocketClients);
-		field_to_json(Obj,"websocketPackets", websocketPackets);
-		field_to_json(Obj,"kafkaClients", kafkaClients);
-		field_to_json(Obj,"kafkaPackets", kafkaPackets);

 		switch(VerifiedCertificate) {
 			case NO_CERTIFICATE:
@@ -258,11 +243,5 @@ namespace OpenWifi::GWObjects {
 		numberOfDevices = 0 ;
 		snapshot = std::time(nullptr);
 	}
-
-	void CapabilitiesModel::to_json(Poco::JSON::Object &Obj) const{
-		field_to_json(Obj,"deviceType", deviceType);
-		field_to_json(Obj,"capabilities", capabilities);
-	};
-
 }

--- a/src/RESTObjects/RESTAPI_GWobjects.h
+++ b/src/RESTObjects/RESTAPI_GWobjects.h
@@ -6,7 +6,8 @@
 //	Arilia Wireless Inc.
 //

-#pragma once
+#ifndef UCENTRAL_RESTAPI_OBJECTS_H
+#define UCENTRAL_RESTAPI_OBJECTS_H

 #include "Poco/JSON/Object.h"
 #include "RESTAPI_SecurityObjects.h"
@@ -22,6 +23,7 @@ namespace OpenWifi::GWObjects {

 	struct ConnectionState {
 		uint64_t MessageCount = 0 ;
+		std::string SerialNumber;
 		std::string Address;
 		uint64_t UUID = 0 ;
 		uint64_t PendingUUID = 0 ;
@@ -33,10 +35,6 @@ namespace OpenWifi::GWObjects {
 		std::string Firmware;
 		CertificateValidation VerifiedCertificate = NO_CERTIFICATE;
 		std::string Compatible;
-		uint64_t 	kafkaClients=0;
-		uint64_t 	webSocketClients=0;
-		uint64_t 	kafkaPackets=0;
-		uint64_t 	websocketPackets=0;
 		void to_json(Poco::JSON::Object &Obj) const;
 	};

@@ -52,40 +50,38 @@ namespace OpenWifi::GWObjects {
 		std::string Firmware;
 		std::string Compatible;
 		std::string FWUpdatePolicy;
-		uint64_t UUID = 0 ;
-		uint64_t CreationTimestamp = 0 ;
-		uint64_t LastConfigurationChange = 0 ;
-		uint64_t LastConfigurationDownload = 0 ;
-		uint64_t LastFWUpdate = 0 ;
+		uint64_t UUID;
+		uint64_t CreationTimestamp;
+		uint64_t LastConfigurationChange;
+		uint64_t LastConfigurationDownload;
+		uint64_t LastFWUpdate;
 		std::string Venue;
 		std::string DevicePassword;
 		void to_json(Poco::JSON::Object &Obj) const;
 		void to_json_with_status(Poco::JSON::Object &Obj) const;
-		bool from_json(Poco::JSON::Object::Ptr &Obj);
+		bool from_json(Poco::JSON::Object::Ptr Obj);
 		void Print() const;
 	};

 	struct Statistics {
-		std::string SerialNumber;
-		uint64_t 	UUID = 0 ;
+		uint64_t 	UUID;
 		std::string Data;
-		uint64_t 	Recorded = 0;
+		uint64_t 	Recorded;
 		void to_json(Poco::JSON::Object &Obj) const;
 	};

 	struct HealthCheck {
-		std::string SerialNumber;
-		uint64_t 	UUID = 0 ;
+		uint64_t 	UUID;
 		std::string Data;
-		uint64_t 	Recorded = 0 ;
-		uint64_t 	Sanity = 0 ;
+		uint64_t 	Recorded;
+		uint64_t 	Sanity;
 		void to_json(Poco::JSON::Object &Obj) const;
 	};

 	struct Capabilities {
 		std::string Capabilities;
-		uint64_t 	FirstUpdate = 0 ;
-		uint64_t 	LastUpdate = 0 ;
+		uint64_t 	FirstUpdate;
+		uint64_t 	LastUpdate;
 		void 		to_json(Poco::JSON::Object &Obj) const;
 	};

@@ -100,25 +96,24 @@ namespace OpenWifi::GWObjects {
 			LOG_INFO = 6,	 /* informational */
 			LOG_DEBUG = 7	 /* debug-level messages */
 		};
-		std::string SerialNumber;
 		std::string Log;
 		std::string Data;
-		uint64_t 	Severity = 0 ;
-		uint64_t 	Recorded = 0 ;
-		uint64_t 	LogType = 0 ;
-		uint64_t 	UUID = 0 ;
+		uint64_t 	Severity;
+		uint64_t 	Recorded;
+		uint64_t 	LogType;
+		uint64_t 	UUID;
 		void 		to_json(Poco::JSON::Object &Obj) const;
 	};

 	struct DefaultConfiguration {
 		std::string Name;
 		std::string Configuration;
-		Types::StringVec Models;
+		std::string Models;
 		std::string Description;
 		uint64_t 	Created;
 		uint64_t 	LastModified;
 		void 		to_json(Poco::JSON::Object &Obj) const;
-		bool 		from_json(Poco::JSON::Object::Ptr &Obj);
+		bool 		from_json(Poco::JSON::Object::Ptr Obj);
 	};

 	struct CommandDetails {
@@ -140,36 +135,34 @@ namespace OpenWifi::GWObjects {
 		uint64_t AttachDate = 0 ;
 		uint64_t AttachSize = 0 ;
 		std::string AttachType;
-		double 		executionTime = 0.0;
 		void to_json(Poco::JSON::Object &Obj) const;
 	};

 	struct BlackListedDevice {
-		std::string serialNumber;
-		std::string reason;
-		std::string author;
-		uint64_t created;
+		std::string SerialNumber;
+		std::string Reason;
+		std::string Author;
+		uint64_t Created;
 		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(Poco::JSON::Object::Ptr &Obj);
 	};

 	struct RttySessionDetails {
 		std::string SerialNumber;
 		std::string Server;
-		uint64_t 	Port = 0 ;
+		uint64_t 	Port;
 		std::string Token;
-		uint64_t 	TimeOut = 0 ;
+		uint64_t 	TimeOut;
 		std::string ConnectionId;
-		uint64_t 	Started = 0 ;
+		uint64_t 	Started;
 		std::string CommandUUID;
-		uint64_t 	ViewPort = 0 ;
+		uint64_t 	ViewPort;
 		std::string DevicePassword;
 		void to_json(Poco::JSON::Object &Obj) const;
 	};

 	struct Dashboard {
-		uint64_t 		  snapshot = 0 ;
-		uint64_t 		  numberOfDevices = 0 ;
+		uint64_t 		  snapshot;
+		uint64_t 		  numberOfDevices;
 		Types::CountedMap commands;
 		Types::CountedMap upTimes;
 		Types::CountedMap memoryUsed;
@@ -186,11 +179,6 @@ namespace OpenWifi::GWObjects {
 		void to_json(Poco::JSON::Object &Obj) const;
 		void reset();
 	};
-
-	struct CapabilitiesModel {
-		std::string deviceType;
-		std::string capabilities;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
 }
+
+#endif //UCENTRAL_RESTAPI_OBJECTS_H
--- a/src/RESTAPI_InternalServer.cpp
+++ b/src/RESTAPI_InternalServer.cpp
@@ -0,0 +1,75 @@
+//
+// Created by stephane bourque on 2021-06-29.
+//
+
+#include "RESTAPI_InternalServer.h"
+
+#include "Poco/URI.h"
+
+#include "RESTAPI_firmwareHandler.h"
+#include "RESTAPI_firmwaresHandler.h"
+#include "RESTAPI_system_command.h"
+#include "RESTAPI_connectedDevicesHandler.h"
+#include "RESTAPI_connectedDeviceHandler.h"
+
+#include "Utils.h"
+
+namespace OpenWifi {
+
+    class RESTAPI_InternalServer *RESTAPI_InternalServer::instance_ = nullptr;
+
+    RESTAPI_InternalServer::RESTAPI_InternalServer() noexcept: SubSystemServer("RESTAPIInternalServer", "REST-ISRV", "ucentral.internal.restapi")
+    {
+    }
+
+    int RESTAPI_InternalServer::Start() {
+        Logger_.information("Starting.");
+
+        for(const auto & Svr: ConfigServersList_) {
+            Logger_.information(Poco::format("Starting: %s:%s Keyfile:%s CertFile: %s", Svr.Address(), std::to_string(Svr.Port()),
+                                             Svr.KeyFile(),Svr.CertFile()));
+
+            auto Sock{Svr.CreateSecureSocket(Logger_)};
+
+            Svr.LogCert(Logger_);
+            if(!Svr.RootCA().empty())
+                Svr.LogCas(Logger_);
+            auto Params = new Poco::Net::HTTPServerParams;
+            Params->setMaxThreads(50);
+            Params->setMaxQueued(200);
+            Params->setKeepAlive(true);
+
+            auto NewServer = std::make_unique<Poco::Net::HTTPServer>(new InternalRequestHandlerFactory, Pool_, Sock, Params);
+            NewServer->start();
+            RESTServers_.push_back(std::move(NewServer));
+        }
+
+        return 0;
+    }
+
+    void RESTAPI_InternalServer::Stop() {
+        Logger_.information("Stopping ");
+        for( const auto & svr : RESTServers_ )
+            svr->stop();
+    }
+
+    Poco::Net::HTTPRequestHandler *InternalRequestHandlerFactory::createRequestHandler(const Poco::Net::HTTPServerRequest & Request) {
+
+        Logger_.debug(
+                Poco::format("REQUEST(%s): %s %s", Utils::FormatIPv6(Request.clientAddress().toString()),
+                             Request.getMethod(), Request.getURI()));
+
+        Poco::URI uri(Request.getURI());
+        const auto &Path = uri.getPath();
+        RESTAPIHandler::BindingMap Bindings;
+
+        return RESTAPI_Router_I<
+                RESTAPI_firmwaresHandler,
+                RESTAPI_firmwareHandler,
+                RESTAPI_system_command,
+                RESTAPI_connectedDevicesHandler,
+                RESTAPI_connectedDeviceHandler
+        >(Path, Bindings, Logger_);
+    }
+
+}
--- a/src/RESTAPI_InternalServer.h
+++ b/src/RESTAPI_InternalServer.h
@@ -0,0 +1,53 @@
+//
+// Created by stephane bourque on 2021-06-29.
+//
+
+#ifndef UCENTRALSEC_RESTAPI_INTERNALSERVER_H
+#define UCENTRALSEC_RESTAPI_INTERNALSERVER_H
+
+#include "SubSystemServer.h"
+#include "Poco/Net/HTTPServer.h"
+#include "Poco/Net/HTTPRequestHandler.h"
+#include "Poco/Net/HTTPRequestHandlerFactory.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Net/NetException.h"
+
+namespace OpenWifi {
+
+    class RESTAPI_InternalServer : public SubSystemServer {
+
+    public:
+        RESTAPI_InternalServer() noexcept;
+
+        static RESTAPI_InternalServer *instance() {
+            if (instance_ == nullptr) {
+                instance_ = new RESTAPI_InternalServer;
+            }
+            return instance_;
+        }
+
+        int Start() override;
+        void Stop() override;
+
+    private:
+        static RESTAPI_InternalServer *instance_;
+        std::vector<std::unique_ptr<Poco::Net::HTTPServer>>   RESTServers_;
+        Poco::ThreadPool	Pool_;
+    };
+
+    inline RESTAPI_InternalServer * RESTAPI_InternalServer() { return RESTAPI_InternalServer::instance(); };
+
+    class InternalRequestHandlerFactory : public Poco::Net::HTTPRequestHandlerFactory {
+    public:
+        InternalRequestHandlerFactory() :
+                Logger_(RESTAPI_InternalServer()->Logger()){}
+
+        Poco::Net::HTTPRequestHandler *createRequestHandler(const Poco::Net::HTTPServerRequest &request) override;
+    private:
+        Poco::Logger    & Logger_;
+    };
+
+
+} //   namespace
+
+#endif //UCENTRALSEC_RESTAPI_INTERNALSERVER_H
--- a/src/RESTObjects/RESTAPI_SecurityObjects.cpp
+++ b/src/RESTObjects/RESTAPI_SecurityObjects.cpp
@@ -9,8 +9,8 @@
 #include "Poco/JSON/Parser.h"
 #include "Poco/JSON/Stringifier.h"

-#include "framework/MicroService.h"
 #include "RESTAPI_SecurityObjects.h"
+#include "RESTAPI_utils.h"

 using OpenWifi::RESTAPI_utils::field_to_json;
 using OpenWifi::RESTAPI_utils::field_from_json;
@@ -54,35 +54,25 @@ namespace OpenWifi::SecurityObjects {
            return ADMIN;
        else if (!Poco::icompare(U,"subscriber"))
            return SUBSCRIBER;
-        else if (!Poco::icompare(U,"partner"))
-            return PARTNER;
        else if (!Poco::icompare(U,"csr"))
            return CSR;
        else if (!Poco::icompare(U, "system"))
            return SYSTEM;
-        else if (!Poco::icompare(U, "installer"))
-            return INSTALLER;
-        else if (!Poco::icompare(U, "noc"))
-            return NOC;
-        else if (!Poco::icompare(U, "accounting"))
-            return ACCOUNTING;
+        else if (!Poco::icompare(U, "special"))
+            return SPECIAL;
        return UNKNOWN;
    }

    std::string UserTypeToString(USER_ROLE U) {
        switch(U) {
+            case UNKNOWN: return "unknown";
            case ROOT: return "root";
-            case ADMIN: return "admin";
            case SUBSCRIBER: return "subscriber";
-            case PARTNER: return "partner";
            case CSR: return "csr";
            case SYSTEM: return "system";
-            case INSTALLER: return "installer";
-            case NOC: return "noc";
-            case ACCOUNTING: return "accounting";
-            case UNKNOWN:
-            default:
-                return "unknown";
+            case SPECIAL: return "special";
+            case ADMIN: return "admin";
+            default: return "unknown";
        }
    }

@@ -135,98 +125,8 @@ namespace OpenWifi::SecurityObjects {
 		return false;
 	}

-	void MobilePhoneNumber::to_json(Poco::JSON::Object &Obj) const {
-	    field_to_json(Obj,"number", number);
-	    field_to_json(Obj,"verified", verified);
-	    field_to_json(Obj,"primary", primary);
-	}
-
-	bool MobilePhoneNumber::from_json(Poco::JSON::Object::Ptr &Obj) {
-	    try {
-	        field_from_json(Obj,"number",number);
-	        field_from_json(Obj,"verified",verified);
-	        field_from_json(Obj,"primary",primary);
-	        return true;
-	    } catch (...) {
-
-	    }
-	    return false;
-	};
-
-	void MfaAuthInfo::to_json(Poco::JSON::Object &Obj) const {
-	    field_to_json(Obj,"enabled", enabled);
-	    field_to_json(Obj,"method", method);
-	}
-
-	bool MfaAuthInfo::from_json(Poco::JSON::Object::Ptr &Obj) {
-	    try {
-	        field_from_json(Obj,"enabled",enabled);
-	        field_from_json(Obj,"method",method);
-	        return true;
-	    } catch (...) {
-
-	    }
-	    return false;
-	}
-
-	void UserLoginLoginExtensions::to_json(Poco::JSON::Object &Obj) const {
-	    field_to_json(Obj, "mobiles", mobiles);
-	    field_to_json(Obj, "mfa", mfa);
-        field_to_json(Obj, "authenticatorSecret", authenticatorSecret);
-	}
-
-	bool UserLoginLoginExtensions::from_json(Poco::JSON::Object::Ptr &Obj) {
-	    try {
-	        field_from_json(Obj,"mobiles",mobiles);
-	        field_from_json(Obj,"mfa",mfa);
-            field_from_json(Obj, "authenticatorSecret", authenticatorSecret);
-	        return true;
-	    } catch (...) {
-
-	    }
-	    return false;
-	}
-
-    void MFAChallengeRequest::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "uuid", uuid);
-        field_to_json(Obj, "question", question);
-        field_to_json(Obj, "created", created);
-        field_to_json(Obj, "method", method);
-    }
-
-    bool MFAChallengeRequest::from_json(Poco::JSON::Object::Ptr &Obj) {
-	    try {
-	        field_from_json(Obj,"uuid",uuid);
-	        field_from_json(Obj,"question",question);
-	        field_from_json(Obj,"created",created);
-	        field_from_json(Obj,"method",method);
-	        return true;
-	    } catch (...) {
-
-	    }
-	    return false;
-	};
-
-    void MFAChallengeResponse::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "uuid", uuid);
-        field_to_json(Obj, "answer", answer);
-
-    }
-
-    bool MFAChallengeResponse::from_json(Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"uuid",uuid);
-            field_from_json(Obj,"answer",answer);
-            return true;
-        } catch (...) {
-
-        }
-        return false;
-
-    }
-
    void UserInfo::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj,"id",id);
+		field_to_json(Obj,"Id",Id);
 		field_to_json(Obj,"name",name);
 		field_to_json(Obj,"description", description);
 		field_to_json(Obj,"avatar", avatar);
@@ -256,12 +156,11 @@ namespace OpenWifi::SecurityObjects {
 		field_to_json(Obj,"lastPasswords",lastPasswords);
 		field_to_json(Obj,"oauthType",oauthType);
 		field_to_json(Obj,"oauthUserInfo",oauthUserInfo);
-        field_to_json(Obj,"modified",modified);
    };

    bool UserInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
        try {
-			field_from_json(Obj,"id",id);
+			field_from_json(Obj,"Id",Id);
 			field_from_json(Obj,"name",name);
 			field_from_json(Obj,"description",description);
 			field_from_json(Obj,"avatar",avatar);
@@ -271,8 +170,6 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj,"currentLoginURI",currentLoginURI);
 			field_from_json(Obj,"locale",locale);
 			field_from_json(Obj,"notes",notes);
-            field_from_json(Obj,"location", location);
-            field_from_json(Obj,"owner", owner);
 			field_from_json<USER_ROLE>(Obj,"userRole",userRole, UserTypeFromString);
 			field_from_json(Obj,"securityPolicy",securityPolicy);
 			field_from_json(Obj,"userTypeProprietaryInfo",userTypeProprietaryInfo);
@@ -291,7 +188,6 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj,"lastPasswords",lastPasswords);
 			field_from_json(Obj,"oauthType",oauthType);
 			field_from_json(Obj,"oauthUserInfo",oauthUserInfo);
-            field_from_json(Obj,"modified",modified);
            return true;
        } catch (const Poco::Exception &E) {

@@ -396,53 +292,40 @@ namespace OpenWifi::SecurityObjects {
 		field_to_json(Obj,"note", note);
 	}

-	bool NoteInfo::from_json(Poco::JSON::Object::Ptr &Obj) {
+	bool NoteInfo::from_json(Poco::JSON::Object::Ptr Obj) {
 		try {
 			field_from_json(Obj,"created",created);
 			field_from_json(Obj,"createdBy",createdBy);
 			field_from_json(Obj,"note",note);
-			return true;
 		} catch(...) {

 		}
 		return false;
 	}

-    bool MergeNotes(Poco::JSON::Object::Ptr Obj, const UserInfo &UInfo, NoteInfoVec & Notes) {
+    bool append_from_json(Poco::JSON::Object::Ptr Obj, const UserInfo &UInfo, NoteInfoVec & Notes) {
 	    try {
-	        if(Obj->has("notes") && Obj->isArray("notes")) {
-	            SecurityObjects::NoteInfoVec NIV;
-	            NIV = RESTAPI_utils::to_object_array<SecurityObjects::NoteInfo>(Obj->get("notes").toString());
-	            for(auto const &i:NIV) {
-	                SecurityObjects::NoteInfo   ii{.created=(uint64_t)std::time(nullptr), .createdBy=UInfo.email, .note=i.note};
-	                Notes.push_back(ii);
-	            }
+	        SecurityObjects::NoteInfoVec NIV;
+	        NIV = RESTAPI_utils::to_object_array<SecurityObjects::NoteInfo>(Obj->get("notes").toString());
+	        for(auto const &i:NIV) {
+	            SecurityObjects::NoteInfo   ii{.created=(uint64_t)std::time(nullptr), .createdBy=UInfo.email, .note=i.note};
+	            Notes.push_back(ii);
 	        }
-	        return true;
 	    } catch(...) {

 	    }
 	    return false;
 	}

-	bool MergeNotes(const NoteInfoVec & NewNotes, const UserInfo &UInfo, NoteInfoVec & ExistingNotes) {
-	    for(auto const &i:NewNotes) {
-	        SecurityObjects::NoteInfo   ii{.created=(uint64_t)std::time(nullptr), .createdBy=UInfo.email, .note=i.note};
-	        ExistingNotes.push_back(ii);
-	    }
-        return true;
-	}
-
 	void ProfileAction::to_json(Poco::JSON::Object &Obj) const {
 		field_to_json(Obj,"resource", resource);
 		field_to_json<ResourceAccessType>(Obj,"access", access, ResourceAccessTypeToString);
 	}

-	bool ProfileAction::from_json(Poco::JSON::Object::Ptr &Obj) {
+	bool ProfileAction::from_json(Poco::JSON::Object::Ptr Obj) {
 		try {
 			field_from_json(Obj,"resource",resource);
 			field_from_json<ResourceAccessType>(Obj,"access",access,ResourceAccessTypeFromString );
-			return true;
 		} catch(...) {

 		}
@@ -458,7 +341,7 @@ namespace OpenWifi::SecurityObjects {
 		field_to_json(Obj,"notes", notes);
 	}

-	bool SecurityProfile::from_json(Poco::JSON::Object::Ptr &Obj) {
+	bool SecurityProfile::from_json(Poco::JSON::Object::Ptr Obj) {
 		try {
 			field_from_json(Obj,"id",id);
 			field_from_json(Obj,"name",name);
@@ -466,7 +349,6 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj,"policy",policy);
 			field_from_json(Obj,"role",role);
 			field_from_json(Obj,"notes",notes);
-			return true;
 		} catch(...) {

 		}
@@ -477,126 +359,13 @@ namespace OpenWifi::SecurityObjects {
 		field_to_json(Obj, "profiles", profiles);
 	}

-	bool SecurityProfileList::from_json(Poco::JSON::Object::Ptr &Obj) {
+	bool SecurityProfileList::from_json(Poco::JSON::Object::Ptr Obj) {
 		try {
 			field_from_json(Obj,"profiles",profiles);
-			return true;
 		} catch(...) {

 		}
 		return false;
 	}
-
-    void ActionLink::to_json(Poco::JSON::Object &Obj) const {
-	    field_to_json(Obj,"id",id);
-	    field_to_json(Obj,"action",action);
-	    field_to_json(Obj,"userId",userId);
-	    field_to_json(Obj,"actionTemplate",actionTemplate);
-	    field_to_json(Obj,"variables",variables);
-	    field_to_json(Obj,"locale",locale);
-	    field_to_json(Obj,"message",message);
-	    field_to_json(Obj,"sent",sent);
-	    field_to_json(Obj,"created",created);
-	    field_to_json(Obj,"expires",expires);
-	    field_to_json(Obj,"completed",completed);
-	    field_to_json(Obj,"canceled",canceled);
-        field_to_json(Obj,"userAction",userAction);
-	}
-
-    bool ActionLink::from_json(Poco::JSON::Object::Ptr &Obj) {
-	    try {
-	        field_from_json(Obj,"id",id);
-	        field_from_json(Obj,"action",action);
-	        field_from_json(Obj,"userId",userId);
-	        field_from_json(Obj,"actionTemplate",actionTemplate);
-	        field_from_json(Obj,"variables",variables);
-	        field_from_json(Obj,"locale",locale);
-	        field_from_json(Obj,"message",message);
-	        field_from_json(Obj,"sent",sent);
-	        field_from_json(Obj,"created",created);
-	        field_from_json(Obj,"expires",expires);
-	        field_from_json(Obj,"completed",completed);
-	        field_from_json(Obj,"canceled",canceled);
-            field_from_json(Obj,"userAction",userAction);
-	        return true;
-	    } catch(...) {
-
-	    }
-	    return false;
-	}
-
-    void Preferences::to_json(Poco::JSON::Object &Obj) const {
-	    field_to_json(Obj,"id",id);
-	    field_to_json(Obj,"modified",modified);
-	    field_to_json(Obj,"data",data);
-	}
-
-    bool Preferences::from_json(Poco::JSON::Object::Ptr &Obj) {
-	    try {
-	        field_from_json(Obj,"id",id);
-	        field_from_json(Obj,"modified",modified);
-	        field_from_json(Obj,"data",data);
-	        return true;
-	    } catch(...) {
-
-	    }
-	    return false;
-	}
-
-    void SubMfaConfig::to_json(Poco::JSON::Object &Obj) const {
-	    field_to_json(Obj,"id",id);
-	    field_to_json(Obj,"type",type);
-	    field_to_json(Obj,"sms",sms);
-	    field_to_json(Obj,"email",email);
-	}
-
-    bool SubMfaConfig::from_json(Poco::JSON::Object::Ptr &Obj) {
-	    try {
-	        field_from_json(Obj,"id",id);
-	        field_from_json(Obj,"type",type);
-	        field_from_json(Obj,"sms",sms);
-	        field_from_json(Obj,"email",email);
-	        return true;
-	    } catch(...) {
-
-	    }
-	    return false;
-	}
-
-    void Token::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"token",token);
-        field_to_json(Obj,"refreshToken",refreshToken);
-        field_to_json(Obj,"tokenType",tokenType);
-        field_to_json(Obj,"userName",userName);
-        field_to_json(Obj,"created",created);
-        field_to_json(Obj,"expires",expires);
-        field_to_json(Obj,"idleTimeout",idleTimeout);
-        field_to_json(Obj,"revocationDate",revocationDate);
-    }
-
-    bool Token::from_json(Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"token",token);
-            field_from_json(Obj,"refreshToken",refreshToken);
-            field_from_json(Obj,"tokenType",tokenType);
-            field_from_json(Obj,"userName",userName);
-            field_from_json(Obj,"created",created);
-            field_from_json(Obj,"expires",expires);
-            field_from_json(Obj,"idleTimeout",idleTimeout);
-            field_from_json(Obj,"revocationDate",revocationDate);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void LoginRecordInfo::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"sessionId",sessionId);
-        field_to_json(Obj,"userId",userId);
-        field_to_json(Obj,"email",email);
-        field_to_json(Obj,"login",login);
-        field_to_json(Obj,"logout",logout);
-    }
 }

--- a/src/RESTAPI_SecurityObjects.h
+++ b/src/RESTAPI_SecurityObjects.h
@@ -0,0 +1,181 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#ifndef UCENTRAL_RESTAPI_SECURITYOBJECTS_H
+#define UCENTRAL_RESTAPI_SECURITYOBJECTS_H
+
+#include "Poco/JSON/Object.h"
+#include "OpenWifiTypes.h"
+
+namespace OpenWifi::SecurityObjects {
+
+	struct AclTemplate {
+		bool Read_ = true;
+		bool ReadWrite_ = true;
+		bool ReadWriteCreate_ = true;
+		bool Delete_ = true;
+		bool PortalLogin_ = true;
+
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);	};
+
+	struct WebToken {
+		std::string access_token_;
+		std::string refresh_token_;
+		std::string id_token_;
+		std::string token_type_;
+		std::string username_;
+		bool userMustChangePassword=false;
+        uint64_t errorCode=0;
+		uint64_t expires_in_=0;
+		uint64_t idle_timeout_=0;
+		AclTemplate acl_template_;
+		uint64_t created_=0;
+
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+
+    enum USER_ROLE {
+        UNKNOWN, ROOT, ADMIN, SUBSCRIBER, CSR, SYSTEM, SPECIAL
+    };
+
+    USER_ROLE UserTypeFromString(const std::string &U);
+    std::string UserTypeToString(USER_ROLE U);
+
+    struct NoteInfo {
+		uint64_t created = std::time(nullptr);
+		std::string createdBy;
+		std::string note;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(Poco::JSON::Object::Ptr Obj);
+	};
+	typedef std::vector<NoteInfo>	NoteInfoVec;
+
+	struct UserInfo {
+        std::string Id;
+		std::string name;
+		std::string description;
+		std::string avatar;
+		std::string email;
+		bool validated = false;
+		std::string validationEmail;
+		uint64_t validationDate = 0;
+		uint64_t creationDate = 0;
+		std::string validationURI;
+		bool changePassword = false;
+		uint64_t lastLogin = 0;
+		std::string currentLoginURI;
+		uint64_t lastPasswordChange = 0;
+		uint64_t lastEmailCheck = 0;
+		bool waitingForEmailCheck = false;
+		std::string locale;
+		NoteInfoVec notes;
+		std::string location;
+		std::string owner;
+		bool suspended = false;
+		bool blackListed = false;
+        USER_ROLE userRole;
+		std::string userTypeProprietaryInfo;
+		std::string securityPolicy;
+		uint64_t securityPolicyChange = 0 ;
+		std::string currentPassword;
+		Types::StringVec lastPasswords;
+		std::string oauthType;
+		std::string oauthUserInfo;
+
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+	typedef std::vector<UserInfo>   UserInfoVec;
+
+	bool append_from_json(Poco::JSON::Object::Ptr Obj, const UserInfo &UInfo, NoteInfoVec & Notes);
+
+	struct InternalServiceInfo {
+		std::string privateURI;
+		std::string publicURI;
+		std::string token;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+	typedef std::vector<InternalServiceInfo>	InternalServiceInfoVec;
+
+	struct InternalSystemServices {
+		std::string key;
+		std::string version;
+		InternalServiceInfoVec services;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+
+	struct SystemEndpoint {
+		std::string type;
+		uint64_t 	id = 0;
+		std::string vendor{"OpenWiFi"};
+		std::string uri;
+		std::string authenticationType{"internal_v1"};
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+	typedef std::vector<SystemEndpoint> SystemEndpointVec;
+
+	struct SystemEndpointList {
+		SystemEndpointVec	endpoints;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+
+	struct UserInfoAndPolicy {
+		WebToken	webtoken;
+		UserInfo	userinfo;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+	typedef std::map<std::string,SecurityObjects::UserInfoAndPolicy>	UserInfoCache;
+
+	enum ResourceAccessType {
+		NONE,
+		READ,
+		MODIFY,
+		DELETE,
+		CREATE,
+		TEST,
+		MOVE
+	};
+
+	ResourceAccessType ResourceAccessTypeFromString(const std::string &s);
+	std::string ResourceAccessTypeToString(const ResourceAccessType & T);
+
+	struct ProfileAction {
+		std::string resource;
+		ResourceAccessType access;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(Poco::JSON::Object::Ptr Obj);
+	};
+	typedef std::vector<ProfileAction>	ProfileActionVec;
+
+	struct SecurityProfile {
+		uint64_t id;
+		std::string name;
+		std::string description;
+		ProfileActionVec policy;
+		std::string role;
+		NoteInfoVec notes;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(Poco::JSON::Object::Ptr Obj);
+	};
+	typedef std::vector<SecurityProfile> SecurityProfileVec;
+
+	struct SecurityProfileList {
+		SecurityProfileVec profiles;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(Poco::JSON::Object::Ptr Obj);
+	};
+}
+
+#endif //UCENTRAL_RESTAPI_SECURITYOBJECTS_H
--- a/src/RESTAPI_connectedDeviceHandler.cpp
+++ b/src/RESTAPI_connectedDeviceHandler.cpp
@@ -0,0 +1,48 @@
+//
+// Created by stephane bourque on 2021-07-18.
+//
+
+#include "RESTAPI_connectedDeviceHandler.h"
+#include "RESTAPI_FMSObjects.h"
+#include "StorageService.h"
+#include "RESTAPI_protocol.h"
+
+namespace OpenWifi {
+    void RESTAPI_connectedDeviceHandler::handleRequest(Poco::Net::HTTPServerRequest &Request,
+                                                        Poco::Net::HTTPServerResponse &Response) {
+        if (!ContinueProcessing(Request, Response))
+            return;
+        if (!IsAuthorized(Request, Response))
+            return;
+        if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET)
+            DoGet(Request, Response);
+        else
+            BadRequest(Request, Response);
+    }
+
+    void RESTAPI_connectedDeviceHandler::DoGet(Poco::Net::HTTPServerRequest &Request,
+                                                Poco::Net::HTTPServerResponse &Response) {
+        try {
+            auto SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER,"");
+
+            if(SerialNumber.empty()) {
+                BadRequest(Request, Response, "SerialNumber must be specified.");
+                return;
+            }
+
+            FMSObjects::DeviceConnectionInformation DevInfo;
+            if(Storage()->GetDevice(SerialNumber, DevInfo)) {
+                Poco::JSON::Object  Answer;
+                DevInfo.to_json(Answer);
+                ReturnObject(Request, Answer, Response);
+                return;
+            }
+            NotFound(Request, Response);
+            return;
+        } catch (const Poco::Exception &E) {
+            Logger_.log(E);
+        }
+        BadRequest(Request, Response);
+    }
+
+}
--- a/src/RESTAPI/RESTAPI_connectedDeviceHandler.h
+++ b/src/RESTAPI/RESTAPI_connectedDeviceHandler.h
@@ -5,25 +5,20 @@
 #ifndef UCENTRALFMS_RESTAPI_CONNECTEDDEVICEHANDLER_H
 #define UCENTRALFMS_RESTAPI_CONNECTEDDEVICEHANDLER_H

-#include "framework/MicroService.h"
+#include "RESTAPI_handler.h"

 namespace OpenWifi {
    class RESTAPI_connectedDeviceHandler : public RESTAPIHandler {
    public:
-        RESTAPI_connectedDeviceHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
+        RESTAPI_connectedDeviceHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, bool Internal)
                : RESTAPIHandler(bindings, L,
                                 std::vector<std::string>
                                         {Poco::Net::HTTPRequest::HTTP_GET,
                                          Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                          Server,
-                                          TransactionId,
                                          Internal) {}
        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/connectedDevice/{serialNumber}"};}
-
-        void DoGet() final;
-        void DoDelete() final {};
-        void DoPost() final {};
-        void DoPut() final {};
+        void handleRequest(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response) override;
+        void DoGet(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response);
    };
 }

--- a/src/RESTAPI_connectedDevicesHandler.cpp
+++ b/src/RESTAPI_connectedDevicesHandler.cpp
@@ -0,0 +1,49 @@
+//
+// Created by stephane bourque on 2021-07-18.
+//
+
+#include "RESTAPI_connectedDevicesHandler.h"
+#include "RESTAPI_FMSObjects.h"
+#include "Poco/JSON/Object.h"
+#include "Poco/JSON/Array.h"
+#include "StorageService.h"
+#include "RESTAPI_protocol.h"
+
+namespace OpenWifi {
+    void RESTAPI_connectedDevicesHandler::handleRequest(Poco::Net::HTTPServerRequest &Request,
+                                                        Poco::Net::HTTPServerResponse &Response) {
+        if (!ContinueProcessing(Request, Response))
+            return;
+        if (!IsAuthorized(Request, Response))
+            return;
+        ParseParameters(Request);
+        if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET)
+            DoGet(Request, Response);
+        else
+            BadRequest(Request, Response);
+    }
+
+    void RESTAPI_connectedDevicesHandler::DoGet(Poco::Net::HTTPServerRequest &Request,
+                                                Poco::Net::HTTPServerResponse &Response) {
+        try {
+            InitQueryBlock();
+
+            std::vector<FMSObjects::DeviceConnectionInformation> Devices;
+            if (Storage()->GetDevices(QB_.Offset, QB_.Limit, Devices)) {
+                Poco::JSON::Array AnswerArr;
+                for (const auto &i:Devices) {
+                    Poco::JSON::Object Obj;
+                    i.to_json(Obj);
+                    AnswerArr.add(Obj);
+                }
+                Poco::JSON::Object AnswerObj;
+                AnswerObj.set(RESTAPI::Protocol::DEVICES, AnswerArr);
+                ReturnObject(Request, AnswerObj, Response);
+                return;
+            }
+        } catch (const Poco::Exception &E) {
+            Logger_.log(E);
+        }
+        BadRequest(Request, Response);
+    }
+}
--- a/src/RESTAPI/RESTAPI_connectedDevicesHandler.h
+++ b/src/RESTAPI/RESTAPI_connectedDevicesHandler.h
@@ -6,25 +6,20 @@
 #define UCENTRALFMS_RESTAPI_CONNECTEDDEVICESHANDLER_H


-#include "framework/MicroService.h"
+#include "RESTAPI_handler.h"

 namespace OpenWifi {
    class RESTAPI_connectedDevicesHandler : public RESTAPIHandler {
    public:
-        RESTAPI_connectedDevicesHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
+        RESTAPI_connectedDevicesHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, bool Internal)
                : RESTAPIHandler(bindings, L,
                                 std::vector<std::string>
                                         {Poco::Net::HTTPRequest::HTTP_GET,
                                          Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                          Server,
-                                          TransactionId,
                                          Internal) {}
        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/connectedDevices"};}
-        void DoGet()  final;
-        void DoDelete() final {};
-        void DoPost() final {};
-        void DoPut() final {};
-
+        void handleRequest(Poco::Net::HTTPServerRequest &request, Poco::Net::HTTPServerResponse &response) override;
+        void DoGet(Poco::Net::HTTPServerRequest &request, Poco::Net::HTTPServerResponse &response);
    };
 }

--- a/src/RESTAPI_deviceReportHandler.cpp
+++ b/src/RESTAPI_deviceReportHandler.cpp
@@ -0,0 +1,37 @@
+//
+// Created by stephane bourque on 2021-07-19.
+//
+
+#include "RESTAPI_deviceReportHandler.h"
+#include "StorageService.h"
+#include "RESTAPI_FMSObjects.h"
+#include "Poco/JSON/Object.h"
+#include "Daemon.h"
+
+namespace OpenWifi {
+    void RESTAPI_deviceReportHandler::handleRequest(Poco::Net::HTTPServerRequest &Request,
+                                                    Poco::Net::HTTPServerResponse &Response) {
+        if (!ContinueProcessing(Request, Response))
+            return;
+        if (!IsAuthorized(Request, Response))
+            return;
+        if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET)
+            DoGet(Request, Response);
+        else
+            BadRequest(Request, Response);
+    }
+
+    void RESTAPI_deviceReportHandler::DoGet(Poco::Net::HTTPServerRequest &Request,
+                                            Poco::Net::HTTPServerResponse &Response) {
+        try {
+            Daemon()->CreateDashboard();
+            Poco::JSON::Object  O;
+            Daemon()->GetDashboard().to_json(O);
+            ReturnObject(Request, O, Response);
+            return;
+        } catch ( const Poco::Exception &E) {
+            Logger_.log(E);
+        }
+        BadRequest(Request, Response);
+    }
+}
--- a/src/RESTAPI/RESTAPI_deviceReportHandler.h
+++ b/src/RESTAPI/RESTAPI_deviceReportHandler.h
@@ -5,24 +5,20 @@
 #ifndef UCENTRALFMS_RESTAPI_DEVICEREPORTHANDLER_H
 #define UCENTRALFMS_RESTAPI_DEVICEREPORTHANDLER_H

-#include "framework/MicroService.h"
+#include "RESTAPI_handler.h"

 namespace OpenWifi {
    class RESTAPI_deviceReportHandler : public RESTAPIHandler {
    public:
-        RESTAPI_deviceReportHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
+        RESTAPI_deviceReportHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, bool Internal)
                : RESTAPIHandler(bindings, L,
                                 std::vector<std::string>
                                         {Poco::Net::HTTPRequest::HTTP_GET,
                                          Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                          Server,
-                                          TransactionId,
                                 Internal) {}
        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/deviceReport"};}
-        void DoGet()  final;
-        void DoDelete() final {};
-        void DoPost() final {};
-        void DoPut() final {};
+        void handleRequest(Poco::Net::HTTPServerRequest &request, Poco::Net::HTTPServerResponse &response) override;
+        void DoGet(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response);
    };
 }

--- a/src/RESTAPI_firmwareAgeHandler.cpp
+++ b/src/RESTAPI_firmwareAgeHandler.cpp
@@ -0,0 +1,87 @@
+//
+// Created by stephane bourque on 2021-07-16.
+//
+
+#include "RESTAPI_firmwareAgeHandler.h"
+
+#include "StorageService.h"
+#include "Poco/JSON/Parser.h"
+#include "Daemon.h"
+#include "Utils.h"
+#include "DeviceCache.h"
+#include "uCentralProtocol.h"
+#include "RESTAPI_protocol.h"
+
+namespace OpenWifi {
+    void RESTAPI_firmwareAgeHandler::handleRequest(Poco::Net::HTTPServerRequest &Request,
+                                                Poco::Net::HTTPServerResponse &Response) {
+        if (!ContinueProcessing(Request, Response))
+            return;
+        if (!IsAuthorized(Request, Response))
+            return;
+        ParseParameters(Request);
+        if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET)
+            DoGet(Request, Response);
+        else
+            BadRequest(Request, Response);
+    }
+
+    void RESTAPI_firmwareAgeHandler::DoGet(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response) {
+        try {
+            InitQueryBlock();
+            if (!QB_.Select.empty()) {
+                Poco::JSON::Array Objects;
+                std::vector<std::string> Numbers = Utils::Split(QB_.Select);
+                for (auto &i : Numbers) {
+                    DeviceCacheEntry E;
+                    if (DeviceCache()->GetDevice(i, E)) {
+                        FMSObjects::FirmwareAgeDetails FA;
+                        if(Storage()->ComputeFirmwareAge(E.deviceType,E.revision,FA)) {
+                            Poco::JSON::Object  O;
+                            FA.to_json(O);
+                            O.set(uCentralProtocol::SERIALNUMBER,i);
+                            Objects.add(O);
+                        } else {
+                            Poco::JSON::Object  O;
+                            O.set(uCentralProtocol::SERIALNUMBER,i);
+                            Objects.add(O);
+                        }
+                    } else {
+                        Poco::JSON::Object  O;
+                        O.set(uCentralProtocol::SERIALNUMBER,i);
+                        Objects.add(O);
+                    }
+                }
+                Poco::JSON::Object Answer;
+                Answer.set(RESTAPI::Protocol::AGES, Objects);
+                ReturnObject(Request, Answer, Response);
+                return;
+            } else {
+                auto DeviceType = GetParameter(RESTAPI::Protocol::DEVICETYPE, "");
+                auto Revision = GetParameter(RESTAPI::Protocol::REVISION, "");
+
+                if (DeviceType.empty() || Revision.empty()) {
+                    BadRequest(Request, Response, "Both deviceType and revision must be set.");
+                    return;
+                }
+
+                Revision = Storage::TrimRevision(Revision);
+
+                FMSObjects::FirmwareAgeDetails FA;
+                if (Storage()->ComputeFirmwareAge(DeviceType, Revision, FA)) {
+                    Poco::JSON::Object Answer;
+
+                    FA.to_json(Answer);
+                    ReturnObject(Request, Answer, Response);
+                    return;
+                } else {
+                    NotFound(Request, Response);
+                }
+            }
+            return;
+        } catch (const Poco::Exception &E) {
+            Logger_.log(E);
+        }
+        BadRequest(Request, Response);
+    }
+}
--- a/src/RESTAPI/RESTAPI_firmwareAgeHandler.h
+++ b/src/RESTAPI/RESTAPI_firmwareAgeHandler.h
@@ -5,24 +5,20 @@
 #ifndef UCENTRALFMS_RESTAPI_FIRMWAREAGEHANDLER_H
 #define UCENTRALFMS_RESTAPI_FIRMWAREAGEHANDLER_H

-#include "framework/MicroService.h"
+#include "RESTAPI_handler.h"

 namespace OpenWifi {
    class RESTAPI_firmwareAgeHandler : public RESTAPIHandler {
    public:
-        RESTAPI_firmwareAgeHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
+        RESTAPI_firmwareAgeHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, bool Internal)
                : RESTAPIHandler(bindings, L,
                                 std::vector<std::string>
                                         {Poco::Net::HTTPRequest::HTTP_GET,
                                          Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                          Server,
-                                          TransactionId,
                                          Internal) {}
        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/firmwareAge"};}
-        void DoGet()  final;
-        void DoDelete() final {};
-        void DoPost() final {};
-        void DoPut() final {};
+        void handleRequest(Poco::Net::HTTPServerRequest &request, Poco::Net::HTTPServerResponse &response) override;
+        void DoGet(Poco::Net::HTTPServerRequest &request, Poco::Net::HTTPServerResponse &response);
    };
 }

--- a/src/RESTAPI_firmwareHandler.cpp
+++ b/src/RESTAPI_firmwareHandler.cpp
@@ -0,0 +1,148 @@
+//
+// Created by stephane bourque on 2021-05-09.
+//
+
+#include "Poco/JSON/Parser.h"
+
+#include "RESTAPI_firmwareHandler.h"
+#include "StorageService.h"
+#include "Daemon.h"
+#include "uCentralProtocol.h"
+#include "RESTAPI_protocol.h"
+#include "RESTAPI_utils.h"
+
+namespace OpenWifi {
+    void RESTAPI_firmwareHandler::handleRequest(Poco::Net::HTTPServerRequest &Request,
+                                                Poco::Net::HTTPServerResponse &Response) {
+        if (!ContinueProcessing(Request, Response))
+            return;
+
+        if (!IsAuthorized(Request, Response))
+            return;
+
+        ParseParameters(Request);
+
+        if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET)
+            DoGet(Request, Response);
+        else if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_POST)
+            DoPost(Request, Response);
+        else if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_PUT)
+            DoPut(Request, Response);
+        else if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_DELETE)
+            DoDelete(Request, Response);
+        else
+            BadRequest(Request, Response);
+    }
+
+    void
+    RESTAPI_firmwareHandler::DoPost(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response) {
+        try {
+            Poco::JSON::Parser IncomingParser;
+            Poco::JSON::Object::Ptr Obj =
+                    IncomingParser.parse(Request.stream()).extract<Poco::JSON::Object::Ptr>();
+
+            FMSObjects::Firmware F;
+            if (!F.from_json(Obj)) {
+                BadRequest(Request, Response);
+                return;
+            }
+            F.id = Daemon()->CreateUUID();
+            if(Storage()->AddFirmware(F)) {
+                Poco::JSON::Object  Answer;
+                F.to_json(Answer);
+                ReturnObject(Request, Answer, Response);
+                return;
+            }
+        } catch (const Poco::Exception &E) {
+            Logger_.log(E);
+        }
+        BadRequest(Request, Response);
+    }
+
+    void
+    RESTAPI_firmwareHandler::DoGet(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response) {
+        try {
+            auto UUID = GetBinding(uCentralProtocol::ID, "");
+
+            if (!UUID.empty()) {
+                FMSObjects::Firmware F;
+                if (Storage()->GetFirmware(UUID, F)) {
+                    Poco::JSON::Object Object;
+                    F.to_json(Object);
+                    ReturnObject(Request, Object, Response);
+                } else {
+                    NotFound(Request, Response);
+                }
+                return;
+            }
+        } catch (const Poco::Exception &E) {
+            Logger_.log(E);
+        }
+        BadRequest(Request, Response);
+    }
+
+    void
+    RESTAPI_firmwareHandler::DoDelete(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response) {
+        try {
+            auto UUID = GetBinding(uCentralProtocol::ID, "");
+
+            if (!UUID.empty()) {
+                if (Storage()->DeleteFirmware(UUID)) {
+                    OK(Request, Response);
+                } else {
+                    NotFound(Request, Response);
+                }
+                return;
+            }
+
+        } catch (const Poco::Exception &E) {
+            Logger_.log(E);
+        }
+        BadRequest(Request, Response);
+    }
+
+    void RESTAPI_firmwareHandler::DoPut(Poco::Net::HTTPServerRequest &Request,
+                                        Poco::Net::HTTPServerResponse &Response) {
+        try {
+
+            auto UUID = GetBinding(uCentralProtocol::ID, "");
+            if(UUID.empty()) {
+                BadRequest(Request, Response, "UUID must be included in the request");
+                return;
+            }
+
+            Poco::JSON::Parser IncomingParser;
+            Poco::JSON::Object::Ptr Obj =
+                    IncomingParser.parse(Request.stream()).extract<Poco::JSON::Object::Ptr>();
+
+            FMSObjects::Firmware F;
+            if(!Storage()->GetFirmware(UUID, F)) {
+                NotFound(Request, Response);
+                return;
+            }
+
+            if(Obj->has(RESTAPI::Protocol::DESCRIPTION))
+                F.description = Obj->get(RESTAPI::Protocol::DESCRIPTION).toString();
+            if(Obj->has(RESTAPI::Protocol::NOTES)) {
+                SecurityObjects::NoteInfoVec NIV;
+                NIV = RESTAPI_utils::to_object_array<SecurityObjects::NoteInfo>(Obj->get(RESTAPI::Protocol::NOTES).toString());
+                for(auto const &i:NIV) {
+                    SecurityObjects::NoteInfo   ii{.created=(uint64_t)std::time(nullptr), .createdBy=UserInfo_.userinfo.email, .note=i.note};
+                    F.notes.push_back(ii);
+                }
+            }
+
+            if(Storage()->UpdateFirmware(UUID, F)) {
+                Poco::JSON::Object  Answer;
+                F.to_json(Answer);
+                ReturnObject(Request, Answer, Response);
+            } else {
+                BadRequest(Request, Response, "Could not update the firmware entry. Please review your changes.");
+            }
+            return;
+        } catch (const Poco::Exception &E) {
+            Logger_.log(E);
+        }
+        BadRequest(Request, Response);
+    }
+}
--- a/src/RESTAPI/RESTAPI_firmwareHandler.h
+++ b/src/RESTAPI/RESTAPI_firmwareHandler.h
@@ -5,12 +5,12 @@
 #ifndef UCENTRALFWS_RESTAPI_FIRMWAREHANDLER_H
 #define UCENTRALFWS_RESTAPI_FIRMWAREHANDLER_H

-#include "framework/MicroService.h"
+#include "RESTAPI_handler.h"

 namespace OpenWifi {
    class RESTAPI_firmwareHandler : public RESTAPIHandler {
    public:
-        RESTAPI_firmwareHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
+        RESTAPI_firmwareHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, bool Internal)
                : RESTAPIHandler(bindings, L,
                                 std::vector<std::string>
                                         {Poco::Net::HTTPRequest::HTTP_GET,
@@ -18,14 +18,13 @@ namespace OpenWifi {
                                          Poco::Net::HTTPRequest::HTTP_PUT,
                                          Poco::Net::HTTPRequest::HTTP_DELETE,
                                          Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                          Server,
-                                          TransactionId,
                                          Internal) {}
        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/firmware/{id}"};}
-        void DoGet()  final;
-        void DoDelete() final;
-        void DoPost() final;
-        void DoPut() final;
+        void handleRequest(Poco::Net::HTTPServerRequest &request, Poco::Net::HTTPServerResponse &response) override;
+        void DoPost(Poco::Net::HTTPServerRequest &request, Poco::Net::HTTPServerResponse &response);
+        void DoGet(Poco::Net::HTTPServerRequest &request, Poco::Net::HTTPServerResponse &response);
+        void DoDelete(Poco::Net::HTTPServerRequest &request, Poco::Net::HTTPServerResponse &response);
+        void DoPut(Poco::Net::HTTPServerRequest &request, Poco::Net::HTTPServerResponse &response);
    };
 }

--- a/src/RESTAPI_firmwaresHandler.cpp
+++ b/src/RESTAPI_firmwaresHandler.cpp
@@ -0,0 +1,123 @@
+//
+// Created by stephane bourque on 2021-05-09.
+//
+
+#include "RESTAPI_firmwaresHandler.h"
+#include "StorageService.h"
+#include "LatestFirmwareCache.h"
+#include "RESTAPI_protocol.h"
+
+namespace OpenWifi {
+    void RESTAPI_firmwaresHandler::handleRequest(Poco::Net::HTTPServerRequest &Request,
+                                                 Poco::Net::HTTPServerResponse &Response) {
+        if (!ContinueProcessing(Request, Response))
+            return;
+        if (!IsAuthorized(Request, Response))
+            return;
+
+        ParseParameters(Request);
+        if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET)
+            DoGet(Request, Response);
+        else
+            BadRequest(Request, Response);
+    }
+
+    void
+    RESTAPI_firmwaresHandler::DoGet(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response) {
+        try {
+
+            InitQueryBlock();
+            std::string DeviceType = GetParameter(RESTAPI::Protocol::DEVICETYPE, "");
+            bool IdOnly = GetBoolParameter(RESTAPI::Protocol::IDONLY, false);
+            bool RevisionSet = GetBoolParameter(RESTAPI::Protocol::REVISIONSET, false);
+            bool LatestOnly = GetBoolParameter(RESTAPI::Protocol::LATESTONLY, false);
+            bool DeviceSet = GetBoolParameter(RESTAPI::Protocol::DEVICESET, false);
+
+            if(DeviceSet) {
+                auto Revisions = LatestFirmwareCache()->GetDevices();
+                Poco::JSON::Array ObjectArray;
+                for (const auto &i:Revisions) {
+                    ObjectArray.add(i);
+                }
+                Poco::JSON::Object RetObj;
+                RetObj.set(RESTAPI::Protocol::DEVICETYPES, ObjectArray);
+                ReturnObject(Request, RetObj, Response);
+                return;
+            }
+
+            if(RevisionSet) {
+                auto Revisions = LatestFirmwareCache()->GetRevisions();
+                Poco::JSON::Array ObjectArray;
+                for (const auto &i:Revisions) {
+                    ObjectArray.add(i);
+                }
+                Poco::JSON::Object RetObj;
+                RetObj.set(RESTAPI::Protocol::REVISIONS, ObjectArray);
+                ReturnObject(Request, RetObj, Response);
+                return;
+            }
+
+            // special cases: if latestOnly and deviceType
+            if(!DeviceType.empty()) {
+                if(LatestOnly) {
+                    LatestFirmwareCacheEntry    Entry;
+                    if(!LatestFirmwareCache()->FindLatestFirmware(DeviceType,Entry)) {
+                        NotFound(Request, Response);
+                        return;
+                    }
+
+                    FMSObjects::Firmware    F;
+                    if(Storage()->GetFirmware(Entry.Id,F)) {
+                        Poco::JSON::Object  Answer;
+                        F.to_json(Answer);
+                        ReturnObject(Request, Answer, Response);
+                        return;
+                    }
+                    NotFound(Request, Response);
+                    return;
+                } else {
+                    std::vector<FMSObjects::Firmware> List;
+                    if (Storage()->GetFirmwares(QB_.Offset, QB_.Limit, DeviceType, List)) {
+                        Poco::JSON::Array ObjectArray;
+                        for (const auto &i:List) {
+                            if(IdOnly) {
+                                ObjectArray.add(i.id);
+                            } else {
+                                Poco::JSON::Object Obj;
+                                i.to_json(Obj);
+                                ObjectArray.add(Obj);
+                            }
+                        }
+                        Poco::JSON::Object RetObj;
+                        RetObj.set(RESTAPI::Protocol::FIRMWARES, ObjectArray);
+                        ReturnObject(Request, RetObj, Response);
+                        return;
+                    } else {
+                        NotFound(Request, Response);
+                        return;
+                    }
+                }
+            }
+            std::vector<FMSObjects::Firmware> List;
+            if (Storage()->GetFirmwares(QB_.Offset, QB_.Limit, DeviceType, List)) {
+                Poco::JSON::Array ObjectArray;
+                for (const auto &i:List) {
+                    if(IdOnly) {
+                        ObjectArray.add(i.id);
+                    } else {
+                        Poco::JSON::Object Obj;
+                        i.to_json(Obj);
+                        ObjectArray.add(Obj);
+                    }
+                }
+                Poco::JSON::Object RetObj;
+                RetObj.set(RESTAPI::Protocol::FIRMWARES, ObjectArray);
+                ReturnObject(Request, RetObj, Response);
+                return;
+            }
+        } catch (const Poco::Exception &E) {
+            Logger_.log(E);
+        }
+        BadRequest(Request, Response);
+    }
+}
--- a/src/RESTAPI/RESTAPI_firmwaresHandler.h
+++ b/src/RESTAPI/RESTAPI_firmwaresHandler.h
@@ -5,25 +5,21 @@
 #ifndef UCENTRALFWS_RESTAPI_FIRMWARESHANDLER_H
 #define UCENTRALFWS_RESTAPI_FIRMWARESHANDLER_H

-#include "framework/MicroService.h"
+#include "RESTAPI_handler.h"

 namespace OpenWifi {
    class RESTAPI_firmwaresHandler : public RESTAPIHandler {
    public:
-        RESTAPI_firmwaresHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
+        RESTAPI_firmwaresHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, bool Internal)
                : RESTAPIHandler(bindings, L,
                                 std::vector<std::string>
                                         {Poco::Net::HTTPRequest::HTTP_GET,
                                          Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                          Server,
-                                          TransactionId,
                                          Internal) {}

+        void handleRequest(Poco::Net::HTTPServerRequest &request, Poco::Net::HTTPServerResponse &response) override;
        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/firmwares"};}
-        void DoGet()  final;
-        void DoDelete() final {};
-        void DoPost() final {};
-        void DoPut() final {};
+        void DoGet(Poco::Net::HTTPServerRequest &request, Poco::Net::HTTPServerResponse &response);
    };
 }

--- a/src/RESTAPI_handler.cpp
+++ b/src/RESTAPI_handler.cpp
@@ -0,0 +1,407 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#include <cctype>
+#include <algorithm>
+#include <iostream>
+#include <iterator>
+#include <future>
+#include <chrono>
+
+#include "Poco/URI.h"
+#include "Poco/Net/OAuth20Credentials.h"
+
+#ifdef	TIP_SECURITY_SERVICE
+#include "AuthService.h"
+#else
+#include "AuthClient.h"
+#endif
+
+#include "RESTAPI_handler.h"
+#include "RESTAPI_protocol.h"
+#include "Utils.h"
+#include "Daemon.h"
+
+namespace OpenWifi {
+
+	bool RESTAPIHandler::ParseBindings(const std::string & Request, const std::list<const char *> & EndPoints, BindingMap &bindings) {
+		std::string Param, Value;
+
+		bindings.clear();
+		std::vector<std::string> PathItems = Utils::Split(Request, '/');
+
+		for(const auto &EndPoint:EndPoints) {
+			std::vector<std::string> ParamItems = Utils::Split(EndPoint, '/');
+			if (PathItems.size() != ParamItems.size())
+				continue;
+
+			bool Matched = true;
+			for (auto i = 0; i != PathItems.size() && Matched; i++) {
+				// std::cout << "PATH:" << PathItems[i] << "  ENDPOINT:" << ParamItems[i] << std::endl;
+				if (PathItems[i] != ParamItems[i]) {
+					if (ParamItems[i][0] == '{') {
+						auto ParamName = ParamItems[i].substr(1, ParamItems[i].size() - 2);
+						bindings[Poco::toLower(ParamName)] = PathItems[i];
+					} else {
+						Matched = false;
+					}
+				}
+			}
+			if(Matched)
+				return true;
+		}
+		return false;
+	}
+
+	void RESTAPIHandler::PrintBindings() {
+		for (auto &[key, value] : Bindings_)
+			std::cout << "Key = " << key << "  Value= " << value << std::endl;
+	}
+
+	void RESTAPIHandler::ParseParameters(Poco::Net::HTTPServerRequest &request) {
+
+		Poco::URI uri(request.getURI());
+		Parameters_ = uri.getQueryParameters();
+	}
+
+	static bool is_number(const std::string &s) {
+		return !s.empty() && std::all_of(s.begin(), s.end(), ::isdigit);
+	}
+
+	static bool is_bool(const std::string &s) {
+		if (s == "true" || s == "false")
+			return true;
+		return false;
+	}
+
+	uint64_t RESTAPIHandler::GetParameter(const std::string &Name, const uint64_t Default) {
+
+		for (const auto &i : Parameters_) {
+			if (i.first == Name) {
+				if (!is_number(i.second))
+					return Default;
+				return std::stoi(i.second);
+			}
+		}
+		return Default;
+	}
+
+	bool RESTAPIHandler::GetBoolParameter(const std::string &Name, bool Default) {
+
+		for (const auto &i : Parameters_) {
+			if (i.first == Name) {
+				if (!is_bool(i.second))
+					return Default;
+				return i.second == "true";
+			}
+		}
+		return Default;
+	}
+
+	std::string RESTAPIHandler::GetParameter(const std::string &Name, const std::string &Default) {
+		for (const auto &i : Parameters_) {
+			if (i.first == Name)
+				return i.second;
+		}
+		return Default;
+	}
+
+	const std::string &RESTAPIHandler::GetBinding(const std::string &Name, const std::string &Default) {
+		auto E = Bindings_.find(Poco::toLower(Name));
+		if (E == Bindings_.end())
+			return Default;
+
+		return E->second;
+	}
+
+	static std::string MakeList(const std::vector<std::string> &L) {
+		std::string Return;
+		for (const auto &i : L)
+			if (Return.empty())
+				Return = i;
+			else
+				Return += ", " + i;
+
+		return Return;
+	}
+
+	void RESTAPIHandler::AddCORS(Poco::Net::HTTPServerRequest &Request,
+								 Poco::Net::HTTPServerResponse &Response) {
+		auto Origin = Request.find("Origin");
+		if (Origin != Request.end()) {
+			Response.set("Access-Control-Allow-Origin", Origin->second);
+			Response.set("Vary", "Origin");
+		} else {
+			Response.set("Access-Control-Allow-Origin", "*");
+		}
+		Response.set("Access-Control-Allow-Headers", "*");
+		Response.set("Access-Control-Allow-Methods", MakeList(Methods_));
+		Response.set("Access-Control-Max-Age", "86400");
+	}
+
+	void RESTAPIHandler::SetCommonHeaders(Poco::Net::HTTPServerResponse &Response, bool CloseConnection) {
+		Response.setVersion(Poco::Net::HTTPMessage::HTTP_1_1);
+		Response.setChunkedTransferEncoding(true);
+		Response.setContentType("application/json");
+		if(CloseConnection) {
+			Response.set("Connection", "close");
+			Response.setKeepAlive(false);
+		} else {
+			Response.setKeepAlive(true);
+			Response.set("Connection", "Keep-Alive");
+			Response.set("Keep-Alive", "timeout=5, max=1000");
+		}
+	}
+
+	void RESTAPIHandler::ProcessOptions(Poco::Net::HTTPServerRequest &Request,
+										Poco::Net::HTTPServerResponse &Response) {
+		AddCORS(Request, Response);
+		SetCommonHeaders(Response);
+		Response.setContentLength(0);
+		Response.set("Access-Control-Allow-Credentials", "true");
+		Response.setStatus(Poco::Net::HTTPResponse::HTTP_OK);
+		Response.set("Vary", "Origin, Access-Control-Request-Headers, Access-Control-Request-Method");
+		/*	std::cout << "RESPONSE:" << std::endl;
+			for(const auto &[f,s]:Response)
+				std::cout << "First: " << f << " second:" << s << std::endl;
+		*/
+		Response.send();
+	}
+
+	void RESTAPIHandler::PrepareResponse(Poco::Net::HTTPServerRequest &Request,
+										 Poco::Net::HTTPServerResponse &Response,
+										 Poco::Net::HTTPResponse::HTTPStatus Status,
+										 bool CloseConnection) {
+		Response.setStatus(Status);
+		AddCORS(Request, Response);
+		SetCommonHeaders(Response, CloseConnection);
+	}
+
+	void RESTAPIHandler::BadRequest(Poco::Net::HTTPServerRequest &Request,
+									Poco::Net::HTTPServerResponse &Response,
+									const std::string & Reason) {
+		PrepareResponse(Request, Response, Poco::Net::HTTPResponse::HTTP_BAD_REQUEST);
+		Poco::JSON::Object	ErrorObject;
+		ErrorObject.set("ErrorCode",500);
+		ErrorObject.set("ErrorDetails",Request.getMethod());
+		ErrorObject.set("ErrorDescription",Reason.empty() ? "Command is missing parameters or wrong values." : Reason) ;
+		std::ostream &Answer = Response.send();
+		Poco::JSON::Stringifier::stringify(ErrorObject, Answer);
+	}
+
+	void RESTAPIHandler::UnAuthorized(Poco::Net::HTTPServerRequest &Request,
+									  Poco::Net::HTTPServerResponse &Response,
+                                      const std::string & Reason) {
+		PrepareResponse(Request, Response, Poco::Net::HTTPResponse::HTTP_FORBIDDEN);
+		Poco::JSON::Object	ErrorObject;
+		ErrorObject.set("ErrorCode",403);
+		ErrorObject.set("ErrorDetails",Request.getMethod());
+		ErrorObject.set("ErrorDescription",Reason.empty() ? "No access allowed." : Reason) ;
+		std::ostream &Answer = Response.send();
+		Poco::JSON::Stringifier::stringify(ErrorObject, Answer);
+	}
+
+	void RESTAPIHandler::NotFound(Poco::Net::HTTPServerRequest &Request,
+								  Poco::Net::HTTPServerResponse &Response) {
+		PrepareResponse(Request, Response, Poco::Net::HTTPResponse::HTTP_NOT_FOUND);
+		Poco::JSON::Object	ErrorObject;
+		ErrorObject.set("ErrorCode",404);
+		ErrorObject.set("ErrorDetails",Request.getMethod());
+		ErrorObject.set("ErrorDescription","This resource does not exist.");
+		std::ostream &Answer = Response.send();
+		Poco::JSON::Stringifier::stringify(ErrorObject, Answer);
+	}
+
+	void RESTAPIHandler::OK(Poco::Net::HTTPServerRequest &Request,
+							Poco::Net::HTTPServerResponse &Response) {
+		PrepareResponse(Request, Response);
+		if(	Request.getMethod()==Poco::Net::HTTPRequest::HTTP_DELETE ||
+			Request.getMethod()==Poco::Net::HTTPRequest::HTTP_OPTIONS) {
+			Response.send();
+		} else {
+			Poco::JSON::Object ErrorObject;
+			ErrorObject.set("Code", 0);
+			ErrorObject.set("Operation", Request.getMethod());
+			ErrorObject.set("Details", "Command completed.");
+			std::ostream &Answer = Response.send();
+			Poco::JSON::Stringifier::stringify(ErrorObject, Answer);
+		}
+	}
+
+	void RESTAPIHandler::SendFile(Poco::File & File, const std::string & UUID, Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response) {
+		Response.set("Content-Type","application/octet-stream");
+		Response.set("Content-Disposition", "attachment; filename=" + UUID );
+		Response.set("Content-Transfer-Encoding","binary");
+		Response.set("Accept-Ranges", "bytes");
+		Response.set("Cache-Control", "private");
+		Response.set("Pragma", "private");
+		Response.set("Expires", "Mon, 26 Jul 2027 05:00:00 GMT");
+		Response.set("Content-Length", std::to_string(File.getSize()));
+		AddCORS(Request, Response);
+		Response.sendFile(File.path(),"application/octet-stream");
+	}
+
+    void RESTAPIHandler::SendFile(Poco::File & File, Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response) {
+        Poco::Path  P(File.path());
+        auto MT = Utils::FindMediaType(File);
+        if(MT.Encoding==Utils::BINARY) {
+            Response.set("Content-Transfer-Encoding","binary");
+            Response.set("Accept-Ranges", "bytes");
+        }
+        Response.set("Cache-Control", "private");
+        Response.set("Pragma", "private");
+        Response.set("Expires", "Mon, 26 Jul 2027 05:00:00 GMT");
+        AddCORS(Request, Response);
+        Response.sendFile(File.path(),MT.ContentType);
+    }
+
+    void RESTAPIHandler::SendFile(Poco::TemporaryFile &TempAvatar, const std::string &Type, const std::string & Name, Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response) {
+        auto MT = Utils::FindMediaType(Name);
+        if(MT.Encoding==Utils::BINARY) {
+            Response.set("Content-Transfer-Encoding","binary");
+            Response.set("Accept-Ranges", "bytes");
+        }
+        Response.set("Content-Disposition", "attachment; filename=" + Name );
+        Response.set("Accept-Ranges", "bytes");
+        Response.set("Cache-Control", "private");
+        Response.set("Pragma", "private");
+        Response.set("Expires", "Mon, 26 Jul 2027 05:00:00 GMT");
+        AddCORS(Request, Response);
+        Response.sendFile(TempAvatar.path(),MT.ContentType);
+	}
+
+    void RESTAPIHandler::SendHTMLFileBack(Poco::File & File,
+                          Poco::Net::HTTPServerRequest &Request,
+                          Poco::Net::HTTPServerResponse &Response ,
+                          const Types::StringPairVec & FormVars) {
+        Response.set("Pragma", "private");
+        Response.set("Expires", "Mon, 26 Jul 2027 05:00:00 GMT");
+        Response.set("Content-Length", std::to_string(File.getSize()));
+        AddCORS(Request, Response);
+        auto FormContent = Utils::LoadFile(File.path());
+        Utils::ReplaceVariables(FormContent, FormVars);
+        Response.setChunkedTransferEncoding(true);
+        Response.setContentType("text/html");
+        std::ostream& ostr = Response.send();
+        ostr << FormContent;
+	}
+
+    void RESTAPIHandler::ReturnStatus(Poco::Net::HTTPServerRequest &Request,
+									  Poco::Net::HTTPServerResponse &Response,
+									  Poco::Net::HTTPResponse::HTTPStatus Status,
+									  bool CloseConnection) {
+		PrepareResponse(Request, Response, Status, CloseConnection);
+		if(Status == Poco::Net::HTTPResponse::HTTP_NO_CONTENT) {
+			Response.setContentLength(0);
+			Response.erase("Content-Type");
+			Response.setChunkedTransferEncoding(false);
+		}
+		Response.send();
+	}
+
+	bool RESTAPIHandler::ContinueProcessing(Poco::Net::HTTPServerRequest &Request,
+											Poco::Net::HTTPServerResponse &Response) {
+		if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_OPTIONS) {
+			ProcessOptions(Request, Response);
+			return false;
+		} else if (std::find(Methods_.begin(), Methods_.end(), Request.getMethod()) == Methods_.end()) {
+			BadRequest(Request, Response);
+			return false;
+		}
+
+		return true;
+	}
+
+	bool RESTAPIHandler::IsAuthorized(Poco::Net::HTTPServerRequest &Request,
+									  Poco::Net::HTTPServerResponse &Response) {
+	    if(Internal_) {
+	        return Daemon()->IsValidAPIKEY(Request);
+	    } else {
+            if (SessionToken_.empty()) {
+                try {
+                    Poco::Net::OAuth20Credentials Auth(Request);
+
+                    if (Auth.getScheme() == "Bearer") {
+                        SessionToken_ = Auth.getBearerToken();
+                    }
+                } catch (const Poco::Exception &E) {
+                    Logger_.log(E);
+                }
+            }
+#ifdef    TIP_SECURITY_SERVICE
+            if (AuthService()->IsAuthorized(Request, SessionToken_, UserInfo_)) {
+#else
+            if (AuthClient()->IsAuthorized(Request, SessionToken_, UserInfo_)) {
+#endif
+                return true;
+            } else {
+                UnAuthorized(Request, Response);
+            }
+            return false;
+        }
+	}
+
+/*
+	bool RESTAPIHandler::ValidateAPIKey(Poco::Net::HTTPServerRequest &Request,
+										Poco::Net::HTTPServerResponse &Response) {
+		auto Key = Request.get("X-API-KEY", "");
+
+		if (Key.empty())
+			return false;
+
+		return true;
+	}
+*/
+	void RESTAPIHandler::ReturnObject(Poco::Net::HTTPServerRequest &Request, Poco::JSON::Object &Object,
+									  Poco::Net::HTTPServerResponse &Response) {
+		PrepareResponse(Request, Response);
+		std::ostream &Answer = Response.send();
+		Poco::JSON::Stringifier::stringify(Object, Answer);
+	}
+
+	bool RESTAPIHandler::InitQueryBlock() {
+		QB_.SerialNumber = GetParameter(RESTAPI::Protocol::SERIALNUMBER, "");
+		QB_.StartDate = GetParameter(RESTAPI::Protocol::STARTDATE, 0);
+		QB_.EndDate = GetParameter(RESTAPI::Protocol::ENDDATE, 0);
+		QB_.Offset = GetParameter(RESTAPI::Protocol::OFFSET, 1);
+		QB_.Limit = GetParameter(RESTAPI::Protocol::LIMIT, 100);
+		QB_.Filter = GetParameter(RESTAPI::Protocol::FILTER, "");
+		QB_.Select = GetParameter(RESTAPI::Protocol::SELECT, "");
+		QB_.Lifetime = GetBoolParameter(RESTAPI::Protocol::LIFETIME,false);
+		QB_.LogType = GetParameter(RESTAPI::Protocol::LOGTYPE,0);
+		QB_.LastOnly = GetBoolParameter(RESTAPI::Protocol::LASTONLY,false);
+		QB_.Newest = GetBoolParameter(RESTAPI::Protocol::NEWEST,false);
+
+		if(QB_.Offset<1) return false;
+		return true;
+	}
+
+	[[nodiscard]] uint64_t RESTAPIHandler::Get(const char *Parameter,const Poco::JSON::Object::Ptr &Obj, uint64_t Default){
+		if(Obj->has(Parameter))
+			return Obj->get(Parameter);
+		return Default;
+	}
+
+	[[nodiscard]] std::string RESTAPIHandler::GetS(const char *Parameter,const Poco::JSON::Object::Ptr &Obj, const std::string & Default){
+		if(Obj->has(Parameter))
+			return Obj->get(Parameter).toString();
+		return Default;
+	}
+
+	[[nodiscard]] bool RESTAPIHandler::GetB(const char *Parameter,const Poco::JSON::Object::Ptr &Obj, bool Default){
+		if(Obj->has(Parameter))
+			return Obj->get(Parameter).toString()=="true";
+		return Default;
+	}
+
+	[[nodiscard]] uint64_t RESTAPIHandler::GetWhen(const Poco::JSON::Object::Ptr &Obj) {
+		return RESTAPIHandler::Get(RESTAPI::Protocol::WHEN, Obj);
+	}
+
+
+}
--- a/src/RESTAPI_handler.h
+++ b/src/RESTAPI_handler.h
@@ -0,0 +1,215 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#ifndef UCENTRAL_RESTAPI_HANDLER_H
+#define UCENTRAL_RESTAPI_HANDLER_H
+
+#include "Poco/URI.h"
+#include "Poco/Net/HTTPRequestHandler.h"
+#include "Poco/Net/HTTPRequestHandlerFactory.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Net/HTTPServerResponse.h"
+#include "Poco/Net/NetException.h"
+#include "Poco/Net/PartHandler.h"
+
+#include "Poco/Logger.h"
+#include "Poco/File.h"
+#include "Poco/TemporaryFile.h"
+#include "Poco/JSON/Object.h"
+#include "Poco/CountingStream.h"
+#include "Poco/NullStream.h"
+
+#include "RESTAPI_SecurityObjects.h"
+
+namespace OpenWifi {
+
+    class RESTAPI_PartHandler: public Poco::Net::PartHandler
+    {
+    public:
+        RESTAPI_PartHandler():
+                _length(0)
+        {
+        }
+
+        void handlePart(const Poco::Net::MessageHeader& header, std::istream& stream) override
+        {
+            _type = header.get("Content-Type", "(unspecified)");
+            if (header.has("Content-Disposition"))
+            {
+                std::string disp;
+                Poco::Net::NameValueCollection params;
+                Poco::Net::MessageHeader::splitParameters(header["Content-Disposition"], disp, params);
+                _name = params.get("name", "(unnamed)");
+                _fileName = params.get("filename", "(unnamed)");
+            }
+
+            Poco::CountingInputStream istr(stream);
+            Poco::NullOutputStream ostr;
+            Poco::StreamCopier::copyStream(istr, ostr);
+            _length = (int)istr.chars();
+        }
+
+        [[nodiscard]] int length() const
+        {
+            return _length;
+        }
+
+        [[nodiscard]] const std::string& name() const
+        {
+            return _name;
+        }
+
+        [[nodiscard]] const std::string& fileName() const
+        {
+            return _fileName;
+        }
+
+        [[nodiscard]] const std::string& contentType() const
+        {
+            return _type;
+        }
+
+    private:
+        int _length;
+        std::string _type;
+        std::string _name;
+        std::string _fileName;
+    };
+
+    class RESTAPIHandler : public Poco::Net::HTTPRequestHandler {
+	  public:
+		struct QueryBlock {
+			uint64_t StartDate = 0 , EndDate = 0 , Offset = 0 , Limit = 0, LogType = 0 ;
+			std::string SerialNumber, Filter, Select;
+			bool Lifetime=false, LastOnly=false, Newest=false;
+		};
+
+		typedef std::map<std::string, std::string> BindingMap;
+
+		RESTAPIHandler(BindingMap map, Poco::Logger &l, std::vector<std::string> Methods, bool Internal=false)
+			: Bindings_(std::move(map)), Logger_(l), Methods_(std::move(Methods)), Internal_(Internal) {}
+
+		static bool ParseBindings(const std::string & Request, const std::list<const char *> & EndPoints, BindingMap &Keys);
+		void PrintBindings();
+		void ParseParameters(Poco::Net::HTTPServerRequest &request);
+
+		void AddCORS(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &response);
+	 	void SetCommonHeaders(Poco::Net::HTTPServerResponse &response, bool CloseConnection=false);
+		void ProcessOptions(Poco::Net::HTTPServerRequest &Request,
+							Poco::Net::HTTPServerResponse &response);
+		void
+		PrepareResponse(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &response,
+						Poco::Net::HTTPResponse::HTTPStatus Status = Poco::Net::HTTPResponse::HTTP_OK,
+						bool CloseConnection = false);
+		bool ContinueProcessing(Poco::Net::HTTPServerRequest &Request,
+								Poco::Net::HTTPServerResponse &Response);
+
+		bool IsAuthorized(Poco::Net::HTTPServerRequest &Request,
+						  Poco::Net::HTTPServerResponse &Response);
+/*		bool ValidateAPIKey(Poco::Net::HTTPServerRequest &Request,
+							Poco::Net::HTTPServerResponse &Response); */
+
+		uint64_t GetParameter(const std::string &Name, uint64_t Default);
+		std::string GetParameter(const std::string &Name, const std::string &Default);
+		bool GetBoolParameter(const std::string &Name, bool Default);
+
+		void BadRequest(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response, const std::string &Reason = "");
+		void UnAuthorized(Poco::Net::HTTPServerRequest &Request,
+						  Poco::Net::HTTPServerResponse &Response, const std::string &Reason = "");
+		void ReturnObject(Poco::Net::HTTPServerRequest &Request, Poco::JSON::Object &Object,
+						  Poco::Net::HTTPServerResponse &Response);
+		void NotFound(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response);
+		void OK(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response);
+		void ReturnStatus(Poco::Net::HTTPServerRequest &Request,
+						  Poco::Net::HTTPServerResponse &Response,
+						  Poco::Net::HTTPResponse::HTTPStatus Status,
+						  bool CloseConnection=false);
+		void SendFile(Poco::File & File, const std::string & UUID,
+					  Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response);
+		void SendHTMLFileBack(Poco::File & File,
+                              Poco::Net::HTTPServerRequest &Request,
+                              Poco::Net::HTTPServerResponse &Response ,
+                              const Types::StringPairVec & FormVars);
+        void SendFile(Poco::TemporaryFile &TempAvatar, const std::string &Type, const std::string & Name, Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response);
+
+        void SendFile(Poco::File & File, Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response);
+
+        const std::string &GetBinding(const std::string &Name, const std::string &Default);
+		bool InitQueryBlock();
+
+		[[nodiscard]] static uint64_t Get(const char *Parameter,const Poco::JSON::Object::Ptr &Obj, uint64_t Default=0);
+		[[nodiscard]] static std::string GetS(const char *Parameter,const Poco::JSON::Object::Ptr &Obj, const std::string & Default="");
+		[[nodiscard]] static bool GetB(const char *Parameter,const Poco::JSON::Object::Ptr &Obj, bool Default=false);
+		[[nodiscard]] static uint64_t GetWhen(const Poco::JSON::Object::Ptr &Obj);
+
+	  protected:
+		BindingMap 					Bindings_;
+		Poco::URI::QueryParameters 	Parameters_;
+		Poco::Logger 				&Logger_;
+		std::string 				SessionToken_;
+		SecurityObjects::UserInfoAndPolicy 	UserInfo_;
+		std::vector<std::string> 	Methods_;
+		QueryBlock					QB_;
+		bool                        Internal_=false;
+	};
+
+	class RESTAPI_UnknownRequestHandler : public RESTAPIHandler {
+	  public:
+		RESTAPI_UnknownRequestHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L)
+			: RESTAPIHandler(bindings, L, std::vector<std::string>{}) {}
+		void handleRequest(Poco::Net::HTTPServerRequest &Request,
+						   Poco::Net::HTTPServerResponse &Response) override {
+			if (!IsAuthorized(Request, Response))
+				return;
+			BadRequest(Request, Response, "Unknown API endpoint");
+		}
+	};
+
+	template<class T>
+	constexpr auto test_has_PathName_method(T*)
+	-> decltype(  T::PathName() , std::true_type{} )
+	{
+		return std::true_type{};
+	}
+	constexpr auto test_has_PathName_method(...) -> std::false_type
+	{
+		return std::false_type{};
+	}
+
+	template<typename T, typename... Args>
+	RESTAPIHandler * RESTAPI_Router(const std::string & RequestedPath, RESTAPIHandler::BindingMap &Bindings, Poco::Logger & Logger ) {
+		static_assert(test_has_PathName_method((T*)nullptr), "Class must have a static PathName() method.");
+		if(RESTAPIHandler::ParseBindings(RequestedPath,T::PathName(),Bindings)) {
+			return new T(Bindings, Logger, false);
+		}
+
+		if constexpr (sizeof...(Args) == 0) {
+			return new RESTAPI_UnknownRequestHandler(Bindings,Logger);
+		} else {
+			return RESTAPI_Router<Args...>(RequestedPath, Bindings, Logger);
+		}
+	}
+
+    template<typename T, typename... Args>
+    RESTAPIHandler * RESTAPI_Router_I(const std::string & RequestedPath, RESTAPIHandler::BindingMap &Bindings, Poco::Logger & Logger) {
+        static_assert(test_has_PathName_method((T*)nullptr), "Class must have a static PathName() method.");
+        if(RESTAPIHandler::ParseBindings(RequestedPath,T::PathName(),Bindings)) {
+            return new T(Bindings, Logger, true);
+        }
+
+        if constexpr (sizeof...(Args) == 0) {
+            return new RESTAPI_UnknownRequestHandler(Bindings,Logger);
+        } else {
+            return RESTAPI_Router_I<Args...>(RequestedPath, Bindings, Logger);
+        }
+    }
+
+
+}
+
+#endif //UCENTRAL_RESTAPI_HANDLER_H
--- a/src/RESTAPI_historyHandler.cpp
+++ b/src/RESTAPI_historyHandler.cpp
@@ -0,0 +1,81 @@
+//
+// Created by stephane bourque on 2021-07-13.
+//
+
+#include "RESTAPI_historyHandler.h"
+
+//
+// Created by stephane bourque on 2021-05-09.
+//
+
+#include "RESTAPI_historyHandler.h"
+#include "StorageService.h"
+#include "RESTAPI_protocol.h"
+
+namespace OpenWifi {
+    void RESTAPI_historyHandler::handleRequest(Poco::Net::HTTPServerRequest &Request,
+                                               Poco::Net::HTTPServerResponse &Response) {
+        if (!ContinueProcessing(Request, Response))
+            return;
+        if (!IsAuthorized(Request, Response))
+            return;
+        ParseParameters(Request);
+        if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET)
+            DoGet(Request, Response);
+        else if(Request.getMethod() == Poco::Net::HTTPRequest::HTTP_DELETE)
+            DoDelete(Request, Response);
+        else
+            BadRequest(Request, Response);
+    }
+
+    void
+    RESTAPI_historyHandler::DoGet(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response) {
+        try {
+            auto SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER, "");
+
+            if (!SerialNumber.empty()) {
+                FMSObjects::RevisionHistoryEntryVec H;
+                InitQueryBlock();
+                if (Storage()->GetHistory(SerialNumber, QB_.Offset, QB_.Limit, H)) {
+                    Poco::JSON::Array A;
+                    for (auto const &i:H) {
+                        Poco::JSON::Object O;
+                        i.to_json(O);
+                        A.add(O);
+                    }
+                    Poco::JSON::Object Answer;
+                    Answer.set(RESTAPI::Protocol::HISTORY, A);
+                    ReturnObject(Request, Answer, Response);
+                } else {
+                    NotFound(Request, Response);
+                }
+                return;
+            }
+        } catch (const Poco::Exception &E) {
+            Logger_.log(E);
+        }
+        BadRequest(Request, Response);
+    }
+
+    void RESTAPI_historyHandler::DoDelete(Poco::Net::HTTPServerRequest &Request,
+                                          Poco::Net::HTTPServerResponse &Response) {
+        try {
+            auto SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER, "");
+            auto Id = GetParameter(RESTAPI::Protocol::ID, "");
+            if (SerialNumber.empty() || Id.empty()) {
+                BadRequest(Request, Response, "SerialNumber and Id must not be empty.");
+                return;
+            }
+
+            if (!Storage()->DeleteHistory(SerialNumber, Id)) {
+                OK(Request, Response);
+                return;
+            }
+            NotFound(Request, Response);
+            return;
+        } catch (const Poco::Exception &E) {
+            Logger_.log(E);
+        }
+        BadRequest(Request, Response);
+    }
+}
--- a/src/RESTAPI/RESTAPI_historyHandler.h
+++ b/src/RESTAPI/RESTAPI_historyHandler.h
@@ -6,25 +6,22 @@
 #define UCENTRALFMS_RESTAPI_HISTORYHANDLER_H


-#include "framework/MicroService.h"
+#include "RESTAPI_handler.h"

 namespace OpenWifi {
    class RESTAPI_historyHandler : public RESTAPIHandler {
    public:
-        RESTAPI_historyHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
+        RESTAPI_historyHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, bool Internal)
                : RESTAPIHandler(bindings, L,
                                 std::vector<std::string>
                                         {Poco::Net::HTTPRequest::HTTP_GET,
                                          Poco::Net::HTTPRequest::HTTP_DELETE,
                                          Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                          Server,
-                                          TransactionId,
                                          Internal) {}
        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/revisionHistory/{serialNumber}"};}
-        void DoGet()  final;
-        void DoDelete() final;
-        void DoPost() final {};
-        void DoPut() final {};
+        void handleRequest(Poco::Net::HTTPServerRequest &request, Poco::Net::HTTPServerResponse &response) override;
+        void DoGet(Poco::Net::HTTPServerRequest &request, Poco::Net::HTTPServerResponse &response);
+        void DoDelete(Poco::Net::HTTPServerRequest &request, Poco::Net::HTTPServerResponse &response);
    };
 }

--- a/src/framework/RESTAPI_protocol.h
+++ b/src/framework/RESTAPI_protocol.h
@@ -6,7 +6,8 @@
 //	Arilia Wireless Inc.
 //

-#pragma once
+#ifndef UCENTRALGW_RESTAPI_PROTOCOL_H
+#define UCENTRALGW_RESTAPI_PROTOCOL_H

 namespace OpenWifi::RESTAPI::Protocol {
 	static const char * CAPABILITIES = "capabilities";
@@ -68,13 +69,7 @@ namespace OpenWifi::RESTAPI::Protocol {
 	static const char * COMMANDUUID = "commandUUID";
 	static const char * FIRMWARES = "firmwares";
 	static const char * TOPIC = "topic";
-	static const char * HOST = "host";
-	static const char * OS = "os";
-	static const char * HOSTNAME = "hostname";
-	static const char * PROCESSORS = "processors";
 	static const char * REASON = "reason";
-	static const char * RELOAD = "reload";
-	static const char * SUBSYSTEMS = "subsystems";
 	static const char * FILEUUID = "uuid";
 	static const char * USERID = "userId";
 	static const char * PASSWORD = "password";
@@ -84,13 +79,11 @@ namespace OpenWifi::RESTAPI::Protocol {
 	static const char * GETSUBSYSTEMNAMES = "getsubsystemnames";
 	static const char * GETLOGLEVELNAMES = "getloglevelnames";
 	static const char * STATS = "stats";
-	static const char * PING = "ping";
 	static const char * PARAMETERS = "parameters";
 	static const char * VALUE = "value";
 	static const char * LASTONLY = "lastOnly";
 	static const char * NEWEST = "newest";
 	static const char * ACTIVESCAN = "activeScan";
-	static const char * OVERRIDEDFS = "override_dfs";
 	static const char * LIST = "list";
 	static const char * TAG = "tag";
 	static const char * TAGLIST = "tagList";
@@ -114,7 +107,6 @@ namespace OpenWifi::RESTAPI::Protocol {

    static const char * NEWPASSWORD = "newPassword";
    static const char * USERS = "users";
-    static const char * WITHEXTENDEDINFO = "withExtendedInfo";

    static const char * ERRORTEXT = "errorText";
    static const char * ERRORCODE = "errorCode";
@@ -129,11 +121,8 @@ namespace OpenWifi::RESTAPI::Protocol {
    static const char * ACCESSPOLICY = "accessPolicy";
    static const char * PASSWORDPOLICY = "passwordPolicy";
    static const char * FORGOTPASSWORD = "forgotPassword";
-    static const char * RESENDMFACODE = "resendMFACode";
-    static const char * COMPLETEMFACHALLENGE = "completeMFAChallenge";
    static const char * ME = "me";
-    static const char * TELEMETRY = "telemetry";
-    static const char * INTERVAL = "interval";
-    static const char * UI = "UI";

 }
+
+#endif // UCENTRALGW_RESTAPI_PROTOCOL_H
--- a/src/RESTAPI_server.cpp
+++ b/src/RESTAPI_server.cpp
@@ -0,0 +1,83 @@
+//
+// Created by stephane bourque on 2021-05-09.
+//
+
+#include "Poco/URI.h"
+
+#include "RESTAPI_server.h"
+#include "Utils.h"
+#include "RESTAPI_handler.h"
+
+#include "RESTAPI_firmwareHandler.h"
+#include "RESTAPI_firmwaresHandler.h"
+#include "RESTAPI_system_command.h"
+#include "RESTAPI_firmwareAgeHandler.h"
+#include "RESTAPI_connectedDeviceHandler.h"
+#include "RESTAPI_connectedDevicesHandler.h"
+#include "RESTAPI_historyHandler.h"
+#include "RESTAPI_deviceReportHandler.h"
+
+namespace OpenWifi {
+
+    class RESTAPI_server *RESTAPI_server::instance_ = nullptr;
+
+    RESTAPI_server::RESTAPI_server() noexcept:
+            SubSystemServer("RESTAPIServer", "RESTAPIServer", "ucentralfws.restapi")
+    {
+    }
+
+    int RESTAPI_server::Start() {
+        Logger_.information("Starting.");
+
+        for(const auto & Svr: ConfigServersList_) {
+            Logger_.information(Poco::format("Starting: %s:%s Keyfile:%s CertFile: %s", Svr.Address(), std::to_string(Svr.Port()),
+                                             Svr.KeyFile(),Svr.CertFile()));
+
+            auto Sock{Svr.CreateSecureSocket(Logger_)};
+
+            Svr.LogCert(Logger_);
+            if(!Svr.RootCA().empty())
+                Svr.LogCas(Logger_);
+
+            auto Params = new Poco::Net::HTTPServerParams;
+            Params->setMaxThreads(50);
+            Params->setMaxQueued(200);
+            Params->setKeepAlive(true);
+
+            auto NewServer = std::make_unique<Poco::Net::HTTPServer>(new RequestHandlerFactory, Pool_, Sock, Params);
+            NewServer->start();
+            RESTServers_.push_back(std::move(NewServer));
+        }
+
+        return 0;
+    }
+
+    Poco::Net::HTTPRequestHandler *RequestHandlerFactory::createRequestHandler(const Poco::Net::HTTPServerRequest & Request) {
+
+        Logger_.debug(Poco::format("REQUEST(%s): %s %s", Utils::FormatIPv6(Request.clientAddress().toString()), Request.getMethod(), Request.getURI()));
+
+        Poco::URI uri(Request.getURI());
+        auto *Path = uri.getPath().c_str();
+        RESTAPIHandler::BindingMap Bindings;
+
+        // std::cout << "Path: " << Request.getURI() << std::endl;
+
+        return  RESTAPI_Router<
+                RESTAPI_firmwaresHandler,
+                RESTAPI_firmwareHandler,
+                RESTAPI_system_command,
+                RESTAPI_firmwareAgeHandler,
+                RESTAPI_connectedDevicesHandler,
+                RESTAPI_connectedDeviceHandler,
+                RESTAPI_historyHandler,
+                RESTAPI_deviceReportHandler
+                >(Path,Bindings,Logger_);
+    }
+
+    void RESTAPI_server::Stop() {
+        Logger_.information("Stopping ");
+        for( const auto & svr : RESTServers_ )
+            svr->stop();
+    }
+
+}  // namespace
--- a/src/RESTAPI_server.h
+++ b/src/RESTAPI_server.h
@@ -0,0 +1,51 @@
+//
+// Created by stephane bourque on 2021-05-09.
+//
+
+#ifndef UCENTRALFWS_RESTAPI_SERVER_H
+#define UCENTRALFWS_RESTAPI_SERVER_H
+
+#include "Poco/Net/HTTPServer.h"
+#include "Poco/Net/HTTPRequestHandler.h"
+#include "Poco/Net/HTTPRequestHandlerFactory.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Net/NetException.h"
+
+#include "SubSystemServer.h"
+
+namespace OpenWifi {
+
+    class RESTAPI_server : public SubSystemServer {
+
+    public:
+        RESTAPI_server() noexcept;
+
+        static RESTAPI_server *instance() {
+            if (instance_ == nullptr) {
+                instance_ = new RESTAPI_server;
+            }
+            return instance_;
+        }
+        int Start() override;
+        void Stop() override;
+
+    private:
+        static RESTAPI_server *instance_;
+        std::vector<std::unique_ptr<Poco::Net::HTTPServer>>   RESTServers_;
+        Poco::ThreadPool	Pool_;
+    };
+
+    inline RESTAPI_server * RESTAPI_server() { return RESTAPI_server::instance(); };
+
+    class RequestHandlerFactory : public Poco::Net::HTTPRequestHandlerFactory {
+        public:
+            RequestHandlerFactory() :
+                    Logger_(RESTAPI_server::instance()->Logger()){}
+
+            Poco::Net::HTTPRequestHandler *createRequestHandler(const Poco::Net::HTTPServerRequest &request) override;
+        private:
+            Poco::Logger    & Logger_;
+    };
+}
+
+#endif //UCENTRALFWS_RESTAPI_SERVER_H
--- a/src/RESTAPI_system_command.cpp
+++ b/src/RESTAPI_system_command.cpp
@@ -0,0 +1,132 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+#include "RESTAPI_system_command.h"
+
+#include "Poco/Exception.h"
+#include "Poco/JSON/Parser.h"
+
+#include "Daemon.h"
+#include "RESTAPI_protocol.h"
+
+namespace OpenWifi {
+	void RESTAPI_system_command::handleRequest(Poco::Net::HTTPServerRequest &Request,
+											   Poco::Net::HTTPServerResponse &Response) {
+
+		if (!ContinueProcessing(Request, Response))
+			return;
+
+		if (!IsAuthorized(Request, Response))
+			return;
+
+		if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_POST)
+			DoPost(Request, Response);
+		else if(Request.getMethod()==Poco::Net::HTTPRequest::HTTP_GET)
+			DoGet(Request, Response);
+		else
+            BadRequest(Request, Response, "Unsupported method.");
+	}
+
+	void RESTAPI_system_command::DoPost(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response) {
+		try {
+			Poco::JSON::Parser parser;
+			auto Obj = parser.parse(Request.stream()).extract<Poco::JSON::Object::Ptr>();
+
+			if (Obj->has(RESTAPI::Protocol::COMMAND)) {
+				auto Command = Poco::toLower(Obj->get(RESTAPI::Protocol::COMMAND).toString());
+				if (Command == RESTAPI::Protocol::SETLOGLEVEL) {
+					if (Obj->has(RESTAPI::Protocol::PARAMETERS) &&
+						Obj->isArray(RESTAPI::Protocol::PARAMETERS)) {
+						auto ParametersBlock = Obj->getArray(RESTAPI::Protocol::PARAMETERS);
+						for (const auto &i:*ParametersBlock) {
+							Poco::JSON::Parser pp;
+							auto InnerObj = pp.parse(i).extract<Poco::JSON::Object::Ptr>();
+							if (InnerObj->has(RESTAPI::Protocol::TAG) &&
+								InnerObj->has(RESTAPI::Protocol::VALUE)) {
+								auto Name = GetS(RESTAPI::Protocol::TAG, InnerObj);
+								auto Value = GetS(RESTAPI::Protocol::VALUE, InnerObj);
+								Daemon()->SetSubsystemLogLevel(Name, Value);
+								Logger_.information(Poco::format("Setting log level for %s at %s", Name, Value));
+							}
+						}
+						OK(Request, Response);
+						return;
+					}
+				} else if (Command == RESTAPI::Protocol::GETLOGLEVELS) {
+					auto CurrentLogLevels = Daemon()->GetLogLevels();
+					Poco::JSON::Object	Result;
+					Poco::JSON::Array	Array;
+					for(auto &[Name,Level]:CurrentLogLevels) {
+						Poco::JSON::Object	Pair;
+						Pair.set( RESTAPI::Protocol::TAG,Name);
+						Pair.set(RESTAPI::Protocol::VALUE,Level);
+						Array.add(Pair);
+					}
+					Result.set(RESTAPI::Protocol::TAGLIST,Array);
+					ReturnObject(Request,Result,Response);
+					return;
+				} else if (Command == RESTAPI::Protocol::GETLOGLEVELNAMES) {
+					Poco::JSON::Object	Result;
+					Poco::JSON::Array	LevelNamesArray;
+					const Types::StringVec & LevelNames = Daemon()->GetLogLevelNames();
+					for(const auto &i:LevelNames)
+						LevelNamesArray.add(i);
+					Result.set(RESTAPI::Protocol::LIST,LevelNamesArray);
+					ReturnObject(Request,Result,Response);
+					return;
+				} else if (Command == RESTAPI::Protocol::GETSUBSYSTEMNAMES) {
+					Poco::JSON::Object	Result;
+					Poco::JSON::Array	LevelNamesArray;
+					const Types::StringVec & SubSystemNames = Daemon()->GetSubSystems();
+					for(const auto &i:SubSystemNames)
+						LevelNamesArray.add(i);
+					Result.set(RESTAPI::Protocol::LIST,LevelNamesArray);
+					ReturnObject(Request,Result,Response);
+					return;
+				} else if (Command == RESTAPI::Protocol::STATS) {
+
+				}
+			}
+		} catch(const Poco::Exception &E) {
+			Logger_.log(E);
+		}
+		BadRequest(Request, Response, "Unsupported or missing parameters.");
+	}
+
+	void RESTAPI_system_command::DoGet(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response) {
+		try {
+			ParseParameters(Request);
+			auto Command = GetParameter(RESTAPI::Protocol::COMMAND, "");
+			if (!Poco::icompare(Command, RESTAPI::Protocol::VERSION)) {
+				Poco::JSON::Object Answer;
+				Answer.set(RESTAPI::Protocol::TAG, RESTAPI::Protocol::VERSION);
+				Answer.set(RESTAPI::Protocol::VALUE, Daemon()->Version());
+				ReturnObject(Request, Answer, Response);
+				return;
+			}
+			if (!Poco::icompare(Command, RESTAPI::Protocol::TIMES)) {
+				Poco::JSON::Array	Array;
+				Poco::JSON::Object 	Answer;
+				Poco::JSON::Object	UpTimeObj;
+				UpTimeObj.set(RESTAPI::Protocol::TAG,RESTAPI::Protocol::UPTIME);
+				UpTimeObj.set(RESTAPI::Protocol::VALUE, Daemon()->uptime().totalSeconds());
+				Poco::JSON::Object	StartObj;
+				StartObj.set(RESTAPI::Protocol::TAG,RESTAPI::Protocol::START);
+				StartObj.set(RESTAPI::Protocol::VALUE, Daemon()->startTime().epochTime());
+				Array.add(UpTimeObj);
+				Array.add(StartObj);
+				Answer.set(RESTAPI::Protocol::TIMES, Array);
+				ReturnObject(Request, Answer, Response);
+				return;
+			}
+		} catch (const Poco::Exception &E) {
+			Logger_.log(E);
+		}
+		BadRequest(Request, Response, "Unsupported or missing parameters.");
+	}
+
+}
--- a/src/RESTAPI_system_command.h
+++ b/src/RESTAPI_system_command.h
@@ -0,0 +1,32 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#ifndef UCENTRALGW_RESTAPI_SYSTEM_COMMAND_H
+#define UCENTRALGW_RESTAPI_SYSTEM_COMMAND_H
+
+#include "RESTAPI_handler.h"
+
+namespace OpenWifi {
+class RESTAPI_system_command : public RESTAPIHandler {
+  public:
+	RESTAPI_system_command(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, bool Internal)
+		: RESTAPIHandler(bindings, L,
+						 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_POST,
+														  Poco::Net::HTTPRequest::HTTP_GET,
+														  Poco::Net::HTTPRequest::HTTP_OPTIONS},
+						 Internal) {}
+	void handleRequest(Poco::Net::HTTPServerRequest &request,
+					   Poco::Net::HTTPServerResponse &response) override;
+	static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/system"};}
+	void DoGet(Poco::Net::HTTPServerRequest &Request,
+			   Poco::Net::HTTPServerResponse &Response);
+	void DoPost(Poco::Net::HTTPServerRequest &Request,
+				Poco::Net::HTTPServerResponse &Response);
+	};
+}
+#endif // UCENTRALGW_RESTAPI_SYSTEM_COMMAND_H
--- a/src/RESTAPI_utils.cpp
+++ b/src/RESTAPI_utils.cpp
@@ -0,0 +1,17 @@
+//
+// Created by stephane bourque on 2021-07-05.
+//
+
+#include "RESTAPI_utils.h"
+
+namespace OpenWifi::RESTAPI_utils {
+
+	void EmbedDocument(const std::string & ObjName, Poco::JSON::Object & Obj, const std::string &ObjStr) {
+		std::string D = ObjStr.empty() ? "{}" : ObjStr;
+		Poco::JSON::Parser P;
+		Poco::Dynamic::Var result = P.parse(D);
+		const auto &DetailsObj = result.extract<Poco::JSON::Object::Ptr>();
+		Obj.set(ObjName, DetailsObj);
+	}
+}
+
--- a/src/RESTAPI_utils.h
+++ b/src/RESTAPI_utils.h
@@ -0,0 +1,216 @@
+//
+// Created by stephane bourque on 2021-07-05.
+//
+
+#ifndef UCENTRALGW_RESTAPI_UTILS_H
+#define UCENTRALGW_RESTAPI_UTILS_H
+#include <functional>
+
+#include "Poco/JSON/Object.h"
+#include "Poco/JSON/Parser.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "OpenWifiTypes.h"
+#include "Utils.h"
+
+namespace OpenWifi::RESTAPI_utils {
+
+	void EmbedDocument(const std::string & ObjName, Poco::JSON::Object & Obj, const std::string &ObjStr);
+
+	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, bool V) {
+		Obj.set(Field,V);
+	}
+
+	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const std::string & S) {
+		Obj.set(Field,S);
+	}
+
+	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const char * S) {
+		Obj.set(Field,S);
+	}
+
+	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, uint64_t V) {
+		Obj.set(Field,V);
+	}
+
+	inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const Types::StringVec &V) {
+		Poco::JSON::Array	A;
+		for(const auto &i:V)
+			A.add(i);
+		Obj.set(Field,A);
+	}
+
+    inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const Types::CountedMap &M) {
+        Poco::JSON::Array	A;
+        for(const auto &[Key,Value]:M) {
+            Poco::JSON::Object  O;
+            O.set("tag",Key);
+            O.set("value", Value);
+            A.add(O);
+        }
+        Obj.set(Field,A);
+    }
+
+
+    template<typename T> void field_to_json(Poco::JSON::Object &Obj,
+					   						const char *Field,
+					   						const T &V,
+											std::function<std::string(const T &)> F) {
+		Obj.set(Field, F(V));
+	}
+
+	template<typename T> bool field_from_json(Poco::JSON::Object::Ptr Obj, const char *Field, T & V,
+											std::function<T(const std::string &)> F) {
+		if(Obj->has(Field))
+			V = F(Obj->get(Field).toString());
+		return true;
+	}
+
+	inline void field_from_json(Poco::JSON::Object::Ptr Obj, const char *Field, std::string &S) {
+		if(Obj->has(Field))
+			S = Obj->get(Field).toString();
+	}
+
+	inline void field_from_json(Poco::JSON::Object::Ptr Obj, const char *Field, uint64_t &V) {
+		if(Obj->has(Field))
+			V = Obj->get(Field);
+	}
+
+	inline void field_from_json(Poco::JSON::Object::Ptr Obj, const char *Field, bool &V) {
+		if(Obj->has(Field))
+			V = (Obj->get(Field).toString() == "true");
+	}
+
+	inline void field_from_json(Poco::JSON::Object::Ptr Obj, const char *Field, Types::StringVec &V) {
+		if(Obj->isArray(Field)) {
+			V.clear();
+			Poco::JSON::Array::Ptr A = Obj->getArray(Field);
+			for(const auto &i:*A) {
+				V.push_back(i.toString());
+			}
+		}
+	}
+
+	template<class T> void field_to_json(Poco::JSON::Object &Obj, const char *Field, const std::vector<T> &Value) {
+		Poco::JSON::Array Arr;
+		for(const auto &i:Value) {
+			Poco::JSON::Object	AO;
+			i.to_json(AO);
+			Arr.add(AO);
+		}
+		Obj.set(Field, Arr);
+	}
+
+	template<class T> void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, std::vector<T> &Value) {
+		if(Obj->isArray(Field)) {
+			Poco::JSON::Array::Ptr	Arr = Obj->getArray(Field);
+			for(auto &i:*Arr) {
+				auto InnerObj = i.extract<Poco::JSON::Object::Ptr>();
+				T	NewItem;
+				NewItem.from_json(InnerObj);
+				Value.push_back(NewItem);
+			}
+		}
+	}
+
+	template<class T> void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, T &Value) {
+		if(Obj->isObject(Field)) {
+			Poco::JSON::Object::Ptr	A = Obj->getObject(Field);
+			Value.from_json(A);
+		}
+	}
+
+	inline std::string to_string(const Types::StringVec & ObjectArray) {
+		Poco::JSON::Array OutputArr;
+		if(ObjectArray.empty())
+			return "[]";
+		for(auto const &i:ObjectArray) {
+			OutputArr.add(i);
+		}
+		std::ostringstream OS;
+		Poco::JSON::Stringifier::condense(OutputArr,OS);
+		return OS.str();
+	}
+
+	template<class T> std::string to_string(const std::vector<T> & ObjectArray) {
+		Poco::JSON::Array OutputArr;
+		if(ObjectArray.empty())
+			return "[]";
+		for(auto const &i:ObjectArray) {
+			Poco::JSON::Object O;
+			i.to_json(O);
+			OutputArr.add(O);
+		}
+		std::ostringstream OS;
+		Poco::JSON::Stringifier::condense(OutputArr,OS);
+		return OS.str();
+	}
+
+	template<class T> std::string to_string(const T & Object) {
+		Poco::JSON::Object OutputObj;
+		Object.to_json(OutputObj);
+		std::ostringstream OS;
+		Poco::JSON::Stringifier::condense(OutputObj,OS);
+		return OS.str();
+	}
+
+    inline Types::StringVec to_object_array(const std::string & ObjectString) {
+
+        Types::StringVec 	Result;
+        if(ObjectString.empty())
+            return Result;
+
+        try {
+            Poco::JSON::Parser P;
+            auto Object = P.parse(ObjectString).template extract<Poco::JSON::Array::Ptr>();
+            for (auto const i : *Object) {
+                Result.push_back(i.toString());
+            }
+        } catch (...) {
+
+        }
+        return Result;
+    }
+
+    template<class T> std::vector<T> to_object_array(const std::string & ObjectString) {
+
+		std::vector<T>	Result;
+		if(ObjectString.empty())
+			return Result;
+
+		try {
+			Poco::JSON::Parser P;
+			auto Object = P.parse(ObjectString).template extract<Poco::JSON::Array::Ptr>();
+			for (auto const i : *Object) {
+				auto InnerObject = i.template extract<Poco::JSON::Object::Ptr>();
+				T Obj;
+				Obj.from_json(InnerObject);
+				Result.push_back(Obj);
+			}
+		} catch (...) {
+
+		}
+		return Result;
+	}
+
+	template<class T> T to_object(const std::string & ObjectString) {
+		T	Result;
+
+		if(ObjectString.empty())
+			return Result;
+
+		Poco::JSON::Parser	P;
+		auto Object = P.parse(ObjectString).template extract<Poco::JSON::Object::Ptr>();
+		Result.from_json(Object);
+
+		return Result;
+	}
+
+    template<class T> bool from_request(T & Obj, Poco::Net::HTTPServerRequest &Request) {
+        Poco::JSON::Parser IncomingParser;
+        auto RawObject = IncomingParser.parse(Request.stream()).extract<Poco::JSON::Object::Ptr>();
+        Obj.from_json(RawObject);
+        return true;
+    }
+}
+
+#endif // UCENTRALGW_RESTAPI_UTILS_H
--- a/src/RESTObjects/RESTAPI_CertObjects.cpp
+++ b/src/RESTObjects/RESTAPI_CertObjects.cpp
@@ -1,178 +0,0 @@
-//
-// Created by stephane bourque on 2021-12-07.
-//
-
-#include "RESTAPI_CertObjects.h"
-
-using OpenWifi::RESTAPI_utils::field_to_json;
-using OpenWifi::RESTAPI_utils::field_from_json;
-
-namespace OpenWifi {
-    namespace  CertObjects {
-        void CertificateEntry::to_json(Poco::JSON::Object &Obj) const {
-            field_to_json(Obj,"id", id);
-            field_to_json(Obj,"entity", entity);
-            field_to_json(Obj,"creator", creator);
-            field_to_json(Obj,"type", type);
-            field_to_json(Obj,"status", status);
-            field_to_json(Obj,"certificate", certificate);
-            field_to_json(Obj,"key", key);
-            field_to_json(Obj,"devid", devid);
-            field_to_json(Obj,"cas", cas);
-            field_to_json(Obj,"manufacturer", manufacturer);
-            field_to_json(Obj,"model", model);
-            field_to_json(Obj,"redirector", redirector);
-            field_to_json(Obj,"commonName", commonName);
-            field_to_json(Obj,"certificateId", certificateId);
-            field_to_json(Obj,"batch", batch);
-            field_to_json(Obj,"created", created);
-            field_to_json(Obj,"modified", modified);
-            field_to_json(Obj,"revoked", revoked);
-            field_to_json(Obj,"revokeCount", revokeCount);
-        }
-
-        bool CertificateEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
-            try {
-                field_from_json(Obj,"id", id);
-                field_from_json(Obj,"entity", entity);
-                field_from_json(Obj,"creator", creator);
-                field_from_json(Obj,"type", type);
-                field_from_json(Obj,"status", status);
-                field_from_json(Obj,"certificate", certificate);
-                field_from_json(Obj,"key", key);
-                field_from_json(Obj,"devid", devid);
-                field_from_json(Obj,"cas", cas);
-                field_from_json(Obj,"manufacturer", manufacturer);
-                field_from_json(Obj,"model", model);
-                field_from_json(Obj,"redirector", redirector);
-                field_from_json(Obj,"commonName", commonName);
-                field_from_json(Obj,"certificateId", certificateId);
-                field_from_json(Obj,"batch", batch);
-                field_from_json(Obj,"created", created);
-                field_from_json(Obj,"modified", modified);
-                field_from_json(Obj,"revoked", revoked);
-                field_from_json(Obj,"revokeCount", revokeCount);
-                return true;
-            } catch (...) {
-            }
-            return false;
-        }
-
-        void EntityEntry::to_json(Poco::JSON::Object &Obj) const {
-            field_to_json(Obj,"id", id);
-            field_to_json(Obj,"creator", creator);
-            field_to_json(Obj,"name", name);
-            field_to_json(Obj,"description", description);
-            field_to_json(Obj,"defaultRedirector", defaultRedirector);
-            field_to_json(Obj,"apiKey", apiKey);
-            field_to_json(Obj,"serverEnrollmentProfile", serverEnrollmentProfile);
-            field_to_json(Obj,"clientEnrollmentProfile", clientEnrollmentProfile);
-            field_to_json(Obj,"organization", organization);
-            field_to_json(Obj,"created", created);
-            field_to_json(Obj,"modified", modified);
-            field_to_json(Obj,"suspended", suspended);
-            field_to_json(Obj,"deleted", deleted);
-            field_to_json(Obj,"notes", notes);
-        }
-
-        bool EntityEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
-            try {
-                field_from_json(Obj,"id", id);
-                field_from_json(Obj,"creator", creator);
-                field_from_json(Obj,"name", name);
-                field_from_json(Obj,"description", description);
-                field_from_json(Obj,"defaultRedirector", defaultRedirector);
-                field_from_json(Obj,"apiKey", apiKey);
-                field_from_json(Obj,"serverEnrollmentProfile", serverEnrollmentProfile);
-                field_from_json(Obj,"clientEnrollmentProfile", clientEnrollmentProfile);
-                field_from_json(Obj,"organization", organization);
-                field_from_json(Obj,"created", created);
-                field_from_json(Obj,"modified", modified);
-                field_from_json(Obj,"suspended", suspended);
-                field_from_json(Obj,"deleted", deleted);
-                field_from_json(Obj,"notes", notes);
-                return true;
-            } catch (...) {
-            }
-            return false;
-        }
-
-        void BatchEntry::to_json(Poco::JSON::Object &Obj) const {
-            field_to_json(Obj,"id", id);
-            field_to_json(Obj,"entity", entity);
-            field_to_json(Obj,"creator", creator);
-            field_to_json(Obj,"name", name);
-            field_to_json(Obj,"description", description);
-            field_to_json(Obj,"manufacturer", manufacturer);
-            field_to_json(Obj,"model", model);
-            field_to_json(Obj,"redirector", redirector);
-            field_to_json(Obj,"commonNames", commonNames);
-            field_to_json(Obj,"jobHistory", jobHistory);
-            field_to_json(Obj,"notes", notes);
-            field_to_json(Obj,"submitted", submitted);
-            field_to_json(Obj,"started", started);
-            field_to_json(Obj,"completed", completed);
-            field_to_json(Obj,"modified", modified);
-        }
-
-        bool BatchEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
-            try {
-                field_from_json(Obj,"id", id);
-                field_from_json(Obj,"entity", entity);
-                field_from_json(Obj,"creator", creator);
-                field_from_json(Obj,"name", name);
-                field_from_json(Obj,"description", description);
-                field_from_json(Obj,"manufacturer", manufacturer);
-                field_from_json(Obj,"model", model);
-                field_from_json(Obj,"redirector", redirector);
-                field_from_json(Obj,"commonNames", commonNames);
-                field_from_json(Obj,"jobHistory", jobHistory);
-                field_from_json(Obj,"notes", notes);
-                field_from_json(Obj,"submitted", submitted);
-                field_from_json(Obj,"started", started);
-                field_from_json(Obj,"completed", completed);
-                field_from_json(Obj,"modified", modified);
-                return true;
-            } catch (...) {
-            }
-            return false;
-        }
-
-        void JobEntry::to_json(Poco::JSON::Object &Obj) const {
-            field_to_json(Obj,"id", id);
-            field_to_json(Obj,"entity", entity);
-            field_to_json(Obj,"creator", creator);
-            field_to_json(Obj,"batch", batch);
-            field_to_json(Obj,"commonNames", commonNames);
-            field_to_json(Obj,"completedNames", completedNames);
-            field_to_json(Obj,"errorNames", errorNames);
-            field_to_json(Obj,"status", status);
-            field_to_json(Obj,"command", command);
-            field_to_json(Obj,"parameters", parameters);
-            field_to_json(Obj,"submitted", submitted);
-            field_to_json(Obj,"started", started);
-            field_to_json(Obj,"completed", completed);
-        }
-
-        bool JobEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
-            try {
-                field_from_json(Obj,"id", id);
-                field_from_json(Obj,"entity", entity);
-                field_from_json(Obj,"creator", creator);
-                field_from_json(Obj,"batch", batch);
-                field_from_json(Obj,"commonNames", commonNames);
-                field_from_json(Obj,"completedNames", completedNames);
-                field_from_json(Obj,"errorNames", errorNames);
-                field_from_json(Obj,"status", status);
-                field_from_json(Obj,"command", command);
-                field_from_json(Obj,"parameters", parameters);
-                field_from_json(Obj,"submitted", submitted);
-                field_from_json(Obj,"started", started);
-                field_from_json(Obj,"completed", completed);
-                return true;
-            } catch (...) {
-            }
-            return false;
-        }
-    }
-}
--- a/src/RESTObjects/RESTAPI_CertObjects.h
+++ b/src/RESTObjects/RESTAPI_CertObjects.h
@@ -1,101 +0,0 @@
-//
-// Created by stephane bourque on 2021-12-07.
-//
-
-#pragma once
-
-#include <string>
-#include "framework/MicroService.h"
-#include "framework/OpenWifiTypes.h"
-#include "RESTObjects/RESTAPI_SecurityObjects.h"
-
-namespace OpenWifi {
-
-    namespace CertObjects {
-
-        struct CertificateEntry {
-            OpenWifi::Types::UUID_t         id;
-            OpenWifi::Types::UUID_t         entity;
-            OpenWifi::Types::UUID_t         creator;
-            std::string                     type;
-            std::string                     status;
-            std::string                     certificate;
-            std::string                     key;
-            std::string                     devid;
-            std::string                     cas;
-            std::string                     manufacturer;
-            std::string                     model;
-            std::string                     redirector;
-            std::string                     commonName;
-            std::string                     certificateId;
-            OpenWifi::Types::UUID_t         batch;
-            uint64_t                        created = 0;
-            uint64_t                        modified = 0;
-            uint64_t                        revoked = 0;
-            uint64_t                        revokeCount = 0;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
-        struct EntityEntry {
-            OpenWifi::Types::UUID_t         id;
-            OpenWifi::Types::UUID_t         creator;
-            std::string                     name;
-            std::string                     description;
-            std::string                     defaultRedirector;
-            std::string                     apiKey;
-            std::string                     serverEnrollmentProfile;
-            std::string                     clientEnrollmentProfile;
-            std::string                     organization;
-            SecurityObjects::NoteInfoVec    notes;
-            bool                            suspended=false;
-            bool                            deleted=false;
-            uint64_t                        created = 0 ;
-            uint64_t                        modified = 0 ;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
-        struct BatchEntry {
-            OpenWifi::Types::UUID_t         id;
-            OpenWifi::Types::UUID_t         entity;
-            OpenWifi::Types::UUID_t         creator;
-            std::string                     name;
-            std::string                     description;
-            std::string                     manufacturer;
-            std::string                     model;
-            std::string                     redirector;
-            std::vector<std::string>        commonNames;
-            std::vector<std::string>        jobHistory;
-            SecurityObjects::NoteInfoVec    notes;
-            uint64_t                        submitted = 0 ;
-            uint64_t                        started = 0 ;
-            uint64_t                        completed = 0 ;
-            uint64_t                        modified = 0 ;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
-        struct JobEntry {
-            OpenWifi::Types::UUID_t         id;
-            OpenWifi::Types::UUID_t         entity;
-            OpenWifi::Types::UUID_t         creator;
-            OpenWifi::Types::UUID_t         batch;
-            std::string                     command;
-            OpenWifi::Types::StringVec      commonNames;
-            OpenWifi::Types::StringVec      completedNames;
-            OpenWifi::Types::StringVec      errorNames;
-            Types::StringPairVec            parameters;
-            std::string                     status;
-            uint64_t                        submitted=0;
-            uint64_t                        started=0;
-            uint64_t                        completed=0;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-    }
-}
--- a/src/RESTObjects/RESTAPI_ProvObjects.cpp
+++ b/src/RESTObjects/RESTAPI_ProvObjects.cpp
@@ -1,649 +0,0 @@
-//
-//	License type: BSD 3-Clause License
-//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
-//
-//	Created by Stephane Bourque on 2021-03-04.
-//	Arilia Wireless Inc.
-//
-
-
-#include "RESTAPI_ProvObjects.h"
-#include "framework/MicroService.h"
-
-using OpenWifi::RESTAPI_utils::field_to_json;
-using OpenWifi::RESTAPI_utils::field_from_json;
-
-namespace OpenWifi::ProvObjects {
-
-    void ObjectInfo::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"id",id);
-        field_to_json(Obj,"name",name);
-        field_to_json(Obj,"description",description);
-        field_to_json(Obj,"created",created);
-        field_to_json(Obj,"modified",modified);
-        field_to_json(Obj,"notes",notes);
-        field_to_json(Obj,"tags",tags);
-    }
-
-    bool ObjectInfo::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,"description",description);
-            field_from_json(Obj,"created",created);
-            field_from_json(Obj,"modified",modified);
-            field_from_json(Obj,"notes",notes);
-            field_from_json(Obj,"tags",tags);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void ManagementPolicyEntry::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json( Obj,"users",users);
-        field_to_json( Obj,"resources",resources);
-        field_to_json( Obj,"access",access);
-        field_to_json( Obj,"policy",policy);
-    }
-
-    bool ManagementPolicyEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json( Obj,"users",users);
-            field_from_json( Obj,"resources",resources);
-            field_from_json( Obj,"access",access);
-            field_from_json( Obj,"policy",policy);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void ManagementPolicy::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        field_to_json(Obj, "entries", entries);
-        field_to_json(Obj, "inUse", inUse);
-        field_to_json(Obj, "entity", entity);
-    }
-
-    bool ManagementPolicy::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            field_from_json(Obj, "entries", entries);
-            field_from_json(Obj, "inUse", inUse);
-            field_from_json(Obj, "entity", entity);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void Entity::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        field_to_json( Obj,"parent",parent);
-        field_to_json( Obj,"venues",venues);
-        field_to_json( Obj,"children",children);
-        field_to_json( Obj,"contacts",contacts);
-        field_to_json( Obj,"locations",locations);
-        field_to_json( Obj,"managementPolicy",managementPolicy);
-        field_to_json( Obj,"deviceConfiguration",deviceConfiguration);
-        field_to_json( Obj,"devices",devices);
-        field_to_json( Obj,"rrm",rrm);
-        field_to_json( Obj,"sourceIP",sourceIP);
-    }
-
-    bool Entity::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            field_from_json( Obj,"parent",parent);
-            field_from_json( Obj,"venues",venues);
-            field_from_json( Obj,"children",children);
-            field_from_json( Obj,"contacts",contacts);
-            field_from_json( Obj,"locations",locations);
-            field_from_json( Obj,"managementPolicy",managementPolicy);
-            field_from_json( Obj,"deviceConfiguration",deviceConfiguration);
-            field_from_json( Obj,"devices",devices);
-            field_from_json( Obj,"rrm",rrm);
-            field_from_json( Obj,"sourceIP",sourceIP);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void DiGraphEntry::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json( Obj,"parent",parent);
-        field_to_json( Obj,"child",child);
-    }
-
-    bool DiGraphEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json( Obj,"parent",parent);
-            field_from_json( Obj,"child",child);
-            return true;
-        } catch (...) {
-
-        }
-        return false;
-    }
-
-    void Venue::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        field_to_json( Obj,"parent",parent);
-        field_to_json( Obj,"entity",entity);
-        field_to_json( Obj,"children",children);
-        field_to_json( Obj,"devices",devices);
-        field_to_json( Obj,"topology",topology);
-        field_to_json( Obj,"parent",parent);
-        field_to_json( Obj,"design",design);
-        field_to_json( Obj,"managementPolicy",managementPolicy);
-        field_to_json( Obj,"deviceConfiguration",deviceConfiguration);
-        field_to_json( Obj,"contact",contact);
-        field_to_json( Obj,"location",location);
-        field_to_json( Obj,"rrm",rrm);
-        field_to_json( Obj,"sourceIP",sourceIP);
-    }
-
-    bool Venue::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            field_from_json( Obj,"parent",parent);
-            field_from_json( Obj,"entity",entity);
-            field_from_json( Obj,"children",children);
-            field_from_json( Obj,"devices",devices);
-            field_from_json( Obj,"topology",topology);
-            field_from_json( Obj,"parent",parent);
-            field_from_json( Obj,"design",design);
-            field_from_json( Obj,"managementPolicy",managementPolicy);
-            field_from_json( Obj,"deviceConfiguration",deviceConfiguration);
-            field_from_json( Obj,"contact",contact);
-            field_from_json( Obj,"location",location);
-            field_from_json( Obj,"rrm",rrm);
-            field_from_json( Obj,"sourceIP",sourceIP);
-            return true;
-        } catch (...) {
-
-        }
-        return false;
-    }
-
-    void UserInfoDigest::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json( Obj,"id",id);
-        field_to_json( Obj,"entity",loginId);
-        field_to_json( Obj,"children",userType);
-    }
-
-    bool UserInfoDigest::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json( Obj,"id",id);
-            field_from_json( Obj,"entity",loginId);
-            field_from_json( Obj,"children",userType);
-            return true;
-        } catch(...) {
-        }
-        return false;
-    }
-
-    void ManagementRole::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        field_to_json( Obj,"managementPolicy",managementPolicy);
-        field_to_json( Obj,"users",users);
-        field_to_json( Obj,"entity",entity);
-    }
-
-    bool ManagementRole::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            field_from_json( Obj,"managementPolicy",managementPolicy);
-            field_from_json( Obj,"users",users);
-            field_from_json( Obj,"entity",entity);
-            return true;
-        } catch(...) {
-        }
-        return false;
-    }
-
-    void Location::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        field_to_json( Obj,"type",OpenWifi::ProvObjects::to_string(type));
-        field_to_json( Obj,"buildingName",buildingName);
-        field_to_json( Obj,"addressLines",addressLines);
-        field_to_json( Obj,"city",city);
-        field_to_json( Obj,"state",state);
-        field_to_json( Obj,"postal",postal);
-        field_to_json( Obj,"country",country);
-        field_to_json( Obj,"phones",phones);
-        field_to_json( Obj,"mobiles",mobiles);
-        field_to_json( Obj,"geoCode",geoCode);
-        field_to_json( Obj,"inUse",inUse);
-        field_to_json( Obj,"entity",entity);
-        field_to_json( Obj,"managementPolicy",managementPolicy);
-    }
-
-    bool Location::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            std::string tmp_type;
-            field_from_json( Obj,"type", tmp_type);
-            type = location_from_string(tmp_type);
-            field_from_json( Obj,"buildingName",buildingName);
-            field_from_json( Obj,"addressLines",addressLines);
-            field_from_json( Obj,"city",city);
-            field_from_json( Obj,"state",state);
-            field_from_json( Obj,"postal",postal);
-            field_from_json( Obj,"country",country);
-            field_from_json( Obj,"phones",phones);
-            field_from_json( Obj,"mobiles",mobiles);
-            field_from_json( Obj,"geoCode",geoCode);
-            field_from_json( Obj,"inUse",inUse);
-            field_from_json( Obj,"entity",entity);
-            field_from_json( Obj,"managementPolicy",managementPolicy);
-            return true;
-        } catch (...) {
-
-        }
-        return false;
-    }
-
-    void Contact::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        field_to_json( Obj,"type", to_string(type));
-        field_to_json( Obj,"title",title);
-        field_to_json( Obj,"salutation",salutation);
-        field_to_json( Obj,"firstname",firstname);
-        field_to_json( Obj,"lastname",lastname);
-        field_to_json( Obj,"initials",initials);
-        field_to_json( Obj,"visual",visual);
-        field_to_json( Obj,"mobiles",mobiles);
-        field_to_json( Obj,"phones",phones);
-        field_to_json( Obj,"primaryEmail",primaryEmail);
-        field_to_json( Obj,"secondaryEmail",secondaryEmail);
-        field_to_json( Obj,"accessPIN",accessPIN);
-        field_to_json( Obj,"inUse",inUse);
-        field_to_json( Obj,"entity",entity);
-        field_to_json( Obj,"managementPolicy",managementPolicy);
-    }
-
-    bool Contact::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            std::string tmp_type;
-            field_from_json( Obj,"type", tmp_type);
-            type = contact_from_string(tmp_type);
-            field_from_json( Obj,"title",title);
-            field_from_json( Obj,"salutation",salutation);
-            field_from_json( Obj,"firstname",firstname);
-            field_from_json( Obj,"lastname",lastname);
-            field_from_json( Obj,"initials",initials);
-            field_from_json( Obj,"visual",visual);
-            field_from_json( Obj,"mobiles",mobiles);
-            field_from_json( Obj,"phones",phones);
-            field_from_json( Obj,"primaryEmail",primaryEmail);
-            field_from_json( Obj,"secondaryEmail",secondaryEmail);
-            field_from_json( Obj,"accessPIN",accessPIN);
-            field_from_json( Obj,"inUse",inUse);
-            field_from_json( Obj,"entity",entity);
-            field_from_json( Obj,"managementPolicy",managementPolicy);
-            return true;
-        } catch (...) {
-
-        }
-        return false;
-    }
-
-    void InventoryTag::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        field_to_json(Obj, "serialNumber", serialNumber);
-        field_to_json(Obj, "venue", venue);
-        field_to_json(Obj, "entity", entity);
-        field_to_json(Obj, "subscriber", subscriber);
-        field_to_json(Obj, "deviceType", deviceType);
-        field_to_json(Obj, "qrCode", qrCode);
-        field_to_json(Obj, "geoCode", geoCode);
-        field_to_json(Obj, "location", location);
-        field_to_json(Obj, "contact", contact);
-        field_to_json( Obj,"deviceConfiguration",deviceConfiguration);
-        field_to_json( Obj,"rrm",rrm);
-        field_to_json( Obj,"managementPolicy",managementPolicy);
-        field_to_json( Obj,"state",state);
-    }
-
-    bool InventoryTag::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            field_from_json( Obj,"serialNumber",serialNumber);
-            field_from_json( Obj,"venue",venue);
-            field_from_json( Obj,"entity",entity);
-            field_from_json( Obj,"subscriber",subscriber);
-            field_from_json( Obj,"deviceType",deviceType);
-            field_from_json(Obj, "qrCode", qrCode);
-            field_from_json( Obj,"geoCode",geoCode);
-            field_from_json( Obj,"location",location);
-            field_from_json( Obj,"contact",contact);
-            field_from_json( Obj,"deviceConfiguration",deviceConfiguration);
-            field_from_json( Obj,"rrm",rrm);
-            field_from_json( Obj,"managementPolicy",managementPolicy);
-            field_from_json( Obj,"state",state);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void InventoryTagList::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json( Obj,"taglist",taglist);
-    }
-
-    bool InventoryTagList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json( Obj,"taglist",taglist);
-            return false;
-        } catch (...) {
-
-        }
-        return false;
-    };
-
-    void DeviceConfigurationElement::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json( Obj,"name", name);
-        field_to_json( Obj,"description", description);
-        field_to_json( Obj,"weight", weight);
-        field_to_json( Obj,"configuration", configuration);
-    }
-
-    bool DeviceConfigurationElement::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json( Obj,"name",name);
-            field_from_json( Obj,"description",description);
-            field_from_json( Obj,"weight",weight);
-            field_from_json( Obj,"configuration",configuration);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void DeviceConfiguration::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        field_to_json( Obj,"managementPolicy",managementPolicy);
-        field_to_json( Obj,"deviceTypes",deviceTypes);
-        field_to_json( Obj,"configuration",configuration);
-        field_to_json( Obj,"inUse",inUse);
-        field_to_json( Obj,"variables",variables);
-        field_to_json( Obj,"rrm",rrm);
-        field_to_json( Obj,"firmwareUpgrade",firmwareUpgrade);
-        field_to_json( Obj,"firmwareRCOnly",firmwareRCOnly);
-    }
-
-    bool DeviceConfiguration::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            field_from_json( Obj,"managementPolicy",managementPolicy);
-            field_from_json( Obj,"deviceTypes",deviceTypes);
-            field_from_json( Obj,"configuration",configuration);
-            field_from_json( Obj,"inUse",inUse);
-            field_from_json( Obj,"variables",variables);
-            field_from_json( Obj,"rrm",rrm);
-            field_from_json( Obj,"firmwareUpgrade",firmwareUpgrade);
-            field_from_json( Obj,"firmwareRCOnly",firmwareRCOnly);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void Report::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "snapshot", snapShot);
-        field_to_json(Obj, "devices", tenants);
-    };
-
-    void Report::reset() {
-        tenants.clear();
-    }
-
-    void ExpandedUseEntry::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "uuid", uuid);
-        field_to_json(Obj, "name", name);
-        field_to_json(Obj, "description", description);
-    }
-
-    bool ExpandedUseEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json( Obj,"uuid",uuid);
-            field_from_json( Obj,"name",name);
-            field_from_json( Obj,"description",description);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void ExpandedUseEntryList::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "type", type);
-        field_to_json(Obj, "entries", entries);
-    }
-
-    bool ExpandedUseEntryList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json( Obj,"type",type);
-            field_from_json( Obj,"entries",entries);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void ExpandedUseEntryMapList::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "entries", entries);
-    }
-
-    bool ExpandedUseEntryMapList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json( Obj,"entries",entries);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void UuidList::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "list", list);
-    }
-
-    bool UuidList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj, "list", list);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void field_to_json(Poco::JSON::Object &Obj, const char * FieldName, ACLACCESS A) {
-        switch(A) {
-            case READ: Obj.set(FieldName,"read"); break;
-            case MODIFY: Obj.set(FieldName,"modify"); break;
-            case CREATE: Obj.set(FieldName,"create"); break;
-            case DELETE: Obj.set(FieldName,"delete"); break;
-            case NONE:
-                default:
-                    Obj.set(FieldName,"none");
-        }
-    }
-
-    void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char * FieldName, ACLACCESS &A) {
-        if(Obj->has(FieldName)) {
-            auto V = Obj->getValue<std::string>(FieldName);
-            if(V=="read")
-                A = READ;
-            else if(V=="modify")
-                A = MODIFY;
-            else if(V=="create")
-                A = CREATE;
-            else if(V=="delete")
-                A = DELETE;
-            else if(V=="none")
-                A = NONE;
-            else
-                throw Poco::Exception("invalid JSON");
-        }
-    }
-
-    void ObjectACL::to_json(Poco::JSON::Object &Obj) const {
-        RESTAPI_utils::field_to_json(Obj, "users", users);
-        RESTAPI_utils::field_to_json(Obj, "roles", roles);
-        field_to_json(Obj, "access", access);
-    }
-
-    bool ObjectACL::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            RESTAPI_utils::field_from_json(Obj, "users", users);
-            RESTAPI_utils::field_from_json(Obj, "roles", roles);
-            field_from_json(Obj, "access", access);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-    
-    void ObjectACLList::to_json(Poco::JSON::Object &Obj) const {
-        RESTAPI_utils::field_to_json(Obj, "list", list);
-    }
-
-    bool ObjectACLList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            RESTAPI_utils::field_from_json(Obj, "list", list);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    std::string to_string(VISIBILITY A) {
-        switch(A) {
-            case PUBLIC: return "public";
-            case SELECT: return "select";
-            case PRIVATE:
-            default:
-                return "private";
-        }
-    }
-
-    void field_to_json(Poco::JSON::Object &Obj, const char * FieldName, VISIBILITY A) {
-        Obj.set(FieldName,to_string(A));
-    }
-
-    VISIBILITY visibility_from_string(const std::string &V) {
-        if(V=="public")
-            return PUBLIC;
-        else if(V=="select")
-            return SELECT;
-        else if(V=="private")
-            return PRIVATE;
-        throw Poco::Exception("invalid json");
-    }
-
-    void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char * FieldName, VISIBILITY &A) {
-        if(Obj->has(FieldName)) {
-            auto V = Obj->getValue<std::string>(FieldName);
-            A = visibility_from_string(V);
-        }
-    }
-
-    void Map::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        RESTAPI_utils::field_to_json( Obj,"data",data);
-        RESTAPI_utils::field_to_json( Obj,"entity",entity);
-        RESTAPI_utils::field_to_json( Obj,"creator",creator);
-        field_to_json( Obj,"visibility",visibility);
-        RESTAPI_utils::field_to_json( Obj,"access",access);
-    }
-
-    bool Map::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            RESTAPI_utils::field_from_json( Obj,"data",data);
-            RESTAPI_utils::field_from_json( Obj,"entity",entity);
-            RESTAPI_utils::field_from_json( Obj,"creator",creator);
-            field_from_json( Obj,"visibility",visibility);
-            RESTAPI_utils::field_from_json( Obj,"access",access);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void MapList::to_json(Poco::JSON::Object &Obj) const {
-        RESTAPI_utils::field_to_json( Obj,"list",list);
-    }
-
-    bool MapList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            RESTAPI_utils::field_from_json( Obj,"list",list);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    bool UpdateObjectInfo(const Poco::JSON::Object::Ptr &O, const SecurityObjects::UserInfo &U, ObjectInfo &I) {
-        uint64_t Now = std::time(nullptr);
-        if(O->has("name"))
-            I.name = O->get("name").toString();
-
-        if(I.name.empty())
-            return false;
-
-        if(O->has("description"))
-            I.description = O->get("description").toString();
-        SecurityObjects::MergeNotes(O,U,I.notes);
-        SecurityObjects::NoteInfoVec N;
-        for(auto &i:I.notes) {
-            if(i.note.empty())
-                continue;
-            N.push_back(SecurityObjects::NoteInfo{.created=Now,.createdBy=U.email,.note=i.note});
-        }
-        I.modified = Now;
-        return true;
-    }
-
-    bool CreateObjectInfo(const Poco::JSON::Object::Ptr &O, const SecurityObjects::UserInfo &U, ObjectInfo &I) {
-        uint64_t Now = std::time(nullptr);
-        if(O->has("name"))
-            I.name = O->get("name").toString();
-
-        if(I.name.empty())
-            return false;
-
-        if(O->has("description"))
-            I.description = O->get("description").toString();
-
-        SecurityObjects::NoteInfoVec N;
-        for(auto &i:I.notes) {
-            if(i.note.empty())
-                continue;
-            N.push_back(SecurityObjects::NoteInfo{.created=Now,.createdBy=U.email,.note=i.note});
-        }
-        I.notes = N;
-        I.modified = I.created = Now;
-        I.id = MicroService::CreateUUID();
-
-        return true;
-    }
-}
-
--- a/src/RESTObjects/RESTAPI_ProvObjects.h
+++ b/src/RESTObjects/RESTAPI_ProvObjects.h
@@ -1,390 +0,0 @@
-//
-//	License type: BSD 3-Clause License
-//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
-//
-//	Created by Stephane Bourque on 2021-03-04.
-//	Arilia Wireless Inc.
-//
-
-#pragma once
-
-#include <string>
-#include "RESTAPI_SecurityObjects.h"
-
-namespace OpenWifi::ProvObjects {
-
-    enum FIRMWARE_UPGRADE_RULES {
-        dont_upgrade,
-        upgrade_inherit,
-        upgrade_release_only,
-        upgrade_latest
-    };
-
-    struct ObjectInfo {
-        Types::UUID_t   id;
-        std::string     name;
-        std::string     description;
-        SecurityObjects::NoteInfoVec notes;
-        uint64_t        created=0;
-        uint64_t        modified=0;
-        Types::TagList  tags;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct ManagementPolicyEntry {
-        Types::UUIDvec_t users;
-        Types::UUIDvec_t resources;
-        Types::StringVec access;
-        std::string policy;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct ManagementPolicy {
-        ObjectInfo          info;
-        std::vector<ManagementPolicyEntry>  entries;
-        Types::StringVec    inUse;
-        Types::UUID_t       entity;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-    typedef std::vector<ManagementPolicy>      ManagementPolicyVec;
-
-    struct Entity {
-        ObjectInfo              info;
-        Types::UUID_t           parent;
-        Types::UUIDvec_t        children;
-        Types::UUIDvec_t        venues;
-        Types::UUIDvec_t        contacts;       // all contacts associated in this entity
-        Types::UUIDvec_t        locations;      // all locations associated in this entity
-        Types::UUID_t           managementPolicy;
-        Types::UUIDvec_t        deviceConfiguration;
-        Types::UUIDvec_t        devices;
-        std::string             rrm;
-        Types::StringVec        sourceIP;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-    typedef std::vector<Entity>      EntityVec;
-
-    struct DiGraphEntry {
-        Types::UUID_t parent;
-        Types::UUID_t child;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    typedef std::vector<DiGraphEntry>   DiGraph;
-
-    struct Venue {
-        ObjectInfo          info;
-        Types::UUID_t       entity;
-        Types::UUID_t       parent;
-        Types::UUIDvec_t    children;
-        Types::UUID_t       managementPolicy;
-        Types::UUIDvec_t    devices;
-        DiGraph             topology;
-        std::string         design;
-        Types::UUIDvec_t    deviceConfiguration;
-        std::string         contact;
-        std::string         location;
-        std::string         rrm;
-        Types::StringVec    sourceIP;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-    typedef std::vector<Venue>      VenueVec;
-
-    struct UserInfoDigest {
-        std::string     id;
-        std::string     loginId;
-        std::string     userType;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct ManagementRole {
-        ObjectInfo          info;
-        Types::UUID_t       managementPolicy;
-        Types::UUIDvec_t    users;
-        Types::StringVec    inUse;
-        Types::UUID_t       entity;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-    typedef std::vector<ManagementRole>      ManagementRoleVec;
-
-    enum LocationType {
-        LT_SERVICE, LT_EQUIPMENT, LT_AUTO, LT_MANUAL,
-        LT_SPECIAL, LT_UNKNOWN, LT_CORPORATE
-    };
-
-    inline std::string to_string(LocationType L) {
-        switch(L) {
-            case LT_SERVICE: return "SERVICE";
-            case LT_EQUIPMENT: return "EQUIPMENT";
-            case LT_AUTO: return "AUTO";
-            case LT_MANUAL: return "MANUAL";
-            case LT_SPECIAL: return "SPECIAL";
-            case LT_UNKNOWN: return "UNKNOWN";
-            case LT_CORPORATE: return "CORPORATE";
-            default: return "UNKNOWN";
-        }
-    }
-
-    inline LocationType location_from_string(const std::string &S) {
-        if(!Poco::icompare(S,"SERVICE"))
-            return LT_SERVICE;
-        else if(!Poco::icompare(S,"EQUIPMENT"))
-            return LT_EQUIPMENT;
-        else if(!Poco::icompare(S,"AUTO"))
-            return LT_AUTO;
-        else if(!Poco::icompare(S,"MANUAL"))
-            return LT_MANUAL;
-        else if(!Poco::icompare(S,"SPECIAL"))
-            return LT_SPECIAL;
-        else if(!Poco::icompare(S,"UNKNOWN"))
-            return LT_UNKNOWN;
-        else if(!Poco::icompare(S,"CORPORATE"))
-            return LT_CORPORATE;
-        return LT_UNKNOWN;
-    }
-
-    struct Location {
-        ObjectInfo          info;
-        LocationType        type;
-        std::string         buildingName;
-        Types::StringVec    addressLines;
-        std::string         city;
-        std::string         state;
-        std::string         postal;
-        std::string         country;
-        Types::StringVec    phones;
-        Types::StringVec    mobiles;
-        std::string         geoCode;
-        Types::StringVec    inUse;
-        Types::UUID_t       entity;
-        Types::UUID_t       managementPolicy;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-    typedef std::vector<Location>      LocationVec;
-
-    enum ContactType {
-        CT_SUBSCRIBER, CT_USER, CT_INSTALLER, CT_CSR, CT_MANAGER,
-        CT_BUSINESSOWNER, CT_TECHNICIAN, CT_CORPORATE, CT_UNKNOWN
-    };
-
-    inline std::string to_string(ContactType L) {
-        switch(L) {
-            case CT_SUBSCRIBER: return "SUBSCRIBER";
-            case CT_USER: return "USER";
-            case CT_INSTALLER: return "INSTALLER";
-            case CT_CSR: return "CSR";
-            case CT_MANAGER: return "MANAGER";
-            case CT_BUSINESSOWNER: return "BUSINESSOWNER";
-            case CT_TECHNICIAN: return "TECHNICIAN";
-            case CT_CORPORATE: return "CORPORATE";
-            case CT_UNKNOWN: return "UNKNOWN";
-            default: return "UNKNOWN";
-        }
-    }
-
-    inline ContactType contact_from_string(const std::string &S) {
-        if(!Poco::icompare(S,"SUBSCRIBER"))
-            return CT_SUBSCRIBER;
-        else if(!Poco::icompare(S,"USER"))
-            return CT_USER;
-        else if(!Poco::icompare(S,"INSTALLER"))
-            return CT_INSTALLER;
-        else if(!Poco::icompare(S,"CSR"))
-            return CT_CSR;
-        else if(!Poco::icompare(S,"BUSINESSOWNER"))
-            return CT_BUSINESSOWNER;
-        else if(!Poco::icompare(S,"TECHNICIAN"))
-            return CT_TECHNICIAN;
-        else if(!Poco::icompare(S,"CORPORATE"))
-            return CT_CORPORATE;
-        else if(!Poco::icompare(S,"UNKNOWN"))
-            return CT_UNKNOWN;
-        return CT_UNKNOWN;
-    }
-
-    struct Contact {
-        ObjectInfo  info;
-        ContactType type=CT_USER;
-        std::string title;
-        std::string salutation;
-        std::string firstname;
-        std::string lastname;
-        std::string initials;
-        std::string visual;
-        Types::StringVec mobiles;
-        Types::StringVec phones;
-        std::string primaryEmail;
-        std::string secondaryEmail;
-        std::string accessPIN;
-        Types::StringVec inUse;
-        Types::UUID_t   entity;
-        Types::UUID_t   managementPolicy;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-    typedef std::vector<Contact>      ContactVec;
-
-    struct DeviceConfigurationElement {
-        std::string name;
-        std::string description;
-        uint64_t    weight;
-        std::string configuration;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-    typedef std::vector<DeviceConfigurationElement> DeviceConfigurationElementVec;
-
-    struct DeviceConfiguration {
-    ObjectInfo                          info;
-        Types::UUID_t                   managementPolicy;
-        Types::StringVec                deviceTypes;
-        DeviceConfigurationElementVec   configuration;
-        Types::StringVec                inUse;
-        Types::StringPairVec            variables;
-        std::string                     rrm;
-        std::string                     firmwareUpgrade;
-        bool                            firmwareRCOnly=false;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-    typedef std::vector<DeviceConfiguration>      DeviceConfigurationVec;
-
-    struct InventoryTag {
-        ObjectInfo      info;
-        std::string     serialNumber;
-        std::string     venue;
-        std::string     entity;
-        std::string     subscriber;
-        std::string     deviceType;
-        std::string     qrCode;
-        std::string     geoCode;
-        std::string     location;
-        std::string     contact;
-        std::string     deviceConfiguration;
-        std::string     rrm;
-        Types::UUID_t   managementPolicy;
-        std::string     state;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    typedef std::vector<InventoryTag>      InventoryTagVec;
-
-    struct InventoryTagList {
-        InventoryTagVec     taglist;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-
-    struct Report {
-        uint64_t            snapShot=0;
-        Types::CountedMap   tenants;
-
-        void        reset();
-        void to_json(Poco::JSON::Object &Obj) const;
-    };
-
-    struct ExpandedUseEntry {
-        std::string uuid;
-        std::string name;
-        std::string description;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct ExpandedUseEntryList {
-        std::string                     type;
-        std::vector<ExpandedUseEntry>   entries;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct ExpandedUseEntryMapList {
-        std::vector<ExpandedUseEntryList>    entries;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct UuidList {
-        std::vector<std::string>    list;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    enum ACLACCESS {
-        NONE, READ, MODIFY, CREATE, DELETE
-    };
-
-    struct ObjectACL {
-        UuidList        users;
-        UuidList        roles;
-        ACLACCESS       access = NONE;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct ObjectACLList {
-        std::vector<ObjectACL>  list;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    enum VISIBILITY {
-        PUBLIC, PRIVATE, SELECT
-    };
-
-    std::string to_string(VISIBILITY A);
-    VISIBILITY visibility_from_string(const std::string &V);
-
-    struct Map {
-        ObjectInfo          info;
-        std::string         data;
-        std::string         entity;
-        std::string         creator;
-        VISIBILITY          visibility = PRIVATE;
-        ObjectACLList       access;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct MapList {
-        std::vector<Map>    list;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    bool UpdateObjectInfo(const Poco::JSON::Object::Ptr &O, const SecurityObjects::UserInfo &U, ObjectInfo &I);
-    bool CreateObjectInfo(const Poco::JSON::Object::Ptr &O, const SecurityObjects::UserInfo &U, ObjectInfo &I);
-};
--- a/Show More
+++ b/Show More