diff --git a/__resource.lua b/__resource.lua
index 0e48fae2..b54308c5 100644
--- a/__resource.lua
+++ b/__resource.lua
@@ -5,6 +5,7 @@ description 'ESX Menu Default'
 version '1.0.2'
 
 client_scripts {
+	'@es_extended/client/wrapper.lua',
 	'client/main.lua'
 }
 
diff --git a/client/main.lua b/client/main.lua
index 966209f8..984da0b5 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -46,17 +46,16 @@ Citizen.CreateThread(function()
 
 	ESX.UI.Menu.RegisterType(MenuType, openMenu, closeMenu)
 
-	RegisterNUICallback('menu_submit', function(data, cb)
+	AddEventHandler('esx_menu_default:message:menu_submit', function(data)
 		local menu = ESX.UI.Menu.GetOpened(MenuType, data._namespace, data._name)
 		
 		if menu.submit ~= nil then
 			menu.submit(data, menu)
 		end
 
-		cb('OK')
 	end)
 
-	RegisterNUICallback('menu_cancel', function(data, cb)
+	AddEventHandler('esx_menu_default:message:menu_cancel', function(data)
 		
 		local menu = ESX.UI.Menu.GetOpened(MenuType, data._namespace, data._name)
 		
@@ -64,10 +63,9 @@ Citizen.CreateThread(function()
 			menu.cancel(data, menu)
 		end
 
-		cb('OK')
 	end)
 
-	RegisterNUICallback('menu_change', function(data, cb)
+	AddEventHandler('esx_menu_default:message:menu_change', function(data)
 		
 		local menu = ESX.UI.Menu.GetOpened(MenuType, data._namespace, data._name)
 		
@@ -87,7 +85,6 @@ Citizen.CreateThread(function()
 			menu.change(data, menu)
 		end
 
-		cb('OK')
 	end)
 
 	Citizen.CreateThread(function()
diff --git a/html/js/app.js b/html/js/app.js
index dfb60084..8f0461c2 100644
--- a/html/js/app.js
+++ b/html/js/app.js
@@ -133,28 +133,28 @@
 	}
 
 	ESX_MENU.submit = function(namespace, name, data){
-		$.post('http://' + ESX_MENU.ResourceName + '/menu_submit', JSON.stringify({
+		SendMessage(ESX_MENU.ResourceName, 'menu_submit', {
 			_namespace: namespace,
 			_name     : name,
 			current   : data,
 			elements  : ESX_MENU.opened[namespace][name].elements
-		}));
+		});
 	}
 
 	ESX_MENU.cancel = function(namespace, name){
-		$.post('http://' + ESX_MENU.ResourceName + '/menu_cancel', JSON.stringify({
+		SendMessage(ESX_MENU.ResourceName, 'menu_cancel', {
 			_namespace: namespace,
 			_name     : name
-		}));
+		});
 	}
 
 	ESX_MENU.change = function(namespace, name, data){
-		$.post('http://' + ESX_MENU.ResourceName + '/menu_change', JSON.stringify({
+		SendMessage(ESX_MENU.ResourceName, 'menu_change', {
 			_namespace: namespace,
 			_name     : name,
 			current   : data,
 			elements  : ESX_MENU.opened[namespace][name].elements
-		}));
+		});
 	}
 
 	ESX_MENU.getFocused = function(){
diff --git a/html/ui.html b/html/ui.html
index 8f47ba24..c9363c07 100644
--- a/html/ui.html
+++ b/html/ui.html
@@ -7,7 +7,8 @@
 		<div id="menus"></div>
 
 		<!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script> -->
-		<script src="nui://game/ui/jquery.js" type="text/javascript"></script>
+		<script src="nui://game/ui/jquery.js"></script>
+		<script src="nui://es_extended/html/js/wrapper.js"></script>
 		<script src="js/mustache.min.js"></script>
 		<script src="js/app.js"></script>