diff --git a/.github/workflows/Linux build template.yml b/.github/workflows/Linux build template.yml
index 28fa23b2..9f71d3e1 100644
--- a/.github/workflows/Linux build template.yml	
+++ b/.github/workflows/Linux build template.yml	
@@ -43,9 +43,9 @@ jobs:
         export DEBIAN_FRONTEND=noninteractive
         PKGS="python3-venv python3-pip build-essential cmake ninja-build libusb-1.0-0-dev autoconf automake libtool libtool-bin pkg-config"
         if [ "${{ matrix.architecture }}" = "32" ]; then
-          PKGS="$PKGS zlib1g-dev:i386 libssl-dev:i386 libsbc-dev:i386 gcc-13-multilib g++-13-multilib libarchive-dev:i386 libcurl4-openssl-dev:i386 libgpgme-dev:i386 libgpg-error-dev:i386 libgstreamer1.0-dev:i386"
+          PKGS="$PKGS zlib1g-dev:i386 libssl-dev:i386 libsbc-dev:i386 gcc-13-multilib g++-13-multilib libarchive-dev:i386 libcurl4-openssl-dev:i386 libgpgme-dev:i386 libgpg-error-dev:i386 libgstreamer1.0-dev:i386 libdrm-dev:i386"
         else
-          PKGS="$PKGS zlib1g-dev libssl-dev libsbc-dev libarchive-dev libcurl4-openssl-dev libgpgme-dev libgpg-error-dev libgstreamer1.0-dev"
+          PKGS="$PKGS zlib1g-dev libssl-dev libsbc-dev libarchive-dev libcurl4-openssl-dev libgpgme-dev libgpg-error-dev libgstreamer1.0-dev libdrm-dev"
         fi
         for attempt in {1..4}; do
           if sudo apt-get install -y --no-install-recommends $PKGS; then
@@ -120,16 +120,20 @@ jobs:
         -DCMAKE_C_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \
         -DCMAKE_INSTALL_PREFIX="${{matrix.build_type}}/install/usr" \
         -DCMAKE_MODULE_PATH="${PWD}/${{matrix.build_type}}/install/usr/include/WPEFramework/Modules" \
+        -DPLUGIN_BRIDGELINK=ON \
         -DPLUGIN_DEVICEIDENTIFICATION=ON \
         -DPLUGIN_DEVICEINFO=ON \
+        -DPLUGIN_DISPLAYINFO=ON \
         -DPLUGIN_LOCATIONSYNC=ON \
         -DPLUGIN_MESSAGECONTROL=ON \
         -DPLUGIN_MESSENGER=ON \
         -DPLUGIN_MONITOR=ON \
         -DPLUGIN_OPENCDMI=ON \
+        -DPLUGIN_PACKAGER=ON \
         -DPLUGIN_PERFORMANCEMETRICS=ON \
         -DPLUGIN_PLAYERINFO=ON \
-        -DPLUGIN_PACKAGER=ON \
+        -DPLUGIN_RUSTBRIDGE=ON \
+        -DPLUGIN_SECURITYAGENT=ON \
         ${{steps.plugins.outputs.first_match}}
         cmake --build ${{matrix.build_type}}/build/ThunderNanoServicesRDK --target install
 
diff --git a/BridgeLink/BridgeLink.h b/BridgeLink/BridgeLink.h
index 7fda9459..9a06b458 100644
--- a/BridgeLink/BridgeLink.h
+++ b/BridgeLink/BridgeLink.h
@@ -721,7 +721,7 @@ namespace Plugin {
                     }
                     return (result);
                 }
