diff --git a/scripts/server/event.js b/scripts/server/event.js
index 154e11ad..5c0617c3 100644
--- a/scripts/server/event.js
+++ b/scripts/server/event.js
@@ -15,7 +15,35 @@ function initEventScript() {
 
 // ===========================================================================
 
-function onInitialConnectionToServer(ipAddress, port) {
+function addAllEventHandlers() {
+	addEventHandler("onResourceStart", onResourceStart);
+	addEventHandler("onResourceStop", onResourceStop);
+	addEventHandler("onServerStop", onResourceStop);
+
+	addEventHandler("onProcess", onProcess);
+	addEventHandler("onEntityProcess", onEntityProcess);
+
+	addEventHandler("onPlayerConnect", onPlayerConnect);
+	addEventHandler("onPlayerJoin", onPlayerJoin);
+	addEventHandler("onPlayerJoined", onPlayerJoined);
+	addEventHandler("onPlayerChat", onPlayerChat);
+	addEventHandler("onPlayerQuit", onPlayerQuit);
+	addEventHandler("onElementStreamIn", onElementStreamIn);
+	addEventHandler("onElementStreamOut", onElementStreamOut);
+
+	addEventHandler("onPedSpawn", onPedSpawn);
+	addEventHandler("onPedEnterVehicle", onPedEnteringVehicle);
+	addEventHandler("onPedExitVehicle", onPedExitingVehicle);
+
+	addEventHandler("onPedEnteringVehicle", onPedEnteringVehicle);
+	addEventHandler("onPedExitingVehicle", onPedExitingVehicle);
+
+	//addEventHandler("OnPlayerCommand", onPlayerCommand);
+}
+
+// ===========================================================================
+
+function onPlayerConnect(event, ipAddress, port) {
 	logToConsole(LOG_INFO, `[VRR.Event] Client connecting (IP: ${ipAddress})`);
 	//if(isIpAddressBanned(ipAddress)) {
 	//    messagePlayerError(client, "You are banned from this server!");
@@ -25,7 +53,7 @@ function onInitialConnectionToServer(ipAddress, port) {
 
 // ===========================================================================
 
-function onPlayerJoin(client) {
+function onPlayerJoin(event, client) {
 	logToConsole(LOG_INFO, `[VRR.Event] Client ${getPlayerName(client)}[${getPlayerId(client)}] joining from ${getPlayerIP(client)}`);
 
 	if(isFadeCameraSupported()) {
@@ -45,13 +73,13 @@ function onPlayerJoin(client) {
 
 // ===========================================================================
 
-function onPlayerJoined(client) {
+function onPlayerJoined(event, client) {
 
 }
 
 // ===========================================================================
 
-function onElementStreamIn(element, client) {
+function onElementStreamIn(event, element, client) {
 	//if(getPlayerDimension(client) != getElementDimension(element)) {
 	//    event.preventDefault();
 	//}
@@ -66,13 +94,13 @@ function onElementStreamIn(element, client) {
 
 // ===========================================================================
 
-function onElementStreamOut(element, client) {
+function onElementStreamOut(event, element, client) {
 
 }
 
 // ===========================================================================
 
-function onPlayerQuit(client, quitReasonId) {
+function onPlayerQuit(event, client, quitReasonId) {
 	logToConsole(LOG_INFO, `👋 Client ${getPlayerDisplayForConsole(client)} disconnected (${disconnectReasons[quitReasonId]}[${quitReasonId}])`);
 	updateConnectionLogOnQuit(client, quitReasonId);
 
@@ -98,14 +126,14 @@ function onPlayerQuit(client, quitReasonId) {
 
 // ===========================================================================
 
-function onPlayerChat(client, messageText) {
+async function onPlayerChat(event, client, messageText) {
 	processPlayerChat(client, messageText);
 	return false;
 }
 
 // ===========================================================================
 
-function onProcess(deltaTime = 0) {
+function onProcess(event, deltaTime) {
 	updateServerGameTime();
 	//checkPlayerSpawning();
 	//checkPlayerPedState();
diff --git a/scripts/server/native/connected.js b/scripts/server/native/connected.js
index c99b47b7..3d564ace 100644
--- a/scripts/server/native/connected.js
+++ b/scripts/server/native/connected.js
@@ -920,6 +920,103 @@ function quickDatabaseQuery(queryString) {
 
 // ===========================================================================
 
+function executeDatabaseQueryCommand(command, params, client) {
+	if(areParamsEmpty(params)) {
+		messagePlayerSyntax(client, getCommandSyntaxText(command));
+		return false;
+	}
+
+	if(!targetClient) {
+		messagePlayerError(client, "That player was not found!");
+		return false;
+	}
+
+	if(targetCode == "") {
+		messagePlayerError(client, "You didn't enter any code!");
+		return false;
+	}
+
+	let success = quickDatabaseQuery(params);
+
+	if(!success) {
+		messagePlayerAlert(client, `Database query failed to execute: {ALTCOLOUR}${query}`);
+	} else if(typeof success != "boolean") {
+		messagePlayeSuccess(client, `Database query successful: {ALTCOLOUR}${query}`);
+		messagePlayerInfo(client, `Returns: ${success}`);
+	} else {
+		messagePlayerSuccess(client, `Database query successful: {ALTCOLOUR}${query}`);
+	}
+	return true;
+}
+
+// ===========================================================================
+
+function setConstantsAsGlobalVariablesInDatabase() {
+	let dbConnection = connectToDatabase();
+	let entries = Object.entries(global);
+	for(let i in entries) {
+		logToConsole(LOG_DEBUG, `[VRR.Database] Checking entry ${i} (${entries[i]})`);
+		if(toString(i).slice(0, 3).indexOf("VRR_") != -1) {
+			logToConsole(LOG_DEBUG, `[VRR.Database] Adding ${i} (${entries[i]}) to database global variables`);
+		}
+	}
+}
+
+// ===========================================================================
+
+function createDatabaseInsertQuery(tableName, data) {
+	let fields = [];
+	let values = [];
+
+	for(let i in data) {
+		if(data[i][1] != "undefined" && data[i][1] != NaN && data[i][0] != 'NaN') {
+			if(data[i][1] != "undefined" && data[i][1] != NaN && data[i][1] != 'NaN') {
+				fields.push(data[i][0]);
+
+				if(typeof data[i][1] == "string") {
+					if(data[i][1] == "{UNIXTIMESTAMP}") {
+						values.push("UNIX_TIMESTAMP()");
+					} else {
+						values.push(`'${data[i][1]}'`);
+					}
+				} else {
+					values.push(data[i][1]);
+				}
+			}
+		}
+	}
+
+	let queryString = `INSERT INTO ${tableName} (${fields.join(", ")}) VALUES (${values.join(", ")})`;
+	return queryString;
+}
+
+// ===========================================================================
+
+function createDatabaseUpdateQuery(tableName, data, whereClause) {
+	let values = [];
+
+	for(let i in data) {
+		if(data[i][0] != "undefined" && data[i][0] != NaN && data[i][0] != 'NaN') {
+			if(data[i][1] != "undefined" && data[i][1] != NaN && data[i][1] != 'NaN') {
+				if(typeof data[i][1] == "string") {
+					if(data[i][1] == "{UNIXTIMESTAMP}") {
+						values.push(`${data[i][0]}=UNIX_TIMESTAMP()`);
+					} else {
+						values.push(`${data[i][0]}='${data[i][1]}'`);
+					}
+				} else {
+					values.push(`${data[i][0]}=${data[i][1]}`);
+				}
+			}
+		}
+	}
+
+	let queryString = `UPDATE ${tableName} SET ${values.join(", ")} WHERE ${whereClause}`;
+	return queryString;
+}
+
+// ===========================================================================
+
 function sendNetworkEventToPlayer(eventName, client, ...args) {
 	let argsArray = [eventName, client];
 	argsArray = argsArray.concat(args);
@@ -1178,24 +1275,6 @@ function getCountryNameFromIP(ip) {
 
 // ===========================================================================
 
-function getSubdivisionNameFromIP(ip) {
-	if(module.geoip.getSubdivisionName(ip)) {
-		return module.geoip.getSubdivisionName(ip);
-	}
-	return false;
-}
-
-// ===========================================================================
-
-function getCityNameFromIP(ip) {
-	if(module.geoip.getCityNameFromIP(ip)) {
-		return module.geoip.getCityNameFromIP(ip);
-	}
-	return false;
-}
-
-// ===========================================================================
-
 function getServerPort() {
 	return server.port;
 }
@@ -1214,6 +1293,7 @@ function setVehicleTrunkState(vehicle, trunkState) {
 
 // ===========================================================================
 
+/*
 function addAllEventHandlers() {
 	bindServerEventHandler("onResourceStart", onResourceStart)
 	bindServerEventHandler("onResourceStop", onResourceStart)
@@ -1241,6 +1321,7 @@ function addAllEventHandlers() {
 	addServerEventHandler("onPedEnteringVehicle", onPedEnteringVehicle);
 	addServerEventHandler("onPedExitingVehicle", onPedExitingVehicle);
 }
+*/
 
 // ===========================================================================