diff --git a/addons/main/functions/extract_data/fn_extract_info.sqf b/addons/main/functions/extract_data/fn_extract_info.sqf
index b7f5006..b96aca9 100644
--- a/addons/main/functions/extract_data/fn_extract_info.sqf
+++ b/addons/main/functions/extract_data/fn_extract_info.sqf
@@ -5,14 +5,16 @@
 params["_unit"];
 private _location = [_unit] call armatak_fnc_convert_location;
 
-private _atak_uid = getPlayerUID _unit;
+private _atak_uid = _unit getVariable "_atak_uid";
 private _atak_latitude = _location select 0;
 private _atak_longitude = _location select 1;
 private _atak_side = [_unit] call armatak_fnc_extract_side;
-private _atak_bearing = getDir _unit;
+private _atak_bearing = parseNumber ((getDir _unit) toFixed 0);
 private _atak_role = [_unit] call armatak_fnc_extract_role;
 private _atak_callsign = [_unit] call armatak_fnc_extract_callsign;
+private _atak_server_instance = missionNamespace getVariable ["_atak_server_instance"];
+private _atak_server_instance_token = missionNamespace getVariable ["_atak_server_instance_token"];
 
-_unit_info = [_atak_uid, _atak_latitude, _atak_longitude, _atak_side, _atak_bearing, _atak_role, _atak_callsign];
+_unit_info = [_atak_uid, _atak_latitude, _atak_longitude, _atak_side, _atak_bearing, _atak_role, _atak_callsign, _atak_server_instance];
 
 _unit_info
\ No newline at end of file