diff --git a/modules/dispatch/bub_mdt/client/client.lua b/modules/dispatch/bub-mdt/client/client.lua
similarity index 90%
rename from modules/dispatch/bub_mdt/client/client.lua
rename to modules/dispatch/bub-mdt/client/client.lua
index f5850f2..f65a4fa 100644
--- a/modules/dispatch/bub_mdt/client/client.lua
+++ b/modules/dispatch/bub-mdt/client/client.lua
@@ -1,4 +1,4 @@
-if GetResourceState('bub-mdt') ~= 'started' then return end
+if GetResourceState('bub-mdt') == 'missing' then return end
 Dispatch = Dispatch or {}
 
 Dispatch.SendAlert = function(data)
diff --git a/modules/dispatch/bub-mdt/server/server.lua b/modules/dispatch/bub-mdt/server/server.lua
new file mode 100644
index 0000000..a95dfde
--- /dev/null
+++ b/modules/dispatch/bub-mdt/server/server.lua
@@ -0,0 +1,4 @@
+if GetResourceState('bub-mdt') == 'missing' then return end
+Dispatch = Dispatch or {}
+
+return Dispatch
\ No newline at end of file
diff --git a/modules/dispatch/bub_mdt/server/server.lua b/modules/dispatch/bub_mdt/server/server.lua
deleted file mode 100644
index 60cd14c..0000000
--- a/modules/dispatch/bub_mdt/server/server.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-if GetResourceState('bub-mdt') ~= 'started' then return end
-Dispatch = Dispatch or {}
-
-return Dispatch
\ No newline at end of file
diff --git a/modules/dispatch/cd_dispatch/client/client.lua b/modules/dispatch/cd_dispatch/client/client.lua
index c37ff1e..126e33a 100644
--- a/modules/dispatch/cd_dispatch/client/client.lua
+++ b/modules/dispatch/cd_dispatch/client/client.lua
@@ -1,4 +1,4 @@
-if GetResourceState('cd_dispatch') ~= 'started' then return end
+if GetResourceState('cd_dispatch') == 'missing' then return end
 Dispatch = Dispatch or {}
 
 Dispatch.SendAlert = function(data)
diff --git a/modules/dispatch/cd_dispatch/server/server.lua b/modules/dispatch/cd_dispatch/server/server.lua
index 20f62c3..856546e 100644
--- a/modules/dispatch/cd_dispatch/server/server.lua
+++ b/modules/dispatch/cd_dispatch/server/server.lua
@@ -1,4 +1,4 @@
-if GetResourceState('cd_dispatch') ~= 'started' then return end
+if GetResourceState('cd_dispatch') == 'missing' then return end
 Dispatch = Dispatch or {}
 
 return Dispatch
\ No newline at end of file
diff --git a/modules/dispatch/lb-tablet/client/client.lua b/modules/dispatch/lb-tablet/client/client.lua
index 28483ab..d02e16f 100644
--- a/modules/dispatch/lb-tablet/client/client.lua
+++ b/modules/dispatch/lb-tablet/client/client.lua
@@ -1,4 +1,4 @@
-if GetResourceState('lb-tablet') ~= 'started' then return end
+if GetResourceState('lb-tablet') == 'missing' then return end
 Dispatch = Dispatch or {}
 
 local function getPriorityLevel(priority)