-                Core::hresult Subscribe(ICallback* callback, const string& event, const string& designator) override {
+                Core::hresult Subscribe(ICallback* callback, const string& event, const string& designator, const string& index) override {
                     uint32_t result = Core::ERROR_UNAVAILABLE;
 
                     _adminLock.Lock();
@@ -732,12 +732,12 @@ namespace Plugin {
                     _adminLock.Unlock();
 
                     if (link != nullptr) {
-                        result = link->Subscribe(callback, event, designator);
+                        result = link->Subscribe(callback, event, designator, index);
                         link->Release();
                     }
                     return (result);
                 }
-                Core::hresult Unsubscribe(ICallback* callback, const string& event, const string& designator) override {
+                Core::hresult Unsubscribe(ICallback* callback, const string& event, const string& designator, const string& index) override {
                     uint32_t result = Core::ERROR_UNAVAILABLE;
 
                     _adminLock.Lock();
@@ -748,7 +748,7 @@ namespace Plugin {
                     _adminLock.Unlock();
 
                     if (link != nullptr) {
-                        result = link->Unsubscribe(callback, event, designator);
+                        result = link->Unsubscribe(callback, event, designator, index);
                         link->Release();
                     }
                     return (result);
@@ -910,7 +910,7 @@ namespace Plugin {
 
                 _job.Submit();
             }
-			void Destroy(const string& callsign, PluginHost::IShell* plugin) {
+			void Destroy(const string& callsign, PluginHost::IShell* plugin VARIABLE_IS_NOT_USED) {
 
                 _adminLock.Lock();
 
@@ -947,7 +947,7 @@ namespace Plugin {
 
                 _job.Submit();
             }
-            void Activated(const string& callsign, PluginHost::IShell* plugin) {
+            void Activated(const string& callsign, PluginHost::IShell* plugin VARIABLE_IS_NOT_USED) {
                 bool change = false;
 
                 _adminLock.Lock();
@@ -966,7 +966,7 @@ namespace Plugin {
                     _job.Submit();
                 }
             }
-            void Deactivated(const string& callsign, PluginHost::IShell* plugin) {
+            void Deactivated(const string& callsign, PluginHost::IShell* plugin VARIABLE_IS_NOT_USED) {
                 bool change = false;
 
                 _adminLock.Lock();
@@ -985,7 +985,7 @@ namespace Plugin {
                     _job.Submit();
                 }
             }
-            void Unavailable(const string& callsign, PluginHost::IShell* plugin) {
+            void Unavailable(const string& callsign, PluginHost::IShell* plugin VARIABLE_IS_NOT_USED) {
                 bool change = false;
 
                 _adminLock.Lock();
diff --git a/RustBridge/RustBridge.cpp b/RustBridge/RustBridge.cpp
index c2072090..178a00e1 100644
--- a/RustBridge/RustBridge.cpp
+++ b/RustBridge/RustBridge.cpp
@@ -100,7 +100,7 @@ namespace Thunder {
             return (message);
         }
 
-        void RustBridge::Deinitialize(PluginHost::IShell* service) /* override */
+        void RustBridge::Deinitialize(PluginHost::IShell* service VARIABLE_IS_NOT_USED) /* override */
         {
             if (_service != nullptr) {
                 ASSERT(_service == _service);
@@ -156,8 +156,8 @@ namespace Thunder {
             return(assigned);
         }
 
-        void RustBridge::Detach(PluginHost::Channel& channel) /* override */ {
-            // Hopefull this does not happen as than we are loosing the actual service :-) We could do proper error handling
+        void RustBridge::Detach(PluginHost::Channel& /* channel */) /* override */ {
+            // Hopefully this does not happen as then we are losing the actual service :-) We could do proper error handling
             // if this happens :-)
             _javascriptService = 0;
         }
@@ -279,7 +279,7 @@ namespace Thunder {
             }
         }
 
-        void RustBridge::RustInvoke(const string& context, const string& method, const string& parmeters, string& response, uint32_t& result) {
+        void RustBridge::RustInvoke(const string& /* context */, const string& /* method */, const string& /* parameters */, string& /* response */, uint32_t& /* result */) {
 
         }
 
diff --git a/RustBridge/RustBridge.h b/RustBridge/RustBridge.h
index 57961ab6..b97aa490 100644
--- a/RustBridge/RustBridge.h
+++ b/RustBridge/RustBridge.h
@@ -167,7 +167,7 @@ namespace Thunder {
             RustBridge(const RustBridge&) = delete;
             RustBridge& operator=(const RustBridge&) = delete;
 
-            PUSH_WARNING(DISABLE_WARNING_THIS_IN_MEMBER_INITIALIZER_LIST);
+PUSH_WARNING(DISABLE_WARNING_THIS_IN_MEMBER_INITIALIZER_LIST)
                 RustBridge()
                 : _adminLock()
                 , _skipURL(0)
@@ -184,7 +184,7 @@ namespace Thunder {
                 , _cleaner(*this)
             {
             }
-            POP_WARNING();
+POP_WARNING()
             ~RustBridge() override = default;
 
             BEGIN_INTERFACE_MAP(RustBridge)