diff --git a/addons/main/functions/extract_data/fn_extract_role.sqf b/addons/main/functions/extract_data/fn_extract_role.sqf
index 5771767..d672c71 100644
--- a/addons/main/functions/extract_data/fn_extract_role.sqf
+++ b/addons/main/functions/extract_data/fn_extract_role.sqf
@@ -3,8 +3,20 @@ params["_unit"];
 private _affiliation = "f";
 private _type = "G";
 
+switch (side _unit) do {
+	case "WEST": { _affiliation = "f"; };
+	case "EAST": { _affiliation = "h"; };
+	case "INDEPENDENT": { _affiliation = "n"; };
+	case "CIVILIAN": { _affiliation = "u"; };
+	default { };
+};
+
 if (vehicle _unit isKindOf "plane") then {
-	_type = "A";
+	_type = "A-M-F";
+};
+
+if (vehicle _unit isKindOf "Helicopter") then {
+	_type = "A-M-H";
 };
 
 _role = "a-" + _affiliation + "-" + _type;