diff --git a/modules/dispatch/lb-tablet/server/server.lua b/modules/dispatch/lb-tablet/server/server.lua
index b4806d8..e23d4b4 100644
--- a/modules/dispatch/lb-tablet/server/server.lua
+++ b/modules/dispatch/lb-tablet/server/server.lua
@@ -1,4 +1,4 @@
-if GetResourceState('lb-tablet') ~= 'started' then return end
+if GetResourceState('lb-tablet') == 'missing' then return end
 Dispatch = Dispatch or {}
 
 RegisterNetEvent("community_bridge:server:dispatch:sendAlert", function(data)
diff --git a/modules/dispatch/linden_outlawalert/client/client.lua b/modules/dispatch/linden_outlawalert/client/client.lua
index eed7de0..8df6341 100644
--- a/modules/dispatch/linden_outlawalert/client/client.lua
+++ b/modules/dispatch/linden_outlawalert/client/client.lua
@@ -1,4 +1,4 @@
-if GetResourceState('linden_outlawalert') ~= 'started' then return end
+if GetResourceState('linden_outlawalert') == 'missing' then return end
 Dispatch = Dispatch or {}
 
 Dispatch.SendAlert = function(data)
diff --git a/modules/dispatch/linden_outlawalert/server/server.lua b/modules/dispatch/linden_outlawalert/server/server.lua
index 4e58535..d8d9fd6 100644
--- a/modules/dispatch/linden_outlawalert/server/server.lua
+++ b/modules/dispatch/linden_outlawalert/server/server.lua
@@ -1,4 +1,4 @@
-if GetResourceState('linden_outlawalert') ~= 'started' then return end
+if GetResourceState('linden_outlawalert') == 'missing' then return end
 Dispatch = Dispatch or {}
 
 return Dispatch
\ No newline at end of file
diff --git a/modules/dispatch/ps-dispatch/client/client.lua b/modules/dispatch/ps-dispatch/client/client.lua
index a4eb7d8..2aa3bb8 100644
--- a/modules/dispatch/ps-dispatch/client/client.lua
+++ b/modules/dispatch/ps-dispatch/client/client.lua
@@ -1,4 +1,4 @@
-if GetResourceState('ps-dispatch') ~= 'started' then return end
+if GetResourceState('ps-dispatch') == 'missing' then return end
 if GetResourceState('lb-tablet') == 'started' then return end
 Dispatch = Dispatch or {}
 
diff --git a/modules/dispatch/ps-dispatch/server/server.lua b/modules/dispatch/ps-dispatch/server/server.lua
index dde11f4..b60c698 100644
--- a/modules/dispatch/ps-dispatch/server/server.lua
+++ b/modules/dispatch/ps-dispatch/server/server.lua
@@ -1,4 +1,4 @@
-if GetResourceState('ps-dispatch') ~= 'started' then return end
+if GetResourceState('ps-dispatch') == 'missing' then return end
 if GetResourceState('lb-tablet') == 'started' then return end
 Dispatch = Dispatch or {}
 
diff --git a/modules/dispatch/qs_dispatch/client/client.lua b/modules/dispatch/qs_dispatch/client/client.lua
index f68f798..27ffc90 100644
--- a/modules/dispatch/qs_dispatch/client/client.lua
+++ b/modules/dispatch/qs_dispatch/client/client.lua
@@ -1,4 +1,4 @@
-if GetResourceState('qs-dispatch') ~= 'started' then return end
+if GetResourceState('qs-dispatch') == 'missing' then return end
 Dispatch = Dispatch or {}
 
 Dispatch.SendAlert = function(data)
diff --git a/modules/dispatch/qs_dispatch/server/server.lua b/modules/dispatch/qs_dispatch/server/server.lua
index 46fa79a..ae08560 100644
--- a/modules/dispatch/qs_dispatch/server/server.lua
+++ b/modules/dispatch/qs_dispatch/server/server.lua
@@ -1,4 +1,4 @@
-if GetResourceState('qs-dispatch') ~= 'started' then return end
+if GetResourceState('qs-dispatch') == 'missing' then return end
 Dispatch = Dispatch or {}
 
 return Dispatch
\ No newline at end of file
diff --git a/modules/dispatch/redutzu-mdt/client/client.lua b/modules/dispatch/redutzu-mdt/client/client.lua
index 895de7b..261475a 100644
--- a/modules/dispatch/redutzu-mdt/client/client.lua
+++ b/modules/dispatch/redutzu-mdt/client/client.lua
@@ -1,4 +1,4 @@
-if GetResourceState('redutzu-mdt') ~= 'started' then return end
+if GetResourceState('redutzu-mdt') == 'missing' then return end
 Dispatch = Dispatch or {}
 
 Dispatch.SendAlert = function(data)
diff --git a/modules/dispatch/redutzu-mdt/server/server.lua b/modules/dispatch/redutzu-mdt/server/server.lua
index ea72477..c1c0ac0 100644
--- a/modules/dispatch/redutzu-mdt/server/server.lua
+++ b/modules/dispatch/redutzu-mdt/server/server.lua
@@ -1,4 +1,4 @@
-if GetResourceState('redutzu-mdt') ~= 'started' then return end
+if GetResourceState('redutzu-mdt') == 'missing' then return end
 Dispatch = Dispatch or {}
 
 RegisterNetEvent("community_bridge:server:dispatch:sendAlert", function(data)
diff --git a/modules/dispatch/tk_dispatch/client/client.lua b/modules/dispatch/tk_dispatch/client/client.lua
index edfa708..0889533 100644
--- a/modules/dispatch/tk_dispatch/client/client.lua
+++ b/modules/dispatch/tk_dispatch/client/client.lua
@@ -1,4 +1,4 @@
-if GetResourceState('tk_dispatch') ~= 'started' then return end
+if GetResourceState('tk_dispatch') == 'missing' then return end
 Dispatch = Dispatch or {}
 
 Dispatch.SendAlert = function(data)
diff --git a/modules/dispatch/tk_dispatch/server/server.lua b/modules/dispatch/tk_dispatch/server/server.lua
index 688895d..aeeb8dc 100644
--- a/modules/dispatch/tk_dispatch/server/server.lua
+++ b/modules/dispatch/tk_dispatch/server/server.lua
@@ -1,4 +1,4 @@
-if GetResourceState('tk_dispatch') ~= 'started' then return end
+if GetResourceState('tk_dispatch') == 'missing' then return end
 Dispatch = Dispatch or {}
 
 return Dispatch
\ No newline at end of file
diff --git a/modules/doorlock/_default/client.lua b/modules/doorlock/_default/client.lua
new file mode 100644
index 0000000..b6d98fe
--- /dev/null
+++ b/modules/doorlock/_default/client.lua
@@ -0,0 +1,9 @@
+Doorlock = Doorlock or {}
+
+---This will get the closest door to the ped
+---@return string | nil
+Doorlock.GetClosestDoor = function()
+    return nil
+end
+
+return Doorlock
\ No newline at end of file
diff --git a/modules/doorlock/_default/server.lua b/modules/doorlock/_default/server.lua
new file mode 100644
index 0000000..882615b
--- /dev/null
+++ b/modules/doorlock/_default/server.lua
@@ -0,0 +1,13 @@
+---@diagnostic disable: duplicate-set-field
+
+Doorlock = Doorlock or {}
+
+---This will toggle the lock status of the door.
+---@param doorID string
+---@param toggle boolean
+---@return boolean
+Doorlock.ToggleDoorLock = function(doorID, toggle)
+    return true
+end
+
+return Doorlock
\ No newline at end of file
diff --git a/modules/doorlock/doors_creator/client.lua b/modules/doorlock/doors_creator/client.lua
index 26a691b..d4da080 100644
--- a/modules/doorlock/doors_creator/client.lua
+++ b/modules/doorlock/doors_creator/client.lua
@@ -1,5 +1,5 @@
 ---@diagnostic disable: duplicate-set-field
-if GetResourceState('doors_creator') ~= 'started' then return end
+if GetResourceState('doors_creator') == 'missing' then return end
 
 Doorlock = Doorlock or {}
 
diff --git a/modules/doorlock/doors_creator/server.lua b/modules/doorlock/doors_creator/server.lua
index ed9a0b1..89223e8 100644
--- a/modules/doorlock/doors_creator/server.lua
+++ b/modules/doorlock/doors_creator/server.lua
@@ -1,5 +1,5 @@
 ---@diagnostic disable: duplicate-set-field
-if GetResourceState('doors_creator') ~= 'started' then return end
+if GetResourceState('doors_creator') == 'missing' then return end
 
 Doorlock = Doorlock or {}
 
diff --git a/modules/doorlock/ox_doorlock/client.lua b/modules/doorlock/ox_doorlock/client.lua
index 04a2d31..fc35fa0 100644
--- a/modules/doorlock/ox_doorlock/client.lua
+++ b/modules/doorlock/ox_doorlock/client.lua
@@ -1,5 +1,5 @@
 ---@diagnostic disable: duplicate-set-field
-if GetResourceState('ox_doorlock') ~= 'started' then return end
+if GetResourceState('ox_doorlock') == 'missing' then return end
 
 Doorlock = Doorlock or {}
 
diff --git a/modules/doorlock/ox_doorlock/server.lua b/modules/doorlock/ox_doorlock/server.lua
index 132efa1..739751d 100644
--- a/modules/doorlock/ox_doorlock/server.lua
+++ b/modules/doorlock/ox_doorlock/server.lua
@@ -1,5 +1,5 @@
 ---@diagnostic disable: duplicate-set-field
-if GetResourceState('ox_doorlock') ~= 'started' then return end
+if GetResourceState('ox_doorlock') == 'missing' then return end
 
 Doorlock = Doorlock or {}
 
diff --git a/modules/doorlock/qb-doorlock/client.lua b/modules/doorlock/qb-doorlock/client.lua
index b5275b9..c21442b 100644
--- a/modules/doorlock/qb-doorlock/client.lua
+++ b/modules/doorlock/qb-doorlock/client.lua
@@ -1,5 +1,5 @@
 ---@diagnostic disable: duplicate-set-field
-if GetResourceState('qb-doorlock') ~= 'started' then return end
+if GetResourceState('qb-doorlock') == 'missing' then return end
 
 Doorlock = Doorlock or {}
 
diff --git a/modules/doorlock/qb-doorlock/server.lua b/modules/doorlock/qb-doorlock/server.lua
index 5fd74c9..a88a9b9 100644
--- a/modules/doorlock/qb-doorlock/server.lua
+++ b/modules/doorlock/qb-doorlock/server.lua
@@ -1,5 +1,5 @@
 ---@diagnostic disable: duplicate-set-field
-if GetResourceState('qb-doorlock') ~= 'started' then return end
+if GetResourceState('qb-doorlock') == 'missing' then return end
 
 Doorlock = Doorlock or {}
 
diff --git a/modules/doorlock/rcore_doorlock/client.lua b/modules/doorlock/rcore_doorlock/client.lua
index 11860b1..06e5a7d 100644
--- a/modules/doorlock/rcore_doorlock/client.lua
+++ b/modules/doorlock/rcore_doorlock/client.lua
@@ -1,5 +1,5 @@
 ---@diagnostic disable: duplicate-set-field
-if GetResourceState('rcore_doorlock') ~= 'started' then return end
+if GetResourceState('rcore_doorlock') == 'missing' then return end
 
 Doorlock = Doorlock or {}
 
diff --git a/modules/doorlock/rcore_doorlock/server.lua b/modules/doorlock/rcore_doorlock/server.lua
index 016f952..176e23e 100644
--- a/modules/doorlock/rcore_doorlock/server.lua
+++ b/modules/doorlock/rcore_doorlock/server.lua
@@ -1,5 +1,5 @@
 ---@diagnostic disable: duplicate-set-field
-if GetResourceState('rcore_doorlock') ~= 'started' then return end
+if GetResourceState('rcore_doorlock') == 'missing' then return end
 
 Doorlock = Doorlock or {}
 
diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua
index 780b20f..5c35c8a 100644
--- a/modules/framework/es_extended/server.lua
+++ b/modules/framework/es_extended/server.lua
@@ -1,5 +1,6 @@
 ---@diagnostic disable: duplicate-set-field
 if GetResourceState('es_extended') ~= 'started' then return end
+
 Prints = Prints or Require("lib/utility/shared/prints.lua")
 
 ESX = exports["es_extended"]:getSharedObject()
diff --git a/modules/framework/qb-core/client.lua b/modules/framework/qb-core/client.lua
index 8686657..c95bfb3 100644
--- a/modules/framework/qb-core/client.lua
+++ b/modules/framework/qb-core/client.lua
@@ -2,9 +2,11 @@
 if GetResourceState('qb-core') ~= 'started' then return end
 if GetResourceState('qbx_core') == 'started' then return end
 
+Framework = Framework or {}
+
 QBCore = exports['qb-core']:GetCoreObject()
 
-Framework = Framework or {}
+Framework.Shared = QBCore.Shared
 
 ---This will get the name of the framework being used (if a supported framework).
 ---@return string
@@ -160,8 +162,6 @@ Framework.GetIsPlayerDead = function()
     return playerData.metadata["isdead"] or playerData.metadata["inlaststand"]
 end
 
-Framework.Shared = QBCore.Shared
-
 RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function()
     Wait(1500)
     TriggerEvent('community_bridge:Client:OnPlayerLoaded')
diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua
index 9885980..34d8541 100644
--- a/modules/framework/qb-core/server.lua
+++ b/modules/framework/qb-core/server.lua
@@ -2,10 +2,12 @@
 if GetResourceState('qb-core') ~= 'started' then return end
 if GetResourceState('qbx_core') == 'started' then return end
 
+Framework = Framework or {}
+
 QBCore = exports['qb-core']:GetCoreObject()
 
-Framework = Framework or {}
 Framework.Shared = QBCore.Shared
+
 Framework.GetFrameworkName = function()
     return 'qb-core'
 end
diff --git a/modules/framework/qbx_core/server.lua b/modules/framework/qbx_core/server.lua
index a7064b7..3c9af8a 100644
--- a/modules/framework/qbx_core/server.lua
+++ b/modules/framework/qbx_core/server.lua
@@ -1,10 +1,10 @@
 ---@diagnostic disable: duplicate-set-field
 if GetResourceState('qbx_core') ~= 'started' then return end
 
-local QBox = exports.qbx_core
-
 Framework = Framework or {}
 
+local QBox = exports.qbx_core
+
 ---Returns the name of the framework being used (if a supported framework).
 ---@return string
 Framework.GetFrameworkName = function()
diff --git a/modules/fuel/bigDaddy-Fuel/client.lua b/modules/fuel/bigDaddy-Fuel/client.lua
index 00f8f75..a569f87 100644
--- a/modules/fuel/bigDaddy-Fuel/client.lua
+++ b/modules/fuel/bigDaddy-Fuel/client.lua
@@ -1,7 +1,5 @@
 local resourceName = "BigDaddy-Fuel"
-local configValue = BridgeClientConfig.Fuel
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
-
+if GetResourceState(resourceName) == 'missing' then return end
 Fuel = Fuel or {}
 
 ---This will get the name of the Fuel being used (if a supported Fuel).
diff --git a/modules/fuel/cdn-fuel/client.lua b/modules/fuel/cdn-fuel/client.lua
index 1dba7dd..05ed82b 100644
--- a/modules/fuel/cdn-fuel/client.lua
+++ b/modules/fuel/cdn-fuel/client.lua
@@ -1,7 +1,5 @@
 local resourceName = "cdn-fuel"
-local configValue = BridgeClientConfig.Fuel
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
-
+if GetResourceState(resourceName) == 'missing' then return end
 Fuel = Fuel or {}
 
 ---This will get the name of the Fuel being used (if a supported Fuel).
diff --git a/modules/fuel/esx-sna-fuel/client.lua b/modules/fuel/esx-sna-fuel/client.lua
index cc15388..80d2203 100644
--- a/modules/fuel/esx-sna-fuel/client.lua
+++ b/modules/fuel/esx-sna-fuel/client.lua
@@ -1,7 +1,5 @@
 local resourceName = "esx-sna-fuel"
-local configValue = BridgeClientConfig.Fuel
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
-
+if GetResourceState(resourceName) == 'missing' then return end
 Fuel = Fuel or {}
 
 ---This will get the name of the Fuel being used (if a supported Fuel).
diff --git a/modules/fuel/lc_fuel/client.lua b/modules/fuel/lc_fuel/client.lua
index 551aef2..21b03a3 100644
--- a/modules/fuel/lc_fuel/client.lua
+++ b/modules/fuel/lc_fuel/client.lua
@@ -1,8 +1,6 @@
 ---@diagnostic disable: duplicate-set-field
 local resourceName = "lc_fuel"
-local configValue = BridgeClientConfig.Fuel
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
-
+if GetResourceState(resourceName) == 'missing' then return end
 Fuel = Fuel or {}
 
 ---This will get the name of the Fuel being used (if a supported Fuel).
diff --git a/modules/fuel/legacyfuel/client.lua b/modules/fuel/legacyfuel/client.lua
index 4903687..04694f1 100644
--- a/modules/fuel/legacyfuel/client.lua
+++ b/modules/fuel/legacyfuel/client.lua
@@ -1,7 +1,5 @@
 local resourceName = "LegacyFuel"
-local configValue = BridgeClientConfig.Fuel
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
-
+if GetResourceState(resourceName) == 'missing' then return end
 Fuel = Fuel or {}
 
 ---This will get the name of the Fuel being used (if a supported Fuel).
diff --git a/modules/fuel/okokGasStation/client.lua b/modules/fuel/okokGasStation/client.lua
index 42785fe..f4c93a2 100644
--- a/modules/fuel/okokGasStation/client.lua
+++ b/modules/fuel/okokGasStation/client.lua
@@ -1,7 +1,5 @@
 local resourceName = "okokGasStation"
-local configValue = BridgeClientConfig.Fuel
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
-
+if GetResourceState(resourceName) == 'missing' then return end
 Fuel = Fuel or {}
 
 ---This will get the name of the Fuel being used (if a supported Fuel).
diff --git a/modules/fuel/ox_fuel/client.lua b/modules/fuel/ox_fuel/client.lua
index 1001582..964b201 100644
--- a/modules/fuel/ox_fuel/client.lua
+++ b/modules/fuel/ox_fuel/client.lua
@@ -1,7 +1,5 @@
 local resourceName = "ox_fuel"
-local configValue = BridgeClientConfig.Fuel
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
-
+if GetResourceState(resourceName) == 'missing' then return end
 Fuel = Fuel or {}
 
 ---This will get the name of the Fuel being used (if a supported Fuel).
diff --git a/modules/fuel/ps-fuel/client.lua b/modules/fuel/ps-fuel/client.lua
index ee84b1a..d19bd2f 100644
--- a/modules/fuel/ps-fuel/client.lua
+++ b/modules/fuel/ps-fuel/client.lua
@@ -1,7 +1,5 @@
 local resourceName = "ps-fuel"
-local configValue = BridgeClientConfig.Fuel
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
-
+if GetResourceState(resourceName) == 'missing' then return end
 Fuel = Fuel or {}
 
 ---This will get the name of the Fuel being used (if a supported Fuel).
diff --git a/modules/fuel/qs-fuelstations/client.lua b/modules/fuel/qs-fuelstations/client.lua
index ab5c571..ea6827a 100644
--- a/modules/fuel/qs-fuelstations/client.lua
+++ b/modules/fuel/qs-fuelstations/client.lua
@@ -1,7 +1,5 @@
 local resourceName = "qs-fuelstations"
-local configValue = BridgeClientConfig.Fuel
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
-
+if GetResourceState(resourceName) == 'missing' then return end
 Fuel = Fuel or {}
 
 ---This will get the name of the Fuel being used (if a supported Fuel).
diff --git a/modules/fuel/renewed-Fuel/client.lua b/modules/fuel/renewed-Fuel/client.lua
index 8ed1f66..39ff817 100644
--- a/modules/fuel/renewed-Fuel/client.lua
+++ b/modules/fuel/renewed-Fuel/client.lua
@@ -1,7 +1,5 @@
 local resourceName = "Renewed-Fuel"
-local configValue = BridgeClientConfig.Fuel
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
-
+if GetResourceState(resourceName) == 'missing' then return end
 Fuel = Fuel or {}
 
 ---This will get the name of the Fuel being used (if a supported Fuel).
diff --git a/modules/fuel/ti_fuel/client.lua b/modules/fuel/ti_fuel/client.lua
index 54471e2..41f4553 100644
--- a/modules/fuel/ti_fuel/client.lua
+++ b/modules/fuel/ti_fuel/client.lua
@@ -1,7 +1,5 @@
 local resourceName = "ti_fuel"
-local configValue = BridgeClientConfig.Fuel
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
-
+if GetResourceState(resourceName) == 'missing' then return end
 Fuel = Fuel or {}
 
 ---This will get the name of the Fuel being used (if a supported Fuel).
diff --git a/modules/fuel/x-fuel/client.lua b/modules/fuel/x-fuel/client.lua
index b00f604..ce2bdf6 100644
--- a/modules/fuel/x-fuel/client.lua
+++ b/modules/fuel/x-fuel/client.lua
@@ -1,7 +1,5 @@
 local resourceName = "x-fuel"
-local configValue = BridgeClientConfig.Fuel
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
-
+if GetResourceState(resourceName) == 'missing' then return end
 Fuel = Fuel or {}
 
 ---This will get the name of the Fuel being used (if a supported Fuel).
diff --git a/modules/helptext/_default/client.lua b/modules/helptext/_default/client.lua
index bfab021..13bd0c1 100644
--- a/modules/helptext/_default/client.lua
+++ b/modules/helptext/_default/client.lua
@@ -4,14 +4,12 @@ HelpText = HelpText or {}
 ---@param message string
 ---@param _position string
 ---@return nil
----@diagnostic disable-next-line: duplicate-set-field
 HelpText.ShowHelpText = function(message, _position)
     return Framework.ShowHelpText(message, _position)
 end
 
 ---This will hide the help text message on the screen
 ---@return nil
----@diagnostic disable-next-line: duplicate-set-field
 HelpText.HideHelpText = function()
     return Framework.HideHelpText()
 end
diff --git a/modules/helptext/_default/server.lua b/modules/helptext/_default/server.lua
index c670c93..48115a8 100644
--- a/modules/helptext/_default/server.lua
+++ b/modules/helptext/_default/server.lua
@@ -4,14 +4,12 @@ HelpText = HelpText or {}
 ---@param src number
 ---@param message string
 ---@param position string
----@diagnostic disable-next-line: duplicate-set-field
 HelpText.ShowHelpText = function(src, message, position)
     TriggerClientEvent('community_bridge:Client:ShowHelpText', src, message, position)
 end
 
 ---This will hide the help text message on the screen for the specified player
 ---@param src number
----@diagnostic disable-next-line: duplicate-set-field
 HelpText.HideHelpText = function(src)
     TriggerClientEvent('community_bridge:Client:HideHelpText', src)
 end
diff --git a/modules/housing/bcs-housing/client.lua b/modules/housing/bcs-housing/client.lua
index 398b713..ab420d2 100644
--- a/modules/housing/bcs-housing/client.lua
+++ b/modules/housing/bcs-housing/client.lua
@@ -1,4 +1,4 @@
-if GetResourceState('bcs-housing') ~= 'started' then return end
+if GetResourceState('bcs-housing') == 'missing' then return end
 
 Housing = Housing or {}
 
diff --git a/modules/housing/bcs-housing/server.lua b/modules/housing/bcs-housing/server.lua
index 7a8f747..3745ce9 100644
--- a/modules/housing/bcs-housing/server.lua
+++ b/modules/housing/bcs-housing/server.lua
@@ -1,4 +1,4 @@
-if GetResourceState('bcs-housing') ~= 'started' then return end
+if GetResourceState('bcs-housing') == 'missing' then return end
 
 Housing = Housing or {}
 
diff --git a/modules/housing/esx_property/client.lua b/modules/housing/esx_property/client.lua
index dc61c00..50ca417 100644
--- a/modules/housing/esx_property/client.lua
+++ b/modules/housing/esx_property/client.lua
@@ -1,4 +1,4 @@
-if GetResourceState('esx_property') ~= 'started' then return end
+if GetResourceState('esx_property') == 'missing' then return end
 
 Housing = Housing or {}
 
diff --git a/modules/housing/esx_property/server.lua b/modules/housing/esx_property/server.lua
index 118fa7a..420a2f0 100644
--- a/modules/housing/esx_property/server.lua
+++ b/modules/housing/esx_property/server.lua
@@ -1,4 +1,4 @@
-if GetResourceState('esx_property') ~= 'started' then return end
+if GetResourceState('esx_property') == 'missing' then return end
 
 Housing = Housing or {}
 
diff --git a/modules/housing/ps-housing/client.lua b/modules/housing/ps-housing/client.lua
index b7f5d8e..a174c0f 100644
--- a/modules/housing/ps-housing/client.lua
+++ b/modules/housing/ps-housing/client.lua
@@ -1,4 +1,4 @@
-if GetResourceState('ps-housing') ~= 'started' then return end
+if GetResourceState('ps-housing') == 'missing' then return end
 
 Housing = Housing or {}
 
diff --git a/modules/housing/ps-housing/server.lua b/modules/housing/ps-housing/server.lua
index 52a2e48..e4640d2 100644
--- a/modules/housing/ps-housing/server.lua
+++ b/modules/housing/ps-housing/server.lua
@@ -1,4 +1,4 @@
-if GetResourceState('ps-housing') ~= 'started' then return end
+if GetResourceState('ps-housing') == 'missing' then return end
 
 Housing = Housing or {}
 
diff --git a/modules/housing/qb-appartments/client.lua b/modules/housing/qb-appartments/client.lua
index 2ce29c9..415e0da 100644
--- a/modules/housing/qb-appartments/client.lua
+++ b/modules/housing/qb-appartments/client.lua
@@ -1,4 +1,4 @@
-if GetResourceState('qb-appartments') ~= 'started' then return end
+if GetResourceState('qb-appartments') == 'missing' then return end
 
 Housing = Housing or {}
 
diff --git a/modules/housing/qb-appartments/server.lua b/modules/housing/qb-appartments/server.lua
index cfd0982..9b92c1f 100644
--- a/modules/housing/qb-appartments/server.lua
+++ b/modules/housing/qb-appartments/server.lua
@@ -1,4 +1,4 @@
-if GetResourceState('qb-appartments') ~= 'started' then return end
+if GetResourceState('qb-appartments') == 'missing' then return end
 
 Housing = Housing or {}
 
diff --git a/modules/housing/qb-houses/client.lua b/modules/housing/qb-houses/client.lua
index 4208627..1733b77 100644
--- a/modules/housing/qb-houses/client.lua
+++ b/modules/housing/qb-houses/client.lua
@@ -1,4 +1,4 @@
-if GetResourceState('qb-houses') ~= 'started' then return end
+if GetResourceState('qb-houses') == 'missing' then return end
 
 Housing = Housing or {}
 
diff --git a/modules/housing/qb-houses/server.lua b/modules/housing/qb-houses/server.lua
index a06d537..f2d4265 100644
--- a/modules/housing/qb-houses/server.lua
+++ b/modules/housing/qb-houses/server.lua
@@ -1,4 +1,4 @@
-if GetResourceState('qb-houses') ~= 'started' then return end
+if GetResourceState('qb-houses') == 'missing' then return end
 
 Housing = Housing or {}
 
diff --git a/modules/managment/Renewed-Banking/server.lua b/modules/managment/Renewed-Banking/server.lua
index 3acccc8..f1d8525 100644
--- a/modules/managment/Renewed-Banking/server.lua
+++ b/modules/managment/Renewed-Banking/server.lua
@@ -1,5 +1,5 @@
 ---@diagnostic disable: duplicate-set-field
-if GetResourceState('Renewed-Banking') ~= 'started' then return end
+if GetResourceState('Renewed-Banking') == 'missing' then return end
 Managment = Managment or {}
 
 ---This will return a table with account details
diff --git a/modules/managment/fd_banking/server.lua b/modules/managment/fd_banking/server.lua
index a90bc74..0f03308 100644
--- a/modules/managment/fd_banking/server.lua
+++ b/modules/managment/fd_banking/server.lua
@@ -1,5 +1,5 @@
 ---@diagnostic disable: duplicate-set-field
-if GetResourceState('fd_banking') ~= 'started' then return end
+if GetResourceState('fd_banking') == 'missing' then return end
 Managment = Managment or {}
 
 local fd_banking = exports['fd_banking']
diff --git a/modules/managment/okokBanking/server.lua b/modules/managment/okokBanking/server.lua
index ddfbfd5..0f5c585 100644
--- a/modules/managment/okokBanking/server.lua
+++ b/modules/managment/okokBanking/server.lua
@@ -1,5 +1,5 @@
 ---@diagnostic disable: duplicate-set-field
-if GetResourceState('okokBanking') ~= 'started' then return end
+if GetResourceState('okokBanking') == 'missing' then return end
 Managment = Managment or {}
 
 local okokBanking = exports['okokBanking']
diff --git a/modules/managment/qb-banking/server.lua b/modules/managment/qb-banking/server.lua
index f86bc07..dc2c5f9 100644
--- a/modules/managment/qb-banking/server.lua
+++ b/modules/managment/qb-banking/server.lua
@@ -1,5 +1,5 @@
 ---@diagnostic disable: duplicate-set-field
-if GetResourceState('qb-banking') ~= 'started' then return end
+if GetResourceState('qb-banking') == 'missing' then return end
 Managment = Managment or {}
 
 local qbBanking = exports['qb-banking']
diff --git a/modules/phone/gksphone/client.lua b/modules/phone/gksphone/client.lua
index ead89bb..8b1e62d 100644
--- a/modules/phone/gksphone/client.lua
+++ b/modules/phone/gksphone/client.lua
@@ -1,6 +1,5 @@
 local resourceName = "gksphone"
-local configValue = BridgeSharedConfig.Phone
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
+if GetResourceState(resourceName) == 'missing' then return end
 
 Phone = Phone or {}
 
diff --git a/modules/phone/gksphone/server.lua b/modules/phone/gksphone/server.lua
index 8d72d62..f00ae9c 100644
--- a/modules/phone/gksphone/server.lua
+++ b/modules/phone/gksphone/server.lua
@@ -1,6 +1,5 @@
 local resourceName = "gksphone"
-local configValue = BridgeSharedConfig.Phone
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
+if GetResourceState(resourceName) == 'missing' then return end
 Phone = Phone or {}
 
 ---comment
diff --git a/modules/phone/lb-phone/client.lua b/modules/phone/lb-phone/client.lua
index 450f364..c8dcd2b 100644
--- a/modules/phone/lb-phone/client.lua
+++ b/modules/phone/lb-phone/client.lua
@@ -1,6 +1,5 @@
 local resourceName = "lb-phone"
-local configValue = BridgeSharedConfig.Phone
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
+if GetResourceState(resourceName) == 'missing' then return end
 Phone = Phone or {}
 
 ---comment
diff --git a/modules/phone/lb-phone/server.lua b/modules/phone/lb-phone/server.lua
index 6545f23..90a1cde 100644
--- a/modules/phone/lb-phone/server.lua
+++ b/modules/phone/lb-phone/server.lua
@@ -1,6 +1,5 @@
 local resourceName = "lb-phone"
-local configValue = BridgeSharedConfig.Phone
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
+if GetResourceState(resourceName) == 'missing' then return end
 Phone = Phone or {}
 
 ---@diagnostic disable-next-line: duplicate-set-field
diff --git a/modules/phone/okokPhone/client.lua b/modules/phone/okokPhone/client.lua
index c6fd86d..638b348 100644
--- a/modules/phone/okokPhone/client.lua
+++ b/modules/phone/okokPhone/client.lua
@@ -1,7 +1,5 @@
 local resourceName = "okokPhone"
-local configValue = BridgeSharedConfig.Phone
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
-
+if GetResourceState(resourceName) == 'missing' then return end
 Phone = Phone or {}
 
 ---comment
diff --git a/modules/phone/okokPhone/server.lua b/modules/phone/okokPhone/server.lua
index d493309..27dd81d 100644
--- a/modules/phone/okokPhone/server.lua
+++ b/modules/phone/okokPhone/server.lua
@@ -14,8 +14,7 @@
 ---@field data any
 
 local resourceName = "okokPhone"
-local configValue = BridgeSharedConfig.Phone
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
+if GetResourceState(resourceName) == 'missing' then return end
 Phone = Phone or {}
 
 ---comment
diff --git a/modules/phone/qs-smartphone/client.lua b/modules/phone/qs-smartphone/client.lua
index f0466a3..61a23f2 100644
--- a/modules/phone/qs-smartphone/client.lua
+++ b/modules/phone/qs-smartphone/client.lua
@@ -1,6 +1,5 @@
 local resourceName = "qs-smartphone"
-local configValue = BridgeSharedConfig.Phone
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
+if GetResourceState(resourceName) == 'missing' then return end
 Phone = Phone or {}
 
 ---comment
diff --git a/modules/phone/qs-smartphone/server.lua b/modules/phone/qs-smartphone/server.lua
index 792674a..840db7b 100644
--- a/modules/phone/qs-smartphone/server.lua
+++ b/modules/phone/qs-smartphone/server.lua
@@ -1,6 +1,5 @@
 local resourceName = "qs-smartphone"
-local configValue = BridgeSharedConfig.Phone
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
+if GetResourceState(resourceName) == 'missing' then return end
 Phone = Phone or {}
 
 ---comment
diff --git a/modules/target/ox_target/client.lua b/modules/target/ox_target/client.lua
index d65b7e6..2e1ac85 100644
--- a/modules/target/ox_target/client.lua
+++ b/modules/target/ox_target/client.lua
@@ -1,7 +1,5 @@
 local resourceName = "ox_target"
-local configValue = BridgeClientConfig.TargetSystem
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
-
+if GetResourceState(resourceName) == 'missing' then return end
 
 local targetDebug = false
 local function detectDebugEnabled()
diff --git a/modules/target/qb-target/client.lua b/modules/target/qb-target/client.lua
index 516b4e8..3b2dbe0 100644
--- a/modules/target/qb-target/client.lua
+++ b/modules/target/qb-target/client.lua
@@ -1,7 +1,6 @@
 local resourceName = "qb-target"
-local configValue = BridgeClientConfig.TargetSystem
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
-if GetResourceState('ox_target') == 'started' then return end -- this is for older versions of ox that supported the backwards compatability. As its depricated we dont want to touch that.
+if GetResourceState(resourceName) == 'missing' then return end
+if GetResourceState("ox_target") == 'started' then return end
 
 local targetDebug = false
 local function detectDebugEnabled()
diff --git a/modules/target/sleepless_interact/client.lua b/modules/target/sleepless_interact/client.lua
index 0e924b2..6054e0f 100644
--- a/modules/target/sleepless_interact/client.lua
+++ b/modules/target/sleepless_interact/client.lua
@@ -1,7 +1,6 @@
 local resourceName = "sleepless_interact"
-local configValue = BridgeClientConfig.TargetSystem
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
-
+if GetResourceState(resourceName) == 'missing' then return end
+if GetResourceState("ox_target") == 'started' then return end
 
 local targetDebug = false
 local function detectDebugEnabled()
@@ -40,7 +39,6 @@ Target.AddGlobalPlayer = function(options)
 end
 
 Target.DisableTargeting = function(bool)
-    --sleepless_interact:disableTargeting(bool)
     sleepless_interact:disableInteract(bool)
 end
 
diff --git a/modules/vehicleKey/F_RealCarKeysSystem/client/client.lua b/modules/vehicleKey/F_RealCarKeysSystem/client/client.lua
index 5ba0f96..df7220b 100644
--- a/modules/vehicleKey/F_RealCarKeysSystem/client/client.lua
+++ b/modules/vehicleKey/F_RealCarKeysSystem/client/client.lua
@@ -1,7 +1,5 @@
 local resourceName = "F_RealCarKeysSystem"
-local configValue = BridgeClientConfig.VehicleKey
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
-
+if GetResourceState(resourceName) == 'missing' then return end
 VehicleKey = VehicleKey or {}
 
 VehicleKey.GiveKeys = function(vehicle, plate)
diff --git a/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua b/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua
index 2790419..43e9f8a 100644
--- a/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua
+++ b/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua
@@ -1,6 +1,5 @@
 local resourceName = "MrNewbVehicleKeys"
-local configValue = BridgeClientConfig.VehicleKey
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
+if GetResourceState(resourceName) == 'missing' then return end
 
 VehicleKey = VehicleKey or {}
 
diff --git a/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua b/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua
index baf44c4..d697701 100644
--- a/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua
+++ b/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua
@@ -1,6 +1,5 @@
 local resourceName = "Renewed-Vehiclekeys"
-local configValue = BridgeClientConfig.VehicleKey
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
+if GetResourceState(resourceName) == 'missing' then return end
 
 VehicleKey = VehicleKey or {}
 
diff --git a/modules/vehicleKey/cd_garage/client/client.lua b/modules/vehicleKey/cd_garage/client/client.lua
index 7250703..a2bcfc1 100644
--- a/modules/vehicleKey/cd_garage/client/client.lua
+++ b/modules/vehicleKey/cd_garage/client/client.lua
@@ -1,6 +1,5 @@
 local resourceName = "cd_garage"
-local configValue = BridgeClientConfig.VehicleKey
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
+if GetResourceState(resourceName) == 'missing' then return end
 
 VehicleKey = VehicleKey or {}
 
diff --git a/modules/vehicleKey/jacksam/client.lua b/modules/vehicleKey/jacksam/client.lua
index 4259aa4..88c92ca 100644
--- a/modules/vehicleKey/jacksam/client.lua
+++ b/modules/vehicleKey/jacksam/client.lua
@@ -1,7 +1,5 @@
 local resourceName = "jaksams_VehiclesKeys"
-local configValue = BridgeClientConfig.VehicleKey
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
-
+if GetResourceState(resourceName) == 'missing' then return end
 
 VehicleKey = VehicleKey or {}
 
diff --git a/modules/vehicleKey/mk_vehiclekeys/client/client.lua b/modules/vehicleKey/mk_vehiclekeys/client/client.lua
index 58227de..d66b816 100644
--- a/modules/vehicleKey/mk_vehiclekeys/client/client.lua
+++ b/modules/vehicleKey/mk_vehiclekeys/client/client.lua
@@ -1,7 +1,5 @@
 local resourceName = "mk_vehiclekeys"
-local configValue = BridgeClientConfig.VehicleKey
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
-
+if GetResourceState(resourceName) == 'missing' then return end
 VehicleKey = VehicleKey or {}
 
 VehicleKey.GiveKeys = function(vehicle, plate)
diff --git a/modules/vehicleKey/mono_carkeys/client/client.lua b/modules/vehicleKey/mono_carkeys/client/client.lua
index 793bd5a..6796dfc 100644
--- a/modules/vehicleKey/mono_carkeys/client/client.lua
+++ b/modules/vehicleKey/mono_carkeys/client/client.lua
@@ -1,6 +1,5 @@
 local resourceName = "mono_carkeys"
-local configValue = BridgeClientConfig.VehicleKey
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
+if GetResourceState(resourceName) == 'missing' then return end
 
 VehicleKey = VehicleKey or {}
 VehicleKey.GiveKeys = function(vehicle, plate)
diff --git a/modules/vehicleKey/okokGarage/client/client.lua b/modules/vehicleKey/okokGarage/client/client.lua
index 27dba9a..d2b8d65 100644
--- a/modules/vehicleKey/okokGarage/client/client.lua
+++ b/modules/vehicleKey/okokGarage/client/client.lua
@@ -1,6 +1,5 @@
 local resourceName = "okokGarage"
-local configValue = BridgeClientConfig.VehicleKey
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
+if GetResourceState(resourceName) == 'missing' then return end
 
 VehicleKey = VehicleKey or {}
 
diff --git a/modules/vehicleKey/qb-vehiclekeys/client/client.lua b/modules/vehicleKey/qb-vehiclekeys/client/client.lua
index f553cea..865f81d 100644
--- a/modules/vehicleKey/qb-vehiclekeys/client/client.lua
+++ b/modules/vehicleKey/qb-vehiclekeys/client/client.lua
@@ -1,6 +1,5 @@
 local resourceName = "qb-vehiclekeys"
-local configValue = BridgeClientConfig.VehicleKey
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
+if GetResourceState(resourceName) == 'missing' then return end
 
 VehicleKey = VehicleKey or {}
 
diff --git a/modules/vehicleKey/qbx_vehiclekeys/client/client.lua b/modules/vehicleKey/qbx_vehiclekeys/client/client.lua
index a815939..d617ac4 100644
--- a/modules/vehicleKey/qbx_vehiclekeys/client/client.lua
+++ b/modules/vehicleKey/qbx_vehiclekeys/client/client.lua
@@ -1,6 +1,5 @@
 local resourceName = "qbx_vehiclekeys"
-local configValue = BridgeClientConfig.VehicleKey
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
+if GetResourceState(resourceName) == 'missing' then return end
 
 VehicleKey = VehicleKey or {}
 
diff --git a/modules/vehicleKey/qs-vehiclekeys/client/client.lua b/modules/vehicleKey/qs-vehiclekeys/client/client.lua
index 6f8c3e0..79a79cd 100644
--- a/modules/vehicleKey/qs-vehiclekeys/client/client.lua
+++ b/modules/vehicleKey/qs-vehiclekeys/client/client.lua
@@ -1,6 +1,5 @@
 local resourceName = "qs-vehiclekeys"
-local configValue = BridgeClientConfig.VehicleKey
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
+if GetResourceState(resourceName) == 'missing' then return end
 
 VehicleKey = VehicleKey or {}
 
diff --git a/modules/vehicleKey/t1ger_keys/client/client.lua b/modules/vehicleKey/t1ger_keys/client/client.lua
index e2107b4..4b44183 100644
--- a/modules/vehicleKey/t1ger_keys/client/client.lua
+++ b/modules/vehicleKey/t1ger_keys/client/client.lua
@@ -1,6 +1,5 @@
 local resourceName = "t1ger_keys"
-local configValue = BridgeClientConfig.VehicleKey
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
+if GetResourceState(resourceName) == 'missing' then return end
 
 VehicleKey = VehicleKey or {}
 
diff --git a/modules/vehicleKey/wasabi_carlock/client/client.lua b/modules/vehicleKey/wasabi_carlock/client/client.lua
index a66377a..2db6d9e 100644
--- a/modules/vehicleKey/wasabi_carlock/client/client.lua
+++ b/modules/vehicleKey/wasabi_carlock/client/client.lua
@@ -1,6 +1,5 @@
 local resourceName = "wasabi_carlock"
-local configValue = BridgeClientConfig.VehicleKey
-if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end
+if GetResourceState(resourceName) == 'missing' then return end
 
 VehicleKey = VehicleKey or {}
 
diff --git a/modules/weather/cd_easytime/client.lua b/modules/weather/cd_easytime/client.lua
index 7808160..d658766 100644
--- a/modules/weather/cd_easytime/client.lua
+++ b/modules/weather/cd_easytime/client.lua
@@ -1,4 +1,4 @@
-if GetResourceState('cd_easytime') ~= 'started' then return end
+if GetResourceState('cd_easytime') == 'missing' then return end
 Weather = Weather or {}
 
 ---comment
diff --git a/modules/weather/qb-weathersync/client/client.lua b/modules/weather/qb-weathersync/client/client.lua
index df628c7..28ba8d5 100644
--- a/modules/weather/qb-weathersync/client/client.lua
+++ b/modules/weather/qb-weathersync/client/client.lua
@@ -1,4 +1,4 @@
-if GetResourceState('qb-weathersync') ~= 'started' then return end
+if GetResourceState('qb-weathersync') == 'missing' then return end
 Weather = Weather or {}
 
 ---comment
diff --git a/modules/weather/renewed-weathersync/client/client.lua b/modules/weather/renewed-weathersync/client/client.lua
index d531bee..2a1f471 100644
--- a/modules/weather/renewed-weathersync/client/client.lua
+++ b/modules/weather/renewed-weathersync/client/client.lua
@@ -1,4 +1,4 @@
-if GetResourceState('Renewed-Weathersync') ~= 'started' then return end
+if GetResourceState('Renewed-Weathersync') == 'missing' then return end
 Weather = Weather or {}
 
 ---comment