diff --git a/esx_basicneeds.sql b/esx_basicneeds.sql
index 02d24aa6..2bf6df1f 100644
--- a/esx_basicneeds.sql
+++ b/esx_basicneeds.sql
@@ -1,6 +1,6 @@
 USE `essentialmode`;
 
-INSERT INTO `items` (`name`, `label`, `limit`) VALUES
-	('bread', 'Pain', 10),
-	('water', 'Eau', 5)
-;
\ No newline at end of file
+INSERT INTO `items` (`name`, `label`, `weight`) VALUES
+	('bread', 'Pain', 1),
+	('water', 'Eau', 1)
+;
diff --git a/localization/de_esx_basicneeds.sql b/localization/de_esx_basicneeds.sql
index 0e097e34..6dcf8319 100644
--- a/localization/de_esx_basicneeds.sql
+++ b/localization/de_esx_basicneeds.sql
@@ -1,6 +1,6 @@
 USE `essentialmode`;
 
-INSERT INTO `items` (`name`, `label`, `limit`) VALUES
-	('bread', 'Brot', 10),
-	('water', 'Wasser', 5)
-;
\ No newline at end of file
+INSERT INTO `items` (`name`, `label`, `weight`) VALUES
+	('bread', 'Brot', 1),
+	('water', 'Wasser', 1)
+;
diff --git a/localization/fi_esx_basicneeds.sql b/localization/fi_esx_basicneeds.sql
index 222cd54b..96a7a19d 100644
--- a/localization/fi_esx_basicneeds.sql
+++ b/localization/fi_esx_basicneeds.sql
@@ -1,6 +1,6 @@
 USE `essentialmode`;
 
-INSERT INTO `items` (`name`, `label`, `limit`) VALUES
-	('bread', 'Leipä', 10),
-	('water', 'Vesi', 5)
-;
\ No newline at end of file
+INSERT INTO `items` (`name`, `label`, `weight`) VALUES
+	('bread', 'Leipä', 1),
+	('water', 'Vesi', 1)
+;
diff --git a/localization/pl_esx_basicneeds.sql b/localization/pl_esx_basicneeds.sql
index dab8eeb7..3510f9cd 100644
--- a/localization/pl_esx_basicneeds.sql
+++ b/localization/pl_esx_basicneeds.sql
@@ -1,6 +1,6 @@
 USE `essentialmode`;
 
-INSERT INTO `items` (`name`, `label`, `limit`) VALUES
-	('bread', 'Chleb', 10),
-	('water', 'Woda', 5)
-;
\ No newline at end of file
+INSERT INTO `items` (`name`, `label`, `weight`) VALUES
+	('bread', 'Chleb', 1),
+	('water', 'Woda', 1)
+;
diff --git a/localization/sv_esx_basicneeds.sql b/localization/sv_esx_basicneeds.sql
index a22ab46b..be91ddc8 100644
--- a/localization/sv_esx_basicneeds.sql
+++ b/localization/sv_esx_basicneeds.sql
@@ -1,6 +1,6 @@
 USE `essentialmode`;
 
-INSERT INTO `items` (`name`, `label`, `limit`) VALUES
-	('bread', 'Bröd', 10),
-	('water', 'Vatten', 5)
-;
\ No newline at end of file
+INSERT INTO `items` (`name`, `label`, `weight`) VALUES
+	('bread', 'Bröd', 1),
+	('water', 'Vatten', 1)
+;
diff --git a/server/main.lua b/server/main.lua
index 4d4b4425..bddea2ca 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -9,7 +9,7 @@ ESX.RegisterUsableItem('bread', function(source)
 
 	TriggerClientEvent('esx_status:add', source, 'hunger', 200000)
 	TriggerClientEvent('esx_basicneeds:onEat', source)
-	TriggerClientEvent('esx:showNotification', source, _U('used_bread'))
+	xPlayer.showNotification(_U('used_bread'))
 end)
 
 ESX.RegisterUsableItem('water', function(source)
@@ -19,7 +19,7 @@ ESX.RegisterUsableItem('water', function(source)
 
 	TriggerClientEvent('esx_status:add', source, 'thirst', 200000)
 	TriggerClientEvent('esx_basicneeds:onDrink', source)
-	TriggerClientEvent('esx:showNotification', source, _U('used_water'))
+	xPlayer.showNotification(_U('used_water'))
 end)
 
 TriggerEvent('es:addGroupCommand', 'heal', 'admin', function(source, args, user)
@@ -46,4 +46,4 @@ TriggerEvent('es:addGroupCommand', 'heal', 'admin', function(source, args, user)
 	end
 end, function(source, args, user)
 	TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficient Permissions.' } })
-end, {help = 'Heal a player, or yourself - restores thirst, hunger and health.', params = {{name = 'playerId', help = '(optional) player id'}}})
\ No newline at end of file
+end, {help = 'Heal a player, or yourself - restores thirst, hunger and health.', params = {{name = 'playerId', help = '(optional) player id'}}})