diff --git a/resources/[essential]/es_extended/config.lua b/resources/[essential]/es_extended/config.lua
index 02da4807..b6714cc6 100644
--- a/resources/[essential]/es_extended/config.lua
+++ b/resources/[essential]/es_extended/config.lua
@@ -9,3 +9,5 @@ Config.DisableWantedLevel       = true
 Config.RemoveInventoryItemDelay = 5 * 60000
 Config.EnableWeaponPickup       = true
 Config.Locale                   = 'fr'
+Config.EnableDebug              = false
+
diff --git a/resources/[essential]/es_extended/server/classes/player.lua b/resources/[essential]/es_extended/server/classes/player.lua
index 107960e7..6a29f4f1 100644
--- a/resources/[essential]/es_extended/server/classes/player.lua
+++ b/resources/[essential]/es_extended/server/classes/player.lua
@@ -318,6 +318,8 @@ function CreateExtendedPlayer(player, accounts, inventory, job, loadout, name, l
 
 	self.setJob = function(name, grade)
 		
+		local lastJob = json.decode(json.encode(self.job))
+
 		MySQL.Async.fetchAll(
 			'SELECT * FROM `jobs` WHERE `name` = @name',
 			{
@@ -353,6 +355,7 @@ function CreateExtendedPlayer(player, accounts, inventory, job, loadout, name, l
 							self.job['skin_female'] = json.decode(result[1].skin_female)
 						end
 
+						TriggerEvent("esx:setJob", self.source, self.job, lastJob)
 						TriggerClientEvent("esx:setJob", self.source, self.job)
 
 					end
diff --git a/resources/[essential]/es_extended/server/functions.lua b/resources/[essential]/es_extended/server/functions.lua
index 1ac85f8e..fad63172 100644
--- a/resources/[essential]/es_extended/server/functions.lua
+++ b/resources/[essential]/es_extended/server/functions.lua
@@ -4,6 +4,12 @@ for i = 48,  57 do table.insert(Charset, string.char(i)) end
 for i = 65,  90 do table.insert(Charset, string.char(i)) end
 for i = 97, 122 do table.insert(Charset, string.char(i)) end
 
+ESX.Trace = function(str)
+	if Config.EnableDebug then
+		print('ESX> ' .. str)
+	end
+end
+
 ESX.GetConfig = function()
 	return Config
 end
@@ -148,7 +154,7 @@ ESX.SavePlayers = function(cb)
 		end)
 	end
 
-	Async.parallelLimit(asyncTasks, 15, function(results)
+	Async.parallelLimit(asyncTasks, 8, function(results)
 		
 		RconPrint('[SAVED] All players' .. "\n")
 
@@ -164,15 +170,15 @@ ESX.StartDBSync = function()
 	
 	function saveData()
 		ESX.SavePlayers()
-		SetTimeout(60000, saveData)
+		SetTimeout(10 * 60 * 1000, saveData)
 	end
 
-	SetTimeout(60000, saveData)
+	SetTimeout(10 * 60 * 1000, saveData)
 
 end
 
 ESX.StartPayCheck = function()
-	
+
 	function payCheck()
 
 		local xPlayers = ESX.GetPlayers()