diff --git a/esx_kashacters/client/main.lua b/esx_kashacters/client/main.lua
index ccdb8b26..b73d8b77 100644
--- a/esx_kashacters/client/main.lua
+++ b/esx_kashacters/client/main.lua
@@ -11,6 +11,7 @@ end)
 -- This Code Was changed to fix error With player spawner as default --
 -- Link to the post with the error fix --
 -- https://forum.fivem.net/t/release-esx-kashacters-multi-character/251613/316?u=xxfri3ndlyxx --
+
 Citizen.CreateThread(function()
     while true do
         Citizen.Wait(200)
diff --git a/esx_kashacters/server/main.lua b/esx_kashacters/server/main.lua
index 5586550a..81574efe 100644
--- a/esx_kashacters/server/main.lua
+++ b/esx_kashacters/server/main.lua
@@ -3,18 +3,30 @@
 -- where identifiers are used (such as users, owned_vehicles, owned_properties etc.)
 ---------------------------------------------------------------------------------------
 
-local IdentifierTables = {
-    {table = "addon_account_data", column = "owner"},
-    {table = "addon_inventory_items", column = "owner"},
-    {table = "billing", column = "identifier"},
-    {table = "datastore_data", column = "owner"},
-    {table = "owned_vehicles", column = "owner"},
-    {table = "owned_properties", column = "owner"},
-    {table = "rented_vehicles", column = "owner"},
-    {table = "users", column = "identifier"},
-    {table = "user_licenses", column = "owner"}
-}
+local IdentifierTables = {}
 
+function GetTables()
+    MySQL.ready(function ()
+        MySQL.Async.fetchAll(" SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE COLUMN_NAME = 'owner'"}, function(result)
+            if result then
+                print(json.encode(result))
+           for k, v in pairs(result) do
+         table.insert( IdentifierTables, {table = v.TABLE_NAME, column = "owner"})
+           end
+        end
+        end)
+           MySQL.Async.fetchAll("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE COLUMN_NAME = 'identifier'"}, function(result)
+            if result then
+                print(json.encode(result))
+           for k, v in pairs(result) do
+         table.insert( IdentifierTables, {table = v.TABLE_NAME, column = "identifier"})
+           end
+        end
+          end)
+      end)
+    end
+    
+GetTables()
 RegisterServerEvent("kashactersS:SetupCharacters")
 AddEventHandler('kashactersS:SetupCharacters', function()
     local src = source