From b9ac4923457f0a72d0b9a6f7aa892b5dc170bf8e Mon Sep 17 00:00:00 2001
From: Mike-MF <TyroneMF@hotmail.com>
Date: Tue, 31 Dec 2024 15:28:49 +0000
Subject: [PATCH] Hidden Units - Switch to macro (#276)

---
 ...armed_forces_of_the_russian_federation.hpp | 1581 ++++++-----------
 .../CUP_Units/army_of_the_czech_republic.hpp  |  174 +-
 .../CUP_Units/british_armed_forces.hpp        |  453 ++---
 addons/hidden_units/CUP_Units/bundeswehr.hpp  |  267 +--
 .../CUP_Units/chernarus_defense_forces.hpp    |  306 ++--
 ...chernarussian_movement_of_the_red_star.hpp |   78 +-
 .../CUP_Units/horizon_islands_legion.hpp      |  198 +--
 addons/hidden_units/CUP_Units/ion_pmc.hpp     |  102 +-
 .../CUP_Units/national_party_of_chernarus.hpp |   78 +-
 .../CUP_Units/royal_army_corps_of_sahrani.hpp |  231 +--
 .../CUP_Units/sahrani_liberation_army.hpp     |  279 +--
 .../hidden_units/CUP_Units/takistani_army.hpp |   90 +-
 .../CUP_Units/takistani_locals.hpp            |   54 +-
 .../CUP_Units/takistani_militia.hpp           |   45 +-
 addons/hidden_units/CUP_Units/ukraine.hpp     |  267 +--
 .../hidden_units/CUP_Units/united_nations.hpp |  171 +-
 .../CUP_Units/united_states_army.hpp          |  402 ++---
 .../CUP_Units/united_states_marine_corps.hpp  |  516 ++----
 addons/hidden_units/CfgVehicles_Turrets.hpp   |  609 +++----
 addons/hidden_units/CfgVehicles_Vehicles.hpp  |   45 +-
 addons/hidden_units/Vanilla_Units/ctrg.hpp    |   30 +-
 addons/hidden_units/rf_ws/CfgVehicles.hpp     |   63 +-
 addons/hidden_units/ws/ctrg.hpp               |   30 +-
 addons/hidden_units/ws/sfia.hpp               |  315 ++--
 addons/hidden_units/ws/una.hpp                |   93 +-
 25 files changed, 2159 insertions(+), 4318 deletions(-)

diff --git a/addons/hidden_units/CUP_Units/armed_forces_of_the_russian_federation.hpp b/addons/hidden_units/CUP_Units/armed_forces_of_the_russian_federation.hpp
index cd250684..1c46e5d0 100644
--- a/addons/hidden_units/CUP_Units/armed_forces_of_the_russian_federation.hpp
+++ b/addons/hidden_units/CUP_Units/armed_forces_of_the_russian_federation.hpp
@@ -1,2139 +1,1612 @@
 // Units - Armed Forces of the Russian Federation
 class CUP_O_RU_Soldier: CUP_O_RUS_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Saiga: CUP_O_RUS_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Light: CUP_O_RUS_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_GL: CUP_O_RUS_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_SL: CUP_O_RUS_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_TL: CUP_O_RUS_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_MG: CUP_O_RUS_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AR: CUP_O_RUS_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_LAT: CUP_O_RUS_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AT: CUP_O_RUS_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_HAT: CUP_O_RUS_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AA: CUP_O_RUS_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Sniper: CUP_O_RUS_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Sniper_KSVK: CUP_O_RU_Sniper {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Spotter: CUP_O_RUS_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Marksman: CUP_O_RUS_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Medic: CUP_O_RUS_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Pilot: CUP_O_RUS_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Crew: CUP_O_RUS_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Engineer: CUP_O_RUS_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Explosive_Specialist: CUP_O_RUS_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Officer: CUP_O_RUS_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Commander: CUP_O_RUS_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RU_Soldier_EMR: CUP_O_RUS_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Saiga_EMR: CUP_O_RUS_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Light_M_EMR: CUP_O_RUS_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Light_EMR: CUP_O_RUS_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_GL_EMR: CUP_O_RUS_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_SL_EMR: CUP_O_RUS_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_TL_EMR: CUP_O_RUS_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_MG_EMR: CUP_O_RUS_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AR_EMR: CUP_O_RUS_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_LAT_EMR: CUP_O_RUS_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AT_EMR: CUP_O_RUS_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_HAT_EMR: CUP_O_RUS_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AA_EMR: CUP_O_RUS_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Sniper_EMR: CUP_O_RUS_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Sniper_KSVK_EMR: CUP_O_RU_Sniper_EMR {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Spotter_EMR: CUP_O_RUS_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Marksman_EMR: CUP_O_RUS_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Medic_EMR: CUP_O_RUS_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Pilot_EMR: CUP_O_RUS_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Crew_EMR: CUP_O_RUS_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Engineer_EMR: CUP_O_RUS_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Explosive_Specialist_EMR: CUP_O_RUS_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Officer_EMR: CUP_O_RUS_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RU_Soldier_VDV: CUP_O_RUS_Soldier_01_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Saiga_VDV: CUP_O_RUS_Soldier_01_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Light_VDV: CUP_O_RUS_Soldier_03_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_GL_VDV: CUP_O_RUS_Soldier_03_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_SL_VDV: CUP_O_RUS_Soldier_03_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_TL_VDV: CUP_O_RUS_Soldier_03_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_MG_VDV: CUP_O_RUS_Soldier_03_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AR_VDV: CUP_O_RUS_Soldier_01_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_LAT_VDV: CUP_O_RUS_Soldier_03_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AT_VDV: CUP_O_RUS_Soldier_03_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_HAT_VDV: CUP_O_RUS_Soldier_01_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AA_VDV: CUP_O_RUS_Soldier_03_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Sniper_VDV: CUP_O_RUS_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Sniper_KSVK_VDV: CUP_O_RU_Sniper_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Spotter_VDV: CUP_O_RUS_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Marksman_VDV: CUP_O_RUS_Soldier_01_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Medic_VDV: CUP_O_RUS_Soldier_03_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Pilot_VDV: CUP_O_RUS_Soldier_01_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Crew_VDV: CUP_O_RUS_Soldier_03_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Engineer_VDV: CUP_O_RUS_Soldier_01_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Explosive_Specialist_VDV: CUP_O_RUS_Soldier_01_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Officer_VDV: CUP_O_RUS_Soldier_01_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Commander_VDV: CUP_O_RUS_Soldier_01_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RU_Soldier_VDV_EMR: CUP_O_RUS_Soldier_02_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Saiga_VDV_EMR: CUP_O_RUS_Soldier_02_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Light_VDV_EMR: CUP_O_RUS_Soldier_04_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_GL_VDV_EMR: CUP_O_RUS_Soldier_04_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_SL_VDV_EMR: CUP_O_RUS_Soldier_04_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_TL_VDV_EMR: CUP_O_RUS_Soldier_04_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_MG_VDV_EMR: CUP_O_RUS_Soldier_04_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AR_VDV_EMR: CUP_O_RUS_Soldier_02_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_LAT_VDV_EMR: CUP_O_RUS_Soldier_04_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AT_VDV_EMR: CUP_O_RUS_Soldier_04_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_HAT_VDV_EMR: CUP_O_RUS_Soldier_02_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AA_VDV_EMR: CUP_O_RUS_Soldier_04_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Sniper_VDV_EMR: CUP_O_RUS_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Sniper_KSVK_VDV_EMR: CUP_O_RU_Sniper_VDV_EMR {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Spotter_VDV_EMR: CUP_O_RUS_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Marksman_VDV_EMR: CUP_O_RUS_Soldier_02_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Medic_VDV_EMR: CUP_O_RUS_Soldier_04_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Pilot_VDV_EMR: CUP_O_RUS_Soldier_02_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Crew_VDV_EMR: CUP_O_RUS_Soldier_04_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Engineer_VDV_EMR: CUP_O_RUS_Soldier_02_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Explosive_Specialist_VDV_EMR: CUP_O_RUS_Soldier_02_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Officer_VDV_EMR: CUP_O_RUS_Soldier_02_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RUS_SpecOps: CUP_O_RUS_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_SpecOps_Night: CUP_O_RUS_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_SpecOps_SD: CUP_O_RUS_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_SpecOps_Scout: CUP_O_RUS_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_SpecOps_Scout_Night: CUP_O_RUS_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_Soldier_GL: CUP_O_RUS_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_Soldier_TL: CUP_O_RUS_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_Commander: CUP_O_RUS_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_Soldier_Marksman: CUP_O_RUS_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_Saboteur: CUP_O_RUS_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RUS_SpecOps_Autumn: CUP_O_RUS_Soldier_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_SpecOps_Night_Autumn: CUP_O_RUS_Soldier_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_SpecOps_SD_Autumn: CUP_O_RUS_Soldier_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_SpecOps_Scout_Autumn: CUP_O_RUS_Soldier_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_SpecOps_Scout_Night_Autumn: CUP_O_RUS_Soldier_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_Soldier_GL_Autumn: CUP_O_RUS_Soldier_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_Soldier_TL_Autumn: CUP_O_RUS_Soldier_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_Commander_Autumn: CUP_O_RUS_Soldier_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_Soldier_Marksman_Autumn: CUP_O_RUS_Soldier_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_Saboteur_Autumn: CUP_O_RUS_Soldier_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_MVD_Soldier: CUP_O_MVD_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_MVD_Soldier_GL: CUP_O_MVD_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_MVD_Soldier_TL: CUP_O_MVD_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_MVD_Soldier_AT: CUP_O_MVD_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_MVD_Soldier_MG: CUP_O_MVD_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_MVD_Soldier_Marksman: CUP_O_MVD_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_MVD_Sniper: CUP_O_MVD_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RU_Sniper_M_EMR: CUP_O_RUS_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Sniper_KSVK_M_EMR: CUP_O_RU_Sniper_M_EMR {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Spotter_M_EMR: CUP_O_RUS_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Pilot_M_EMR: CUP_O_RUS_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_TL_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_SL_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Survivor_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Unarmed_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Officer_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Lite_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_GL_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AR_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_MG_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Saiga_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Marksman_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Medic_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Repair_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Exp_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Engineer_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_LAT_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AT_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_HAT_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AA_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_A_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AAR_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AAT_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AHAT_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Crew_M_EMR_V2: CUP_O_RUS_Soldier_VKPO_MSV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 
 class CUP_O_RU_Sniper_VDV_M_EMR: CUP_O_RUS_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Sniper_KSVK_VDV_M_EMR: CUP_O_RU_Sniper_VDV_M_EMR {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Spotter_VDV_M_EMR: CUP_O_RUS_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Pilot_VDV_M_EMR: CUP_O_RUS_Soldier_02_VDV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_TL_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_SL_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Unarmed_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Survivor_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Officer_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Lite_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_GL_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AR_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_MG_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Saiga_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Marksman_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Medic_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Repair_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Exp_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Engineer_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_LAT_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AT_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_HAT_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AA_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_A_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AAR_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AAT_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AHAT_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Crew_M_VDV_EMR_V2: CUP_O_RUS_Soldier_VKPO_VDV_EMR_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RU_Soldier_TL_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_SL_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Unarmed_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Survivor_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Officer_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Lite_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_GL_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AR_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_MG_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Saiga_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Marksman_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Medic_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Repair_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Exp_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Engineer_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_LAT_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AT_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_HAT_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AA_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_A_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AAR_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_rolled_up_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AAT_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AHAT_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Crew_M_BeigeDigital: CUP_O_RUS_Soldier_VKPO_MSV_BeigeDigital_gloves_pads {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RU_Survivor_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Unarmed_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_TL_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_SL_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Lite_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_GL_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AR_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_MG_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Marksman_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Medic_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Repair_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Exp_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Engineer_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_LAT_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AT_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_HAT_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AA_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_A_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AAR_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AAT_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AHAT_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RU_Recon_TL_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_Marksman_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_LAT_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_Medic_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_Exp_Ratnik_Summer: CUP_O_RUS_Ratnik_Summer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RU_Soldier_Unarmed_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Survivor_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_TL_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_SL_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Lite_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_GL_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AR_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_MG_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Marksman_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Medic_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Repair_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Exp_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Engineer_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_LAT_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AT_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_HAT_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AA_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_A_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AAR_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AAT_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AHAT_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RU_Recon_TL_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_Marksman_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_LAT_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_Medic_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_Exp_Ratnik_Winter: CUP_O_RUS_Ratnik_Winter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Unarmed_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Survivor_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_TL_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_SL_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Lite_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_GL_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AR_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_MG_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Marksman_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Medic_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Repair_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Exp_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Engineer_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_LAT_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AT_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_HAT_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AA_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_A_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AAR_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AAT_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AHAT_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RU_Recon_TL_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_Marksman_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_LAT_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_Medic_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_Exp_Ratnik_Autumn: CUP_O_RUS_Ratnik_Autumn {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RU_Soldier_Unarmed_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Survivor_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_TL_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_SL_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Lite_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_GL_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AR_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_MG_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Marksman_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Medic_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Repair_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Exp_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Engineer_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_LAT_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AT_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_HAT_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AA_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_A_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AAR_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AAT_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AHAT_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RU_Recon_TL_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_Marksman_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_LAT_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_Medic_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_Exp_Ratnik_BeigeDigital: CUP_O_RUS_Ratnik_BeigeDigital {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RU_Soldier_Unarmed_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Survivor_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_TL_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_SL_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Lite_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_GL_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AR_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_MG_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Marksman_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Medic_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Repair_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Exp_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Engineer_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_LAT_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AT_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_HAT_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AA_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_A_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AAR_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AAT_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AHAT_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RU_Recon_TL_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_Marksman_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_LAT_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_Medic_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Recon_Exp_Ratnik_Desert: CUP_O_RUS_Ratnik_Desert {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RU_Soldier_TL_MSV_VSR93: CUP_O_RUS_Soldier_VSR93_worn_MSV_rolled_up {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_SL_MSV_VSR93: CUP_O_RUS_Soldier_VSR93_MSV_rolled_up {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Survivor_MSV_VSR93: CUP_O_RUS_Soldier_VSR93_MSV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_MSV_VSR93: CUP_O_RUS_Soldier_VSR93_MSV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Lite_MSV_VSR93: CUP_O_RUS_Soldier_VSR93_MSV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_GL_MSV_VSR93: CUP_O_RUS_Soldier_VSR93_MSV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AR_MSV_VSR93: CUP_O_RUS_Soldier_VSR93_worn_MSV_rolled_up {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_MG_MSV_VSR93: CUP_O_RUS_Soldier_VSR93_MSV_rolled_up {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Unarmed_MSV_VSR93: CUP_O_RUS_Soldier_VSR93_worn_MSV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Marksman_MSV_VSR93: CUP_O_RUS_Soldier_VSR93_worn_MSV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Medic_MSV_VSR93: CUP_O_RUS_Soldier_VSR93_worn_MSV_rolled_up {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Exp_MSV_VSR93: CUP_O_RUS_Soldier_VSR93_MSV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_Engineer_MSV_VSR93: CUP_O_RUS_Soldier_VSR93_MSV_rolled_up {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_LAT_MSV_VSR93: CUP_O_RUS_Soldier_VSR93_worn_MSV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AT_MSV_VSR93: CUP_O_RUS_Soldier_VSR93_MSV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_HAT_MSV_VSR93: CUP_O_RUS_Soldier_VSR93_MSV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AA_MSV_VSR93: CUP_O_RUS_Soldier_VSR93_MSV {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AAR_MSV_VSR93: CUP_O_RUS_Soldier_VSR93_MSV_rolled_up {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RU_Soldier_AAT_MSV_VSR93: CUP_O_RUS_Soldier_VSR93_worn_MSV_rolled_up {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 // Modern
 class CUP_O_RUS_M_Soldier_Survivor_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Unarmed_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Lite_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_GL_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AR_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_MG_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Marksman_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_TL_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_SL_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Medic_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Repair_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Exp_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Mine_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Engineer_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_LAT_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AT_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_HAT_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AA_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_A_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AAR_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AAT_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AHAT_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Crew_VKPO_Summer: CUP_O_RUS_M_Soldier_VKPO_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RUS_M_Soldier_Survivor_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Unarmed_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Lite_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_GL_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AR_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_MG_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Marksman_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_TL_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_SL_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Medic_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Repair_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Exp_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Mine_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Engineer_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_LAT_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AT_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_HAT_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AA_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_A_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AAR_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AAT_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AHAT_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Crew_VKPO_Desert: CUP_O_RUS_M_Soldier_VKPO_Desert_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RUS_M_Soldier_Survivor_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Unarmed_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Lite_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_GL_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AR_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_MG_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Marksman_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_TL_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_SL_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Medic_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Repair_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Exp_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Mine_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Engineer_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_LAT_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AT_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_HAT_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AA_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_A_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AAR_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AAT_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AHAT_VKPO_Winter: CUP_O_RUS_M_Soldier_VKPO_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RUS_M_Soldier_Survivor_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Unarmed_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Lite_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_GL_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AR_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_MG_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Marksman_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_TL_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_SL_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Medic_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Repair_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Exp_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Mine_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Engineer_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_LAT_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AT_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_HAT_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AA_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_A_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AAR_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AAT_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AHAT_Ratnik_Summer: CUP_O_RUS_M_Soldier_Ratnik_Summer_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RUS_M_Soldier_Survivor_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Unarmed_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Lite_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_GL_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AR_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_MG_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Marksman_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_TL_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_SL_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Medic_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Repair_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Exp_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Mine_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Engineer_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_LAT_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AT_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_HAT_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AA_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_A_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AAR_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AAT_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AHAT_Ratnik_Autumn: CUP_O_RUS_M_Soldier_Ratnik_Autumn_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RUS_M_Soldier_Survivor_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Unarmed_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Lite_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_GL_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AR_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_MG_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Marksman_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_TL_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_SL_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Medic_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Repair_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Exp_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Mine_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_Engineer_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_LAT_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AT_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_HAT_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AA_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_A_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AAR_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AAT_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Soldier_AHAT_Ratnik_Winter: CUP_O_RUS_M_Soldier_Ratnik_Winter_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RUS_M_Recon_TL_Gorka_Brown: CUP_O_RUS_M_Recon_Gorka_Brown_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_Rifleman_Gorka_Brown: CUP_O_RUS_M_Recon_Gorka_Brown_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_Marksman_Gorka_Brown: CUP_O_RUS_M_Recon_Gorka_Brown_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_LAT_Gorka_Brown: CUP_O_RUS_M_Recon_Gorka_Brown_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_Medic_Gorka_Brown: CUP_O_RUS_M_Recon_Gorka_Brown_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_Exp_Gorka_Brown: CUP_O_RUS_M_Recon_Gorka_Brown_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_Sharpshooter_Gorka_Brown: CUP_O_RUS_M_Recon_Gorka_Brown_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_GL_Gorka_Brown: CUP_O_RUS_M_Recon_Gorka_Brown_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_MG_Gorka_Brown: CUP_O_RUS_M_Recon_Gorka_Brown_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RUS_M_Recon_TL_Gorka_Khaki: CUP_O_RUS_M_Recon_Gorka_Khaki_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_Rifleman_Gorka_Khaki: CUP_O_RUS_M_Recon_Gorka_Khaki_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_Marksman_Gorka_Khaki: CUP_O_RUS_M_Recon_Gorka_Khaki_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_LAT_Gorka_Khaki: CUP_O_RUS_M_Recon_Gorka_Khaki_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_Medic_Gorka_Khaki: CUP_O_RUS_M_Recon_Gorka_Khaki_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_Exp_Gorka_Khaki: CUP_O_RUS_M_Recon_Gorka_Khaki_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_Sharpshooter_Gorka_Khaki: CUP_O_RUS_M_Recon_Gorka_Khaki_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_GL_Gorka_Khaki: CUP_O_RUS_M_Recon_Gorka_Khaki_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_MG_Gorka_Khaki: CUP_O_RUS_M_Recon_Gorka_Khaki_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_RUS_M_Recon_TL_Gorka_EMR: CUP_O_RUS_M_Recon_Gorka_EMR_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_Rifleman_Gorka_EMR: CUP_O_RUS_M_Recon_Gorka_EMR_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_Marksman_Gorka_EMR: CUP_O_RUS_M_Recon_Gorka_EMR_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_LAT_Gorka_EMR: CUP_O_RUS_M_Recon_Gorka_EMR_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_Medic_Gorka_EMR: CUP_O_RUS_M_Recon_Gorka_EMR_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_Exp_Gorka_EMR: CUP_O_RUS_M_Recon_Gorka_EMR_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_Sharpshooter_Gorka_EMR: CUP_O_RUS_M_Recon_Gorka_EMR_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_GL_Gorka_EMR: CUP_O_RUS_M_Recon_Gorka_EMR_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_RUS_M_Recon_MG_Gorka_EMR: CUP_O_RUS_M_Recon_Gorka_EMR_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
diff --git a/addons/hidden_units/CUP_Units/army_of_the_czech_republic.hpp b/addons/hidden_units/CUP_Units/army_of_the_czech_republic.hpp
index 92eadb8f..6a9f8709 100644
--- a/addons/hidden_units/CUP_Units/army_of_the_czech_republic.hpp
+++ b/addons/hidden_units/CUP_Units/army_of_the_czech_republic.hpp
@@ -1,233 +1,175 @@
 // Units - Army of the Czech Republic
 class CUP_B_CZ_Soldier_ARPG_DES: CUP_B_CZ_Soldier_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_AMG_DES: CUP_B_CZ_Soldier_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_AR_DES: CUP_B_CZ_Soldier_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Crew_DES: CUP_B_CZ_Soldier_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Engineer_DES: CUP_B_CZ_Soldier_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_ExplosiveSpecialist_DES: CUP_B_CZ_Soldier_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_805_GL_DES: CUP_B_CZ_Soldier_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_MG_DES: CUP_B_CZ_Soldier_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_Marksman_DES: CUP_B_CZ_Soldier_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Medic_DES: CUP_B_CZ_Soldier_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Officer_DES: CUP_B_CZ_Soldier_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Pilot_DES: CUP_B_CZ_Soldier_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_DES: CUP_B_CZ_Soldier_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_AT_DES: CUP_B_CZ_Soldier_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_Backpack_DES: CUP_B_CZ_Soldier_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_805_DES: CUP_B_CZ_Soldier_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_RPG_DES: CUP_B_CZ_Soldier_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Sniper_DES: CUP_B_CZ_Soldier_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_Light_DES: CUP_B_CZ_Soldier_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_Unarmed_DES: CUP_B_CZ_Soldier_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Spotter_DES: CUP_B_CZ_Soldier_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_SL_DES: CUP_B_CZ_Soldier_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_SpecOps_GL_DES: CUP_B_CZ_SpecOp_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_SpecOps_MG_DES: CUP_B_CZ_SpecOp_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_SpecOps_DES: CUP_B_CZ_SpecOp_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_SpecOps_Scout_DES: CUP_B_CZ_SpecOp_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_SpecOps_Recon_DES: CUP_B_CZ_SpecOp_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_SpecOps_Exp_DES: CUP_B_CZ_SpecOp_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_SpecOps_TL_DES: CUP_B_CZ_SpecOp_DST_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_ARPG_WDL: CUP_B_CZ_Soldier_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_AMG_WDL: CUP_B_CZ_Soldier_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_AR_WDL: CUP_B_CZ_Soldier_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Crew_WDL: CUP_B_CZ_Soldier_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Engineer_WDL: CUP_B_CZ_Soldier_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_ExplosiveSpecialist_WDL: CUP_B_CZ_Soldier_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_805_GL_WDL: CUP_B_CZ_Soldier_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_MG_WDL: CUP_B_CZ_Soldier_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_Marksman_WDL: CUP_B_CZ_Soldier_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Medic_WDL: CUP_B_CZ_Soldier_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Officer_WDL: CUP_B_CZ_Soldier_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Pilot_WDL: CUP_B_CZ_Soldier_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_WDL: CUP_B_CZ_Soldier_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_AT_WDL: CUP_B_CZ_Soldier_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_backpack_WDL: CUP_B_CZ_Soldier_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_805_WDL: CUP_B_CZ_Soldier_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_RPG_WDL: CUP_B_CZ_Soldier_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Sniper_WDL: CUP_B_CZ_Soldier_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_Light_WDL: CUP_B_CZ_Soldier_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_Unarmed_WDL: CUP_B_CZ_Soldier_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Spotter_WDL: CUP_B_CZ_Soldier_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_Soldier_SL_WDL: CUP_B_CZ_Soldier_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_SpecOps_GL_WDL: CUP_B_CZ_SpecOp_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_SpecOps_MG_WDL: CUP_B_CZ_SpecOp_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_SpecOps_WDL: CUP_B_CZ_SpecOp_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_SpecOps_Scout_WDL: CUP_B_CZ_SpecOp_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_SpecOps_Recon_WDL: CUP_B_CZ_SpecOp_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_SpecOps_Exp_WDL: CUP_B_CZ_SpecOp_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CZ_SpecOps_TL_WDL: CUP_B_CZ_SpecOp_WDL_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
diff --git a/addons/hidden_units/CUP_Units/british_armed_forces.hpp b/addons/hidden_units/CUP_Units/british_armed_forces.hpp
index 840676bd..7b0d6a93 100644
--- a/addons/hidden_units/CUP_Units/british_armed_forces.hpp
+++ b/addons/hidden_units/CUP_Units/british_armed_forces.hpp
@@ -1,605 +1,454 @@
 // Units - British Armed Forces
 class CUP_B_BAF_Soldier_AmmoBearer_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AsstAutoRifleman_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AsstGunnerGMG_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AsstGunnerHMG_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AsstGunnerArty_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AsstAA_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AsstAT_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AutoRifleman_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Medic_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Competitor_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Crew_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_DeckCrew_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Engineer_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Explosive_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_FighterPilot_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Grenadier_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_GunnerGMG_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_GunnerHMG_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_GunnerArty_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_HeavyGunner_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Helicrew_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Helipilot_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Marksman_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Mine_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AA_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AT_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Officer_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Paratrooper_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Pilot_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_RangeMaster_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Repair_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Rifleman_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_RiflemanAT_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_RiflemanLAT_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_RiflemanLite_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_RiflemanUnarmed_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_SharpShooter_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_SquadLeader_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Survivor_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_TeamLeader_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Diver_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Sniper_AS50_TWS_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Sniper_AS50_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Sniper_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Spotter_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Spotter_L85TWS_DPM: CUP_BAF_Soldier_DPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AmmoBearer_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AsstAutoRifleman_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AsstGunnerGMG_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AsstGunnerHMG_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AsstGunnerArty_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AsstAA_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AsstAT_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AutoRifleman_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Medic_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Competitor_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Crew_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_DeckCrew_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Engineer_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Explosive_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_FighterPilot_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Grenadier_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_GunnerGMG_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_GunnerHMG_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_GunnerArty_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_HeavyGunner_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Helicrew_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Helipilot_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Marksman_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Mine_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AA_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AT_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Officer_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Paratrooper_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Pilot_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_RangeMaster_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Repair_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Rifleman_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_RiflemanAT_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_RiflemanLAT_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_RiflemanLite_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_RiflemanUnarmed_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_SharpShooter_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_SquadLeader_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Survivor_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_TeamLeader_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Diver_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Sniper_AS50_TWS_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Sniper_AS50_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Sniper_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Spotter_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Spotter_L85TWS_DDPM: CUP_BAF_Soldier_DDPM_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_01_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_02_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_03_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_04_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_05_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_01_DDPM: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_02_DDPM: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_03_DDPM: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_04_DDPM: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_01_DPM: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_02_DPM: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_03_DPM: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_04_DPM: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AmmoBearer_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AsstAutoRifleman_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AsstGunnerGMG_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AsstGunnerHMG_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AsstGunnerArty_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AsstAA_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AsstAT_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AutoRifleman_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Medic_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Competitor_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Crew_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_DeckCrew_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Engineer_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Explosive_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_FighterPilot_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Grenadier_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_GunnerGMG_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_GunnerHMG_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_GunnerArty_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_HeavyGunner_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Helicrew_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Helipilot_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Marksman_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Mine_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AA_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_AT_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Officer_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Paratrooper_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Pilot_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_RangeMaster_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Repair_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Rifleman_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_RiflemanAT_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_RiflemanLAT_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_RiflemanLite_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_RiflemanUnarmed_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_SharpShooter_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_SquadLeader_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Survivor_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_TeamLeader_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Soldier_Diver_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Sniper_AS50_TWS_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Sniper_AS50_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Sniper_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Spotter_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_BAF_Spotter_L85TWS_MTP: CUP_BAF_Soldier_MTP_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
diff --git a/addons/hidden_units/CUP_Units/bundeswehr.hpp b/addons/hidden_units/CUP_Units/bundeswehr.hpp
index f74b775d..74375e0b 100644
--- a/addons/hidden_units/CUP_Units/bundeswehr.hpp
+++ b/addons/hidden_units/CUP_Units/bundeswehr.hpp
@@ -1,357 +1,268 @@
 // Units - Bundeswehr
 class CUP_B_GER_BW_Soldier: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Soldier_GL: CUP_B_GER_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Medic: CUP_B_GER_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Soldier_TL: CUP_B_GER_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Soldier_Scout: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Soldier_MG: CUP_B_GER_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Soldier_MG3: CUP_B_GER_BW_Soldier_MG {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Soldier_Engineer: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Soldier_AA: CUP_B_GER_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Soldier_AAA: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Soldier_AT: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Soldier_PZF_AT: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Soldier_AAT: CUP_B_GER_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Soldier_Sniper: CUP_B_GER_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Soldier_Ammo: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Soldier_Marksman: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Soldier: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Soldier_GL: CUP_B_GER_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Medic: CUP_B_GER_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Soldier_TL: CUP_B_GER_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Soldier_Scout: CUP_B_GER_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Soldier_MG: CUP_B_GER_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Soldier_MG3: CUP_B_GER_Soldier_MG {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Soldier_Engineer: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Soldier_AA: CUP_B_GER_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Soldier_AAA: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Soldier_AT: CUP_B_GER_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Soldier_AAT: CUP_B_GER_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Soldier_Sniper: CUP_B_GER_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Soldier_Ammo: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Crew: CUP_B_GER_Soldier_Overalls_Tank {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_TankCommander: CUP_B_GER_Soldier_Overalls_Tank {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_HPilot: CUP_B_GER_Soldier_Overalls_Pilot {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Operator: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Operator_GL: CUP_B_GER_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Operator_EXP: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Operator_Medic: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Operator_TL: CUP_B_GER_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Soldier_01: CUP_B_GER_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Soldier_02: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Soldier_03: CUP_B_GER_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Soldier_04: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Soldier_05: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Soldier_06: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Soldier_07: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Soldier_08: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Soldier_09: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Soldier_Fleck_Overalls_Tank: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Soldier_Fleck_Overalls_Pilot: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Crye: CUP_Creatures_Military_GER_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Crye2: CUP_Creatures_Military_GER_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Fleck_Soldier: CUP_B_GER_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Fleck_Soldier_GL: CUP_B_GER_Soldier_GL {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Fleck_Medic: CUP_B_GER_Medic {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Fleck_Soldier_TL: CUP_B_GER_Soldier_TL {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Fleck_Soldier_Scout: CUP_B_GER_Soldier_Scout {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Fleck_Soldier_MG: CUP_B_GER_Soldier_MG {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Fleck_Soldier_MG3: CUP_B_GER_Soldier_MG3 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Fleck_Soldier_Engineer: CUP_B_GER_Soldier_Engineer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Fleck_Soldier_AA: CUP_B_GER_Soldier_AA {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Fleck_Soldier_AAA: CUP_B_GER_Soldier_AAA {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Fleck_Soldier_AT: CUP_B_GER_Soldier_AT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Fleck_Soldier_PZF_AT: CUP_B_GER_Soldier_AT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Fleck_Soldier_AAT: CUP_B_GER_Soldier_AAT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Fleck_Soldier_Sniper: CUP_B_GER_Soldier_Sniper {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Fleck_Soldier_Ammo: CUP_B_GER_Soldier_Ammo {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_BW_Fleck_Soldier_Marksman: CUP_B_GER_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Soldier: CUP_B_GER_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Soldier_GL: CUP_B_GER_Soldier_GL {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Medic: CUP_B_GER_Medic {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Soldier_TL: CUP_B_GER_Soldier_TL {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Soldier_Scout: CUP_B_GER_Soldier_Scout {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Soldier_MG: CUP_B_GER_Soldier_MG {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Soldier_MG3: CUP_B_GER_Soldier_MG3 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Soldier_Engineer: CUP_B_GER_Soldier_Engineer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Soldier_AA: CUP_B_GER_Soldier_AA {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Soldier_AAA: CUP_B_GER_Soldier_AAA {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Soldier_AT: CUP_B_GER_Soldier_AT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Soldier_AAT: CUP_B_GER_Soldier_AAT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Soldier_Sniper: CUP_B_GER_Soldier_Sniper {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Soldier_Ammo: CUP_B_GER_Soldier_Ammo {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Crew: CUP_B_GER_Soldier_Fleck_Overalls_Tank {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_TankCommander: CUP_B_GER_Soldier_Fleck_Overalls_Tank {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_HPilot: CUP_B_GER_Soldier_Overalls_Pilot {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Operator: CUP_B_GER_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Operator_GL: CUP_B_GER_Soldier_GL {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Operator_EXP: CUP_B_GER_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Operator_Medic: CUP_B_GER_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_GER_Fleck_Operator_TL: CUP_B_GER_Soldier_TL {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
diff --git a/addons/hidden_units/CUP_Units/chernarus_defense_forces.hpp b/addons/hidden_units/CUP_Units/chernarus_defense_forces.hpp
index 6e592cba..dc297a47 100644
--- a/addons/hidden_units/CUP_Units/chernarus_defense_forces.hpp
+++ b/addons/hidden_units/CUP_Units/chernarus_defense_forces.hpp
@@ -1,410 +1,308 @@
 // Units - Chernarus Defense Forcesclass SoldierWB;
 class CUP_B_CDF_Soldier_MNT: CUP_B_CDF_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_Light_MNT: CUP_B_CDF_Soldier_02_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_GL_MNT: CUP_B_CDF_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Militia_MNT: CUP_B_CDF_Soldier_02_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Medic_MNT: CUP_B_CDF_Soldier_02_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Sniper_MNT: CUP_B_CDF_Soldier_02_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Spotter_MNT: CUP_B_CDF_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_Marksman_MNT: CUP_B_CDF_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_LAT_MNT: CUP_B_CDF_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_AAT_MNT: CUP_B_CDF_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_RPG18_MNT: CUP_B_CDF_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_AA_MNT: CUP_B_CDF_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_AR_MNT: CUP_B_CDF_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_MG_MNT: CUP_B_CDF_Soldier_02_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_AMG_MNT: CUP_B_CDF_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_TL_MNT: CUP_B_CDF_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Officer_MNT: CUP_B_CDF_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Commander_MNT: CUP_B_CDF_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Pilot_MNT: CUP_B_CDF_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Crew_MNT: CUP_B_CDF_Soldier_02_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Engineer_MNT: CUP_B_CDF_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_DST: CUP_B_CDF_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_Light_DST: CUP_B_CDF_Soldier_02_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_GL_DST: CUP_B_CDF_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Militia_DST: CUP_B_CDF_Soldier_02_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Medic_DST: CUP_B_CDF_Soldier_02_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Sniper_DST: CUP_B_CDF_Soldier_02_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Spotter_DST: CUP_B_CDF_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_Marksman_DST: CUP_B_CDF_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_LAT_DST: CUP_B_CDF_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_AAT_DST: CUP_B_CDF_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_RPG18_DST: CUP_B_CDF_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_AA_DST: CUP_B_CDF_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_AR_DST: CUP_B_CDF_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_MG_DST: CUP_B_CDF_Soldier_02_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_AMG_DST: CUP_B_CDF_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_TL_DST: CUP_B_CDF_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Officer_DST: CUP_B_CDF_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Commander_DST: CUP_B_CDF_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Pilot_DST: CUP_B_CDF_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Crew_DST: CUP_B_CDF_Soldier_02_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Engineer_DST: CUP_B_CDF_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_FST: CUP_B_CDF_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_Light_FST: CUP_B_CDF_Soldier_02_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_GL_FST: CUP_B_CDF_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Militia_FST: CUP_B_CDF_Soldier_02_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Medic_FST: CUP_B_CDF_Soldier_02_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Sniper_FST: CUP_B_CDF_Soldier_02_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Spotter_FST: CUP_B_CDF_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_Marksman_FST: CUP_B_CDF_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_LAT_FST: CUP_B_CDF_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_AAT_FST: CUP_B_CDF_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_RPG18_FST: CUP_B_CDF_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_AA_FST: CUP_B_CDF_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_AR_FST: CUP_B_CDF_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_MG_FST: CUP_B_CDF_Soldier_02_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_AMG_FST: CUP_B_CDF_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_TL_FST: CUP_B_CDF_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Officer_FST: CUP_B_CDF_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Commander_FST: CUP_B_CDF_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Pilot_FST: CUP_B_CDF_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Crew_FST: CUP_B_CDF_Soldier_02_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Engineer_FST: CUP_B_CDF_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_SNW: CUP_B_CDF_Soldier_01_SNW {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_Light_SNW: CUP_B_CDF_Soldier_02_SNW {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_GL_SNW: CUP_B_CDF_Soldier_01_SNW {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Militia_SNW: CUP_B_CDF_Soldier_02_SNW {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Medic_SNW: CUP_B_CDF_Soldier_02_SNW {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Sniper_SNW: CUP_B_CDF_Soldier_02_SNW {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Spotter_SNW: CUP_B_CDF_Soldier_01_SNW {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_Marksman_SNW: CUP_B_CDF_Soldier_01_SNW {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_LAT_SNW: CUP_B_CDF_Soldier_01_SNW {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_AAT_SNW: CUP_B_CDF_Soldier_01_SNW {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_RPG18_SNW: CUP_B_CDF_Soldier_01_SNW {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_AA_SNW: CUP_B_CDF_Soldier_01_SNW {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_AR_SNW: CUP_B_CDF_Soldier_01_SNW {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_MG_SNW: CUP_B_CDF_Soldier_02_SNW {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_AMG_SNW: CUP_B_CDF_Soldier_01_SNW {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_TL_SNW: CUP_B_CDF_Soldier_01_SNW {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Officer_SNW: CUP_B_CDF_Soldier_01_SNW {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Commander_SNW: CUP_B_CDF_Soldier_01_SNW {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Pilot_SNW: CUP_B_CDF_Soldier_01_SNW {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Crew_SNW: CUP_B_CDF_Soldier_02_SNW {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Engineer_SNW: CUP_B_CDF_Soldier_01_SNW {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier: CUP_B_CDF_Soldier_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_Light: CUP_B_CDF_Soldier_Light_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_GL: CUP_B_CDF_Soldier_GL_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Militia: CUP_B_CDF_Militia_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Medic: CUP_B_CDF_Medic_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Sniper: CUP_B_CDF_Sniper_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Spotter: CUP_B_CDF_Spotter_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_Marksman: CUP_B_CDF_Soldier_Marksman_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_LAT: CUP_B_CDF_Soldier_LAT_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_AA: CUP_B_CDF_Soldier_AA_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_AR: CUP_B_CDF_Soldier_AR_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_MG: CUP_B_CDF_Soldier_MG_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Soldier_TL: CUP_B_CDF_Soldier_TL_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Officer: CUP_B_CDF_Officer_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Commander: CUP_B_CDF_Commander_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Pilot: CUP_B_CDF_Pilot_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Crew: CUP_B_CDF_Crew_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CDF_Engineer: CUP_B_CDF_Engineer_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
diff --git a/addons/hidden_units/CUP_Units/chernarussian_movement_of_the_red_star.hpp b/addons/hidden_units/CUP_Units/chernarussian_movement_of_the_red_star.hpp
index b832b366..0f0212cb 100644
--- a/addons/hidden_units/CUP_Units/chernarussian_movement_of_the_red_star.hpp
+++ b/addons/hidden_units/CUP_Units/chernarussian_movement_of_the_red_star.hpp
@@ -1,108 +1,82 @@
 // Units - Chernarussian Movement of the Red Star
 class CUP_O_INS_Soldier_AK74: CUP_Creatures_Military_CHDKZ_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Soldier_Engineer: CUP_Creatures_Military_CHDKZ_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Soldier: CUP_Creatures_Military_CHDKZ_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Soldier_Ammo: CUP_Creatures_Military_CHDKZ_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Soldier_GL: CUP_Creatures_Military_CHDKZ_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Officer: CUP_Creatures_Military_CHDKZ_Soldier_10 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Medic: CUP_Creatures_Military_CHDKZ_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Commander: CUP_Creatures_Military_CHDKZ_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Soldier_AR: CUP_Creatures_Military_CHDKZ_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Soldier_MG: CUP_Creatures_Military_CHDKZ_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_INS_Soldier_AT: CUP_Creatures_Military_CHDKZ_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Soldier_LAT: CUP_O_INS_Soldier_AT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Soldier_AA: CUP_Creatures_Military_CHDKZ_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Sniper: CUP_Creatures_Military_CHDKZ_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Soldier_Exp: CUP_Creatures_Military_CHDKZ_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Saboteur: CUP_Creatures_Military_CHDKZ_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Story_Lopotev: CUP_O_INS_Commander {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Story_Bardak: CUP_O_INS_Commander {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Crew: CUP_Creatures_Military_CHDKZ_Soldier_06 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Pilot: CUP_Creatures_Military_CHDKZ_Soldier_12 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Worker2: CUP_Creatures_Military_CHDKZ_Soldier_13 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Woodlander1: CUP_Creatures_Military_CHDKZ_Soldier_14 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Woodlander2: CUP_Creatures_Military_CHDKZ_Soldier_15 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_INS_Woodlander3: CUP_Creatures_Military_CHDKZ_Soldier_16 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Villager3: CUP_Creatures_Military_CHDKZ_Soldier_17 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_INS_Villager4: CUP_Creatures_Military_CHDKZ_Soldier_18 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
diff --git a/addons/hidden_units/CUP_Units/horizon_islands_legion.hpp b/addons/hidden_units/CUP_Units/horizon_islands_legion.hpp
index 11ebc7b4..b8c70d0d 100644
--- a/addons/hidden_units/CUP_Units/horizon_islands_legion.hpp
+++ b/addons/hidden_units/CUP_Units/horizon_islands_legion.hpp
@@ -1,268 +1,202 @@
 // Units - Horizon Island Legion
 class CUP_B_HIL_Soldier_Res: CUP_Creatures_Military_HIL_Reservist_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Soldier_LAT_Res: CUP_Creatures_Military_HIL_Reservist_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Soldier_Light_Res: CUP_B_HIL_Soldier_Res {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Soldier_Unarmed_Res: CUP_B_HIL_Soldier_Res {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Officer_Res: CUP_B_HIL_Soldier_Res {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Medic_Res: CUP_B_HIL_Soldier_Res {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_SL_Res: CUP_B_HIL_Soldier_Res {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_GL_Res: CUP_B_HIL_Soldier_Res {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_M_Res: CUP_B_HIL_Soldier_Res {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_MMG_Res: CUP_B_HIL_Soldier_Res {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_AMG_Res: CUP_B_HIL_Soldier_Res {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Soldier_MAT_Res: CUP_B_HIL_Soldier_Res {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Soldier_HAT_Res: CUP_B_HIL_Soldier_Res {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Engineer_Res: CUP_B_HIL_Soldier_Res {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_B_HIL_Soldier_Recon: CUP_Creatures_Military_HIL_Recon_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Soldier_LAT_Recon: CUP_Creatures_Military_HIL_Recon_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Medic_Recon: CUP_B_HIL_Soldier_Recon {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_SL_Recon: CUP_B_HIL_Soldier_Recon {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_GL_Recon: CUP_B_HIL_Soldier_Recon {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_M_Recon: CUP_B_HIL_Soldier_Recon {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_MMG_Recon: CUP_B_HIL_Soldier_Recon {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Soldier_MAT_Recon: CUP_B_HIL_Soldier_Recon {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Soldier_HAT_Recon: CUP_B_HIL_Soldier_Recon {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Engineer_Recon: CUP_B_HIL_Soldier_Recon {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_B_HIL_CCE_Soldier_01: CUP_Creatures_Military_HIL_Man_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_CCE_Soldier_02: CUP_Creatures_Military_HIL_Man_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_CCE_Soldier_03: CUP_Creatures_Military_HIL_Man_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_CCE_Soldier_04: CUP_Creatures_Military_HIL_Man_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_CCE_Soldier_05: CUP_Creatures_Military_HIL_Man_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_CCE_Soldier_06: CUP_Creatures_Military_HIL_Man_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_CCE_Soldier_07: CUP_Creatures_Military_HIL_Man_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_CCE_Soldier_08: CUP_Creatures_Military_HIL_Man_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Soldier: CUP_Creatures_Military_HIL_Man_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Soldier_LAT: CUP_Creatures_Military_HIL_Man_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Soldier_Light: CUP_B_HIL_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Soldier_Unarmed: CUP_B_HIL_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Officer: CUP_B_HIL_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Medic: CUP_B_HIL_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_SL: CUP_B_HIL_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_GL: CUP_B_HIL_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_M: CUP_B_HIL_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_MMG: CUP_B_HIL_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_AMG: CUP_B_HIL_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Crew: CUP_B_HIL_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Soldier_AA: CUP_B_HIL_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Soldier_MAT: CUP_B_HIL_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Soldier_AAT: CUP_B_HIL_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Soldier_HAT: CUP_B_HIL_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Engineer: CUP_B_HIL_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Pilot: CUP_B_HIL_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_B_HIL_Soldier_PM_SF: CUP_Creatures_Military_HIL_SF_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Soldier_LAT_SF: CUP_Creatures_Military_HIL_SF_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Scout_SF: CUP_Creatures_Military_HIL_SF_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Scout_MP5_SF: CUP_B_HIL_Scout_SF {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Scout_MP7_SF: CUP_B_HIL_Scout_SF {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Soldier_SF: CUP_Creatures_Military_HIL_SF_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Medic_SF: CUP_B_HIL_Soldier_SF {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_SL_SF: CUP_B_HIL_Soldier_SF {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_GL_SF: CUP_B_HIL_SL_SF {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_M_SF: CUP_B_HIL_Soldier_SF {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_MMG_SF: CUP_B_HIL_Soldier_SF {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Soldier_MAT_SF: CUP_B_HIL_Soldier_SF {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Soldier_HAT_SF: CUP_B_HIL_Soldier_SF {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Engineer_SF: CUP_B_HIL_Soldier_SF {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Diver_MP5_SF: CUP_Creatures_Military_HIL_SF_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_HIL_Diver_MP7_SF: CUP_B_HIL_Diver_MP5_SF {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
diff --git a/addons/hidden_units/CUP_Units/ion_pmc.hpp b/addons/hidden_units/CUP_Units/ion_pmc.hpp
index d85a7d9e..08f75a2a 100644
--- a/addons/hidden_units/CUP_Units/ion_pmc.hpp
+++ b/addons/hidden_units/CUP_Units/ion_pmc.hpp
@@ -1,138 +1,104 @@
 // Units - ION PMC
 class CUP_I_PMC_Soldier_Base: CUP_I_PMC_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Soldier: CUP_I_PMC_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Soldier_M4A3: CUP_I_PMC_Soldier_43 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Engineer: CUP_I_PMC_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Crew: CUP_I_PMC_Soldier_19 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Medic: CUP_I_PMC_Soldier_38 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Soldier_TL: CUP_I_PMC_Soldier_36 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Pilot: CUP_I_PMC_Soldier_19 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Soldier_MG: CUP_I_PMC_Soldier_41 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Soldier_MG_PKM: CUP_I_PMC_Soldier_MG {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Sniper: CUP_I_PMC_Soldier_42 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Sniper_KSVK: CUP_I_PMC_Sniper {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Soldier_GL: CUP_I_PMC_Soldier_40 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Bodyguard_M4: CUP_I_PMC_Soldier_19 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Bodyguard_AA12: CUP_I_PMC_Bodyguard_M4 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Soldier_AA: CUP_I_PMC_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Soldier_AT: CUP_I_PMC_Soldier_40 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Contractor1: CUP_I_PMC_Soldier_36 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Contractor2: CUP_I_PMC_Soldier_40 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Soldier_GL_M16A2: CUP_I_PMC_Soldier_43 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Winter_Soldier: CUP_I_PMC_Soldier_18 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Winter_Soldier_M4A3: CUP_I_PMC_Soldier_18 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Winter_Engineer: CUP_I_PMC_Soldier_27 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Winter_Crew: CUP_I_PMC_Soldier_28 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Winter_Medic: CUP_I_PMC_Soldier_27 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Winter_Soldier_TL: CUP_I_PMC_Soldier_26 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Winter_Pilot: CUP_I_PMC_Soldier_28 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Winter_Soldier_MG: CUP_I_PMC_Soldier_26 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Winter_Soldier_MG_PKM: CUP_I_PMC_Winter_Soldier_MG {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Winter_Sniper: CUP_I_PMC_Soldier_27 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Winter_Sniper_KSVK: CUP_I_PMC_Winter_Sniper {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Winter_Soldier_GL: CUP_I_PMC_Soldier_26 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Winter_Soldier_AA: CUP_I_PMC_Soldier_27 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_PMC_Winter_Soldier_AT: CUP_I_PMC_Soldier_27 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
diff --git a/addons/hidden_units/CUP_Units/national_party_of_chernarus.hpp b/addons/hidden_units/CUP_Units/national_party_of_chernarus.hpp
index 6cc7d805..faaaaee4 100644
--- a/addons/hidden_units/CUP_Units/national_party_of_chernarus.hpp
+++ b/addons/hidden_units/CUP_Units/national_party_of_chernarus.hpp
@@ -1,108 +1,82 @@
 // Units - National Party of Chernarus
 class CUP_I_GUE_Soldier_AKSU: CUP_Creatures_Military_NAPA_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_GUE_Soldier_AKM: CUP_Creatures_Military_NAPA_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_GUE_Soldier_AKS74: CUP_Creatures_Military_NAPA_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_GUE_Soldier_LAT: CUP_Creatures_Military_NAPA_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_GUE_Soldier_GL: CUP_Creatures_Military_NAPA_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_GUE_Officer: CUP_Creatures_Military_NAPA_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_GUE_Soldier_AT: CUP_Creatures_Military_NAPA_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_GUE_Soldier_AA: CUP_Creatures_Military_NAPA_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_GUE_Soldier_AR: CUP_Creatures_Military_NAPA_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_GUE_Soldier_MG: CUP_Creatures_Military_NAPA_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_I_GUE_Saboteur: CUP_Creatures_Military_NAPA_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_GUE_Medic: CUP_Creatures_Military_NAPA_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_GUE_Crew: CUP_I_GUE_Soldier_AKSU {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_I_GUE_Engineer: CUP_Creatures_Military_NAPA_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_GUE_Ammobearer: CUP_Creatures_Military_NAPA_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_GUE_Soldier_AA2: CUP_Creatures_Military_NAPA_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_GUE_Pilot: CUP_Creatures_Military_NAPA_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_GUE_Sniper: CUP_Creatures_Military_NAPA_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_GUE_Soldier_Scout: CUP_I_GUE_Sniper {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_GUE_Commander: CUP_Creatures_Military_NAPA_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_GUE_Local: CUP_Creatures_Military_NAPA_Civilian_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_GUE_Woodman: CUP_Creatures_Military_NAPA_Civilian_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_GUE_Gamekeeper: CUP_Creatures_Military_NAPA_Civilian_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_I_GUE_Forester: CUP_Creatures_Military_NAPA_Civilian_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_GUE_Farmer: CUP_Creatures_Military_NAPA_Civilian_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_GUE_Villager: CUP_Creatures_Military_NAPA_Civilian_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
diff --git a/addons/hidden_units/CUP_Units/royal_army_corps_of_sahrani.hpp b/addons/hidden_units/CUP_Units/royal_army_corps_of_sahrani.hpp
index b92361ff..58588379 100644
--- a/addons/hidden_units/CUP_Units/royal_army_corps_of_sahrani.hpp
+++ b/addons/hidden_units/CUP_Units/royal_army_corps_of_sahrani.hpp
@@ -1,313 +1,236 @@
 // Units - Royal Army Corps of Sahrani
 class CUP_I_RACS_Soldier: CUP_I_RACS_Desert_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_Unarmed: CUP_I_RACS_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_Unarmed_Mech: CUP_I_RACS_Soldier_Unarmed {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_Unarmed_Urban: CUP_I_RACS_Soldier_Unarmed {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_Unarmed_wdl: CUP_I_RACS_Soldier_Unarmed {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_LAT: CUP_I_RACS_Desert_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_Light: CUP_I_RACS_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Officer: CUP_I_RACS_Desert_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Medic: CUP_I_RACS_Desert_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_SL: CUP_I_RACS_Desert_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_GL: CUP_I_RACS_Desert_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_M: CUP_I_RACS_Desert_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_AR: CUP_I_RACS_Desert_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_MMG: CUP_I_RACS_Desert_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_AMG: CUP_I_RACS_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_I_RACS_Crew: CUP_I_RACS_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_AA: CUP_I_RACS_Desert_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_MAT: CUP_I_RACS_Desert_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_AAT: CUP_I_RACS_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_I_RACS_Soldier_HAT: CUP_I_RACS_Desert_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Sniper: CUP_I_RACS_Desert_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Engineer: CUP_I_RACS_Desert_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Pilot: CUP_I_RACS_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_RoyalCommando: CUP_I_RACS_Desert_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_RoyalGuard: CUP_I_RACS_Desert_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_RoyalMarksman: CUP_I_RACS_Desert_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_I_RACS_Soldier_Urban: CUP_I_RACS_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_LAT_Urban: CUP_I_RACS_Soldier_LAT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_Light_Urban: CUP_I_RACS_Soldier_Light {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Officer_Urban: CUP_I_RACS_Officer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Medic_Urban: CUP_I_RACS_Medic {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_SL_Urban: CUP_I_RACS_SL {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_GL_Urban: CUP_I_RACS_GL {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_M_Urban: CUP_I_RACS_M {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_AR_Urban: CUP_I_RACS_AR {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_MMG_Urban: CUP_I_RACS_MMG {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_AMG_Urban: CUP_I_RACS_Soldier_AMG {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_AA_Urban: CUP_I_RACS_Soldier_AA {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_MAT_Urban: CUP_I_RACS_Soldier_MAT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_AAT_Urban: CUP_I_RACS_Soldier_AAT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_HAT_Urban: CUP_I_RACS_Soldier_HAT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Sniper_Urban: CUP_I_RACS_Sniper {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Engineer_Urban: CUP_I_RACS_Engineer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_I_RACS_Soldier_wdl: CUP_I_RACS_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_LAT_wdl: CUP_I_RACS_Soldier_LAT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_Light_wdl: CUP_I_RACS_Soldier_Light {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Officer_wdl: CUP_I_RACS_Officer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Medic_wdl: CUP_I_RACS_Medic {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_SL_wdl: CUP_I_RACS_SL {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_GL_wdl: CUP_I_RACS_GL {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_M_wdl: CUP_I_RACS_M {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_AR_wdl: CUP_I_RACS_AR {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_MMG_wdl: CUP_I_RACS_MMG {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_AMG_wdl: CUP_I_RACS_Soldier_AMG {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_AA_wdl: CUP_I_RACS_Soldier_AA {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_MAT_wdl: CUP_I_RACS_Soldier_MAT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_AAT_wdl: CUP_I_RACS_Soldier_AAT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_HAT_wdl: CUP_I_RACS_Soldier_HAT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Sniper_wdl: CUP_I_RACS_Sniper {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Engineer_wdl: CUP_I_RACS_Engineer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_Mech: CUP_I_RACS_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_LAT_Mech: CUP_I_RACS_Soldier_LAT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_Light_Mech: CUP_I_RACS_Soldier_Light {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Officer_Mech: CUP_I_RACS_Officer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Medic_Mech: CUP_I_RACS_Medic {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_SL_Mech: CUP_I_RACS_SL {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_GL_Mech: CUP_I_RACS_GL {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_M_Mech: CUP_I_RACS_M {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_AR_Mech: CUP_I_RACS_AR {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_MMG_Mech: CUP_I_RACS_MMG {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_AMG_Mech: CUP_I_RACS_Soldier_AMG {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_AA_Mech: CUP_I_RACS_Soldier_AA {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_MAT_Mech: CUP_I_RACS_Soldier_MAT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_AAT_Mech: CUP_I_RACS_Soldier_AAT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Soldier_HAT_Mech: CUP_I_RACS_Soldier_HAT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Sniper_Mech: CUP_I_RACS_Sniper {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_RACS_Engineer_Mech: CUP_I_RACS_Engineer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
diff --git a/addons/hidden_units/CUP_Units/sahrani_liberation_army.hpp b/addons/hidden_units/CUP_Units/sahrani_liberation_army.hpp
index 16f1add6..99b31ff4 100644
--- a/addons/hidden_units/CUP_Units/sahrani_liberation_army.hpp
+++ b/addons/hidden_units/CUP_Units/sahrani_liberation_army.hpp
@@ -1,379 +1,286 @@
 // Units - Sahrani Liberation Army
 class CUP_O_sla_Soldier: CUP_O_SLA_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_GL: CUP_O_SLA_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SLA_Soldier_Backpack: CUP_O_sla_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AAT: CUP_O_sla_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AMG: CUP_O_sla_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_sla_Soldier_LAT: CUP_O_SLA_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AT: CUP_O_SLA_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_HAT: CUP_O_SLA_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AA: CUP_O_SLA_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Engineer: CUP_O_SLA_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_MG: CUP_O_SLA_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_sla_Soldier_AR: CUP_O_SLA_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Medic: CUP_O_SLA_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_SL: CUP_O_SLA_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Officer: CUP_O_SLA_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SLA_Spotter: CUP_O_SLA_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Sniper: CUP_O_SLA_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Sniper_KSVK: CUP_O_sla_Sniper {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SLA_Sniper_SVD_Night: CUP_O_sla_Sniper {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AKS_Night: CUP_O_sla_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AKS_74_GOSHAWK: CUP_O_sla_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Crew: CUP_O_SLA_Soldier_Overalls_Tank {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Pilot: CUP_O_SLA_Soldier_Overalls_Pilot {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Commander: CUP_O_SLA_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_sla_SpecOps: CUP_O_SLA_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_SpecOps_TL: CUP_O_sla_SpecOps {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_SpecOps_LAT: CUP_O_sla_SpecOps {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_SpecOps_MG: CUP_O_sla_SpecOps {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_SpecOps_Demo: CUP_O_sla_SpecOps {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_militia: CUP_O_sla_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_GL_militia: CUP_O_sla_Soldier_GL {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SLA_Soldier_Backpack_militia: CUP_O_SLA_Soldier_Backpack {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AAT_militia: CUP_O_sla_Soldier_AAT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AMG_militia: CUP_O_sla_Soldier_AMG {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_LAT_militia: CUP_O_sla_Soldier_LAT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AT_militia: CUP_O_sla_Soldier_AT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AA_militia: CUP_O_sla_Soldier_AA {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Engineer_militia: CUP_O_sla_Engineer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_MG_militia: CUP_O_sla_Soldier_MG {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AR_militia: CUP_O_sla_Soldier_AR {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Medic_militia: CUP_O_sla_Medic {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_SL_militia: CUP_O_sla_Soldier_SL {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Officer_militia: CUP_O_sla_Officer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_urban: CUP_O_sla_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_GL_urban: CUP_O_sla_Soldier_GL {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SLA_Soldier_Backpack_urban: CUP_O_SLA_Soldier_Backpack {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AAT_urban: CUP_O_sla_Soldier_AAT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AMG_urban: CUP_O_sla_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_LAT_urban: CUP_O_sla_Soldier_LAT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AT_urban: CUP_O_sla_Soldier_AT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_HAT_urban: CUP_O_sla_Soldier_HAT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AA_urban: CUP_O_sla_Soldier_AA {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Engineer_urban: CUP_O_sla_Engineer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_MG_urban: CUP_O_sla_Soldier_MG {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AR_urban: CUP_O_sla_Soldier_AR {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Medic_urban: CUP_O_sla_Medic {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_SL_urban: CUP_O_sla_Soldier_SL {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Officer_urban: CUP_O_sla_Officer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SLA_Spotter_urban: CUP_O_SLA_Spotter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Sniper_urban: CUP_O_sla_Sniper {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Sniper_KSVK_urban: CUP_O_sla_Sniper_KSVK {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SLA_Sniper_SVD_Night_urban: CUP_O_SLA_Sniper_SVD_Night {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AKS_Night_urban: CUP_O_sla_Soldier_AKS_Night {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AKS_74_GOSHAWK_urban: CUP_O_sla_Soldier_AKS_74_GOSHAWK {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Commander_urban: CUP_O_sla_Commander {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_sla_soldier_desert: CUP_O_sla_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_GL_desert: CUP_O_sla_Soldier_GL {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SLA_Soldier_Backpack_desert: CUP_O_SLA_Soldier_Backpack {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AAT_desert: CUP_O_sla_Soldier_AAT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AMG_desert: CUP_O_sla_Soldier_AMG {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_LAT_desert: CUP_O_sla_Soldier_LAT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AT_desert: CUP_O_sla_Soldier_AT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_HAT_desert: CUP_O_sla_Soldier_HAT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AA_desert: CUP_O_sla_Soldier_AA {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Engineer_desert: CUP_O_sla_Engineer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_MG_desert: CUP_O_sla_Soldier_MG {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AR_desert: CUP_O_sla_Soldier_AR {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Medic_desert: CUP_O_sla_Medic {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_SL_desert: CUP_O_sla_Soldier_SL {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Officer_desert: CUP_O_sla_Officer {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SLA_Spotter_desert: CUP_O_SLA_Spotter {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Sniper_desert: CUP_O_sla_Sniper {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Sniper_KSVK_desert: CUP_O_sla_Sniper_KSVK {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SLA_Sniper_SVD_Night_desert: CUP_O_SLA_Sniper_SVD_Night {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AKS_Night_desert: CUP_O_sla_Soldier_AKS_Night {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Soldier_AKS_74_GOSHAWK_desert: CUP_O_sla_Soldier_AKS_74_GOSHAWK {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_sla_Commander_desert: CUP_O_sla_Commander {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_Partisans_soldier_TTsKO: CUP_O_SLA_Soldier_06 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Partisans_soldier_SL: CUP_O_SLA_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Partisans_Soldier_AT: CUP_O_SLA_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Partisans_Soldier_MG: CUP_O_SLA_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_Partisans_Medic: CUP_O_SLA_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Partisans_Engineer: CUP_O_SLA_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
diff --git a/addons/hidden_units/CUP_Units/takistani_army.hpp b/addons/hidden_units/CUP_Units/takistani_army.hpp
index 3e4a8e98..090b7909 100644
--- a/addons/hidden_units/CUP_Units/takistani_army.hpp
+++ b/addons/hidden_units/CUP_Units/takistani_army.hpp
@@ -1,122 +1,92 @@
 // Units - Takistani Army
 class CUP_O_TK_Soldier: CUP_O_TK_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Soldier_GL: CUP_O_TK_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Soldier_Backpack: CUP_O_TK_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Soldier_AAT: CUP_O_TK_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Soldier_AMG: CUP_O_TK_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_TK_Soldier_LAT: CUP_O_TK_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Soldier_AT: CUP_O_TK_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Soldier_HAT: CUP_O_TK_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Soldier_AA: CUP_O_TK_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Engineer: CUP_O_TK_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Soldier_MG: CUP_O_TK_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Soldier_AR: CUP_O_TK_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Soldier_M: CUP_O_TK_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Medic: CUP_O_TK_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Soldier_SL: CUP_O_TK_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Officer: CUP_O_TK_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Spotter: CUP_O_TK_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Sniper: CUP_O_TK_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Sniper_KSVK: CUP_O_TK_Sniper {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Sniper_SVD_Night: CUP_O_TK_Sniper {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Soldier_AKS_Night: CUP_O_TK_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Soldier_FNFAL_Night: CUP_O_TK_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Soldier_AKS_74_GOSHAWK: CUP_O_TK_Soldier {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Crew: CUP_O_TK_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Pilot: CUP_O_TK_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Commander: CUP_O_TK_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_SpecOps: CUP_O_TK_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_SpecOps_TL: CUP_O_TK_SpecOps {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_SpecOps_MG: CUP_O_TK_SpecOps {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_Story_Aziz: CUP_O_TK_Commander {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
diff --git a/addons/hidden_units/CUP_Units/takistani_locals.hpp b/addons/hidden_units/CUP_Units/takistani_locals.hpp
index b1497885..cc4c1bfd 100644
--- a/addons/hidden_units/CUP_Units/takistani_locals.hpp
+++ b/addons/hidden_units/CUP_Units/takistani_locals.hpp
@@ -1,75 +1,57 @@
 // Units - Takistani Locals
 class CUP_I_TK_GUE_Soldier: CUP_I_TKG_Man_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_TK_GUE_Soldier_AAT: CUP_I_TKG_Man_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_TK_GUE_Soldier_AK_47S: CUP_I_TKG_Man_12 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_TK_GUE_Soldier_M16A2: CUP_I_TKG_Man_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_TK_GUE_Soldier_GL: CUP_I_TKG_Man_12 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_TK_GUE_Guerilla_Enfield: CUP_I_TKG_Man_06 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_I_TK_GUE_Soldier_AA: CUP_I_TKG_Man_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_TK_GUE_Soldier_AT: CUP_I_TKG_Man_11 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_TK_GUE_Soldier_HAT: CUP_I_TKG_Man_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_TK_GUE_Soldier_LAT: CUP_I_TKG_Man_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_TK_GUE_Soldier_TL: CUP_I_TKG_Man_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_TK_GUE_Sniper: CUP_I_TKG_Man_11 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_TK_GUE_Soldier_AR: CUP_I_TKG_Man_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_TK_GUE_Soldier_MG: CUP_I_TKG_Man_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_TK_GUE_Guerilla_Medic: CUP_I_TKG_Man_10 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_I_TK_GUE_Commander: CUP_I_TKG_Man_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_TK_GUE_Mechanic: CUP_I_TKG_Man_12 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_TK_GUE_Demo: CUP_I_TKG_Man_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
diff --git a/addons/hidden_units/CUP_Units/takistani_militia.hpp b/addons/hidden_units/CUP_Units/takistani_militia.hpp
index de5a7f5e..11917339 100644
--- a/addons/hidden_units/CUP_Units/takistani_militia.hpp
+++ b/addons/hidden_units/CUP_Units/takistani_militia.hpp
@@ -1,63 +1,48 @@
 // Units - Takistani Militia
 class CUP_O_TK_INS_Soldier: CUP_O_TKI_Man_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_INS_Soldier_AAT: CUP_O_TKI_Man_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_INS_Soldier_GL: CUP_O_TKI_Man_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_INS_Soldier_Enfield: CUP_O_TKI_Man_06 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_TK_INS_Soldier_FNFAL: CUP_O_TKI_Man_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_INS_Soldier_AA: CUP_O_TKI_Man_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_INS_Soldier_AT: CUP_O_TKI_Man_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_INS_Soldier_TL: CUP_O_TKI_Man_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_INS_Sniper: CUP_O_TKI_Man_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_INS_Soldier_AR: CUP_O_TKI_Man_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_INS_Soldier_MG: CUP_O_TKI_Man_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_INS_Guerilla_Medic: CUP_O_TKI_Man_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_TK_INS_Commander: CUP_O_TKI_Man_06 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_INS_Mechanic: CUP_O_TKI_Man_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_TK_INS_Bomber: CUP_O_TKI_Man_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
diff --git a/addons/hidden_units/CUP_Units/ukraine.hpp b/addons/hidden_units/CUP_Units/ukraine.hpp
index 1682101d..f6f87c9c 100644
--- a/addons/hidden_units/CUP_Units/ukraine.hpp
+++ b/addons/hidden_units/CUP_Units/ukraine.hpp
@@ -1,360 +1,271 @@
 // Units - Ukraine
 class CUP_B_ILDU_Soldier_GrenadierGB: CUP_I_PARA_Soldier_15 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ILDU_Soldier_MedicGB: CUP_I_PARA_Soldier_12 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ILDU_Soldier_MarksmanDE: CUP_B_GER_Fleck_Crye {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ILDU_Soldier_TeamleaderUS: CUP_CRYE_G3C_MC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ILDU_Soldier_RiflemanBE: CUP_CRYE_MCAM_NP2_Roll {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ILDU_Soldier_RiflemanUSAT: CUP_CRYE_G3C_RGR {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ILDU_Soldier_ARUS: CUP_CRYE_G3C_MC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ILDU_Soldier_SniperGB: B_ghillie_lsh_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ILDU_Soldier_SpotterGB: B_ghillie_lsh_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ILDU_Soldier_EngineerDE: CUP_I_PARA_Soldier_9 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ILDU_Soldier_MachinegunnerCZ: CUP_B_CZ_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ILDU_Soldier_RiflemanATCZ: CUP_CRYE_G3C_MC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ILDU_Soldier_MissileSpecialistAACDF: CUP_B_CDF_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ILDU_Soldier_ATSpecialistUSA: CUP_CRYE_G3C_MC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ILDU_Soldier_RiflemanUS: CUP_CRYE_G3C_MC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ILDU_Soldier_RiflemanFR: CUP_CRYE_G3C_MC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ILDU_Soldier_ReconTeamLeader: CUP_CRYE_G3C_MC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ILDU_Soldier_ReconDemoSpecialist: CUP_B_GER_Fleck_Crye2 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ILDU_Soldier_ReconParamedic: CUP_B_GER_Fleck_Crye2 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ILDU_Soldier_ReconGrenadier: CUP_CRYE_G3C_MC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ILDU_Soldier_ReconMarksman: CUP_CRYE_G3C_M81 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ILDU_Soldier_ReconScout: CUP_B_CZ_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ILDU_Soldier_ReconScoutAT: CUP_B_CZ_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_B_AFU_SF_Autorifleman: CUP_CRYE_G3C_MC_V3 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_SF_FAC: CUP_CRYE_G3C_MC_V3 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_SF_MachineGunner: CUP_CRYE_G3C_MC_V3 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_SF_Marksman: CUP_CRYE_G3C_MC_V3 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_SF_Medic: CUP_CRYE_G3C_MC_V3 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_SF_Operator: CUP_CRYE_G3C_MC_V3 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_SF_OperatorAssault: CUP_CRYE_G3C_MC_V3 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_SF_TeamLeader: CUP_CRYE_G3C_MC_V3 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_SF_DroneOperator: CUP_CRYE_G3C_MC_V3 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_B_TDF_Soldier_AAT: CUP_B_AFU_M14_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_AAR: CUP_B_AFU_M14_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_AMG: CUP_B_AFU_M14_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_ATSpecialist: CUP_B_AFU_M14_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_Autorifleman: CUP_B_AFU_M14_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_Crewman: CUP_B_AFU_M14_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_Engineer: CUP_B_AFU_M14_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_Grenadier: CUP_B_AFU_M14_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_Grenatier_AKM: CUP_CRYE_MCAM_NP_Full {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_Machinegunner: CUP_B_AFU_M14_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_Marksman: CUP_B_AFU_M14_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_Medic: CUP_B_AFU_M14_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_MissileSoldier_AA: CUP_B_AFU_M14_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_Rifleman: CUP_B_AFU_M14_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_Rifleman_PSO: CUP_B_AFU_M14_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_Rifleman_AT: CUP_B_AFU_M14_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_Rifleman_Ammo: CUP_B_AFU_M14_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_Rifleman_AKM: CUP_B_AFU_M14_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_Rifleman_SKS: CUP_B_USArmy_Soldier_BDUv2_gloves_M81 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_Sapper: CUP_B_AFU_M14_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_Sapper_2: CUP_B_USArmy_UCP_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_Sniper_AM: CUP_B_CZ_Soldier_11 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_Spotter_MM14: CUP_B_CZ_Soldier_11 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Soldier_SquadLeader: CUP_B_AFU_M14_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TDF_Solider_TeamLeader: CUP_B_AFU_M14_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_B_AFU_Soldier_AAT: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_AAR: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_AMG: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_ATSpecialist: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_ATSpecialist_METIS: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_Autorifleman: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_Crewman: CUP_B_AFU_M14_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_Engineer: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_Grenadier: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_Machinegunner: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_Marksman: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_Medic: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_MissileSoldier_AA: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_Rifleman: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_Rifleman_1P90: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_Rifleman_PSO: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_Rifleman_AT: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_Rifleman_Ammo: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_Sapper: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_Sniper_AM: CUP_B_CZ_Soldier_11 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_Spotter: CUP_B_CZ_Soldier_11 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_SquadLeader: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_TeamLeader: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_ReconTL: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_ReconGL: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_ReconMarksman: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_ReconDemo: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_ReconMedic: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_ReconScout: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_ReconScoutAT: CUP_B_AFU_M14_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_HeliPilot: CUP_B_USMC_Soldier_06 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AFU_Soldier_HeliCrew: CUP_B_USMC_Soldier_06 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
diff --git a/addons/hidden_units/CUP_Units/united_nations.hpp b/addons/hidden_units/CUP_Units/united_nations.hpp
index 76c1ccd7..6e7fd88d 100644
--- a/addons/hidden_units/CUP_Units/united_nations.hpp
+++ b/addons/hidden_units/CUP_Units/united_nations.hpp
@@ -1,229 +1,172 @@
 // Units - United Nations
 class CUP_I_UN_CDF_Soldier_MNT: CUP_I_UNO_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_Backpack_MNT: CUP_I_UNO_Soldier_02_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_GL_MNT: CUP_I_UNO_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_AAT_MNT: CUP_I_UNO_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_AMG_MNT: CUP_I_UNO_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_LAT_MNT: CUP_I_UNO_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_AT_MNT: CUP_I_UNO_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_MG_MNT: CUP_I_UNO_Soldier_02_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_AR_MNT: CUP_I_UNO_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_SL_MNT: CUP_I_UNO_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Officer_MNT: CUP_I_UNO_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Guard_MNT: CUP_I_UNO_Soldier_02_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Pilot_MNT: CUP_I_UNO_Soldier_01_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Crew_MNT: CUP_I_UNO_Soldier_02_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_Light_MNT: CUP_I_UNO_Soldier_02_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_DST: CUP_I_UNO_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_Backpack_DST: CUP_I_UNO_Soldier_02_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_GL_DST: CUP_I_UNO_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_AAT_DST: CUP_I_UNO_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_AMG_DST: CUP_I_UNO_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_LAT_DST: CUP_I_UNO_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_AT_DST: CUP_I_UNO_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_MG_DST: CUP_I_UNO_Soldier_02_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_AR_DST: CUP_I_UNO_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_SL_DST: CUP_I_UNO_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Officer_DST: CUP_I_UNO_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Guard_DST: CUP_I_UNO_Soldier_02_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Pilot_DST: CUP_I_UNO_Soldier_01_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Crew_DST: CUP_I_UNO_Soldier_02_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_Light_DST: CUP_I_UNO_Soldier_02_DST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_FST: CUP_I_UNO_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_Backpack_FST: CUP_I_UNO_Soldier_02_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_GL_FST: CUP_I_UNO_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_AAT_FST: CUP_I_UNO_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_AMG_FST: CUP_I_UNO_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_LAT_FST: CUP_I_UNO_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_AT_FST: CUP_I_UNO_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_MG_FST: CUP_I_UNO_Soldier_02_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_AR_FST: CUP_I_UNO_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_SL_FST: CUP_I_UNO_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Officer_FST: CUP_I_UNO_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Guard_FST: CUP_I_UNO_Soldier_02_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Pilot_FST: CUP_I_UNO_Soldier_01_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Crew_FST: CUP_I_UNO_Soldier_02_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_Light_FST: CUP_I_UNO_Soldier_02_FST {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier: CUP_I_UN_CDF_Soldier_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_Backpack: CUP_I_UN_CDF_Soldier_Backpack_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_AAT: CUP_I_UN_CDF_Soldier_AAT_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_AMG: CUP_I_UN_CDF_Soldier_AMG_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_AT: CUP_I_UN_CDF_Soldier_AT_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_MG: CUP_I_UN_CDF_Soldier_MG_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_SL: CUP_I_UN_CDF_Soldier_SL_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Officer: CUP_I_UN_CDF_Officer_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Guard: CUP_I_UN_CDF_Guard_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Pilot: CUP_I_UN_CDF_Pilot_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Crew: CUP_I_UN_CDF_Crew_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_UN_CDF_Soldier_Light: CUP_I_UN_CDF_Soldier_Light_MNT {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
diff --git a/addons/hidden_units/CUP_Units/united_states_army.hpp b/addons/hidden_units/CUP_Units/united_states_army.hpp
index c12becc1..e346b928 100644
--- a/addons/hidden_units/CUP_Units/united_states_army.hpp
+++ b/addons/hidden_units/CUP_Units/united_states_army.hpp
@@ -1,537 +1,403 @@
 // Units - United States Army
 class CUP_B_US_Soldier_AA_UCP: CUP_B_USArmy_UCP_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_UCP: CUP_B_USArmy_UCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_ACOG_UCP: CUP_B_USArmy_UCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_UAV_UCP: CUP_B_USArmy_UCP_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Backpack_UCP: CUP_B_USArmy_UCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AMG_UCP: CUP_B_USArmy_UCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AAR_UCP: CUP_B_USArmy_UCP_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AHAT_UCP: CUP_B_USArmy_UCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AAT_UCP: CUP_B_USArmy_UCP_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Light_UCP: CUP_B_USArmy_UCP_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_GL_UCP: CUP_B_USArmy_UCP_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Officer_UCP: CUP_B_USArmy_UCP_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_SL_UCP: CUP_B_USArmy_UCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_TL_UCP: CUP_B_USArmy_UCP_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_LAT_UCP: CUP_B_USArmy_UCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AT_UCP: CUP_B_USArmy_UCP_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_HAT_UCP: CUP_B_USArmy_UCP_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Medic_UCP: CUP_B_USArmy_UCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AR_UCP: CUP_B_USArmy_UCP_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_MG_UCP: CUP_B_USArmy_UCP_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Spotter_UCP: CUP_B_USArmy_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Sniper_UCP: CUP_B_USArmy_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Sniper_M110_TWS_UCP: CUP_B_USArmy_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Sniper_M107_UCP: CUP_B_USArmy_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Marksman_UCP: CUP_B_USArmy_UCP_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Marksman_EBR_UCP: CUP_B_USArmy_UCP_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Engineer_Sapper_UCP: CUP_B_USArmy_UCP_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Engineer_EOD_UCP: CUP_B_USArmy_UCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Engineer_UCP: CUP_B_USArmy_UCP_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Crew_UCP: CUP_B_USArmy_UCP_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AA_OCP: CUP_B_USArmy_OCP_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_OCP: CUP_B_USArmy_OCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_ACOG_OCP: CUP_B_USArmy_OCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_UAV_OCP: CUP_B_USArmy_OCP_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Backpack_OCP: CUP_B_USArmy_OCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AMG_OCP: CUP_B_USArmy_OCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AAR_OCP: CUP_B_USArmy_OCP_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AHAT_OCP: CUP_B_USArmy_OCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AAT_OCP: CUP_B_USArmy_OCP_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Light_OCP: CUP_B_USArmy_OCP_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_GL_OCP: CUP_B_USArmy_OCP_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Officer_OCP: CUP_B_USArmy_OCP_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_SL_OCP: CUP_B_USArmy_OCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_TL_OCP: CUP_B_USArmy_OCP_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_LAT_OCP: CUP_B_USArmy_OCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AT_OCP: CUP_B_USArmy_OCP_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_HAT_OCP: CUP_B_USArmy_OCP_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Medic_OCP: CUP_B_USArmy_OCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AR_OCP: CUP_B_USArmy_OCP_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_MG_OCP: CUP_B_USArmy_OCP_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Spotter_OCP: CUP_B_USArmy_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Sniper_OCP: CUP_B_USArmy_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Sniper_M110_TWS_OCP: CUP_B_USArmy_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Sniper_M107_OCP: CUP_B_USArmy_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Marksman_OCP: CUP_B_USArmy_OCP_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Marksman_EBR_OCP: CUP_B_USArmy_OCP_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Engineer_Sapper_OCP: CUP_B_USArmy_OCP_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Engineer_EOD_OCP: CUP_B_USArmy_OCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Engineer_OCP: CUP_B_USArmy_OCP_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Crew_OCP: CUP_B_USArmy_OCP_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AA_OEFCP: CUP_B_USArmy_OEFCP_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_OEFCP: CUP_B_USArmy_OEFCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_ACOG_OEFCP: CUP_B_USArmy_OEFCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_UAV_OEFCP: CUP_B_USArmy_OEFCP_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Backpack_OEFCP: CUP_B_USArmy_OEFCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AMG_OEFCP: CUP_B_USArmy_OEFCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AAR_OEFCP: CUP_B_USArmy_OEFCP_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AHAT_OEFCP: CUP_B_USArmy_OEFCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AAT_OEFCP: CUP_B_USArmy_OEFCP_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Light_OEFCP: CUP_B_USArmy_OEFCP_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_GL_OEFCP: CUP_B_USArmy_OEFCP_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Officer_OEFCP: CUP_B_USArmy_OEFCP_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_SL_OEFCP: CUP_B_USArmy_OEFCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_TL_OEFCP: CUP_B_USArmy_OEFCP_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_LAT_OEFCP: CUP_B_USArmy_OEFCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AT_OEFCP: CUP_B_USArmy_OEFCP_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_HAT_OEFCP: CUP_B_USArmy_OEFCP_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Medic_OEFCP: CUP_B_USArmy_OEFCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AR_OEFCP: CUP_B_USArmy_OEFCP_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_MG_OEFCP: CUP_B_USArmy_OEFCP_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Spotter_OEFCP: CUP_B_USArmy_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Sniper_OEFCP: CUP_B_USArmy_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Sniper_M110_TWS_OEFCP: CUP_B_USArmy_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Sniper_M107_OEFCP: CUP_B_USArmy_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Marksman_OEFCP: CUP_B_USArmy_OEFCP_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Marksman_EBR_OEFCP: CUP_B_USArmy_OEFCP_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Engineer_Sapper_OEFCP: CUP_B_USArmy_OEFCP_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Engineer_EOD_OEFCP: CUP_B_USArmy_OEFCP_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Engineer_OEFCP: CUP_B_USArmy_OEFCP_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Crew_OEFCP: CUP_B_USArmy_OEFCP_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier: CUP_B_US_Soldier_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_ACOG: CUP_B_US_Soldier_ACOG_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_UAV: CUP_B_US_Soldier_UAV_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Backpack: CUP_B_US_Soldier_Backpack_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AMG: CUP_B_US_Soldier_AMG_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AAR: CUP_B_US_Soldier_AAR_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AHAT: CUP_B_US_Soldier_AHAT_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AAT: CUP_B_US_Soldier_AAT_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Light: CUP_B_US_Soldier_Light_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_GL: CUP_B_US_Soldier_GL_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Officer: CUP_B_US_Officer_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_SL: CUP_B_US_Soldier_SL_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_TL: CUP_B_US_Soldier_TL_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_LAT: CUP_B_US_Soldier_LAT_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AT: CUP_B_US_Soldier_AT_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_HAT: CUP_B_US_Soldier_HAT_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AA: CUP_B_US_Soldier_AA_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Medic: CUP_B_US_Medic_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_AR: CUP_B_US_Soldier_AR_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_MG: CUP_B_US_Soldier_MG_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Spotter: CUP_B_US_Spotter_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Sniper: CUP_B_US_Sniper_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Sniper_M110_TWS: CUP_B_US_Sniper_M110_TWS_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Sniper_M107: CUP_B_US_Sniper_M107_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Marksman: CUP_B_US_Soldier_Marksman_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Engineer_Sapper: CUP_B_US_Soldier_Engineer_Sapper_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Engineer_EOD: CUP_B_US_Soldier_Engineer_EOD_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Engineer: CUP_B_US_Soldier_Engineer_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Soldier_Engineer: CUP_B_US_Soldier_Engineer_UCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Crew: CUP_B_US_Crew_OCP {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Pilot: CUP_B_USArmy_Soldier_06 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_Pilot_Light: CUP_B_USArmy_Soldier_06 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_SpecOps: CUP_B_USArmy_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_SpecOps_UAV: CUP_B_USArmy_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_SpecOps_TL: CUP_B_USArmy_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_SpecOps_Medic: CUP_B_USArmy_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_SpecOps_Assault: CUP_B_US_SpecOps {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_SpecOps_SD: CUP_B_US_SpecOps {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_SpecOps_MG: CUP_B_US_SpecOps {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_SpecOps_AR: CUP_B_USArmy_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_SpecOps_Night: CUP_B_US_SpecOps {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_SpecOps_M: CUP_B_US_SpecOps {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_SpecOps_M14: CUP_B_US_SpecOps {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_US_SpecOps_JTAC: CUP_B_USArmy_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
diff --git a/addons/hidden_units/CUP_Units/united_states_marine_corps.hpp b/addons/hidden_units/CUP_Units/united_states_marine_corps.hpp
index 08142fc3..0eb4b081 100644
--- a/addons/hidden_units/CUP_Units/united_states_marine_corps.hpp
+++ b/addons/hidden_units/CUP_Units/united_states_marine_corps.hpp
@@ -1,689 +1,517 @@
 // Units - USMC
 class CUP_B_USMC_Soldier: CUP_B_USMC_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_UAV: CUP_B_USMC_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_Light: CUP_B_USMC_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_SpecOps_SD: CUP_B_USMC_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_GL: CUP_B_USMC_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Officer: CUP_B_USMC_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_SL: CUP_B_USMC_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_TL: CUP_B_USMC_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_AT_Base: CUP_B_USMC_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_LAT: CUP_B_USMC_Soldier_AT_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_AT: CUP_B_USMC_Soldier_AT_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_HAT: CUP_B_USMC_Soldier_AT_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_AA: CUP_B_USMC_Soldier_AT_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Medic: CUP_B_USMC_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_AR: CUP_B_USMC_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_MG: CUP_B_USMC_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Spotter: CUP_B_USMC_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Sniper_M40A3: CUP_B_USMC_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Sniper_M107: CUP_B_USMC_Sniper_M40A3 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_Marksman: CUP_B_USMC_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_SpecOps: CUP_B_USMC_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Engineer: CUP_B_USMC_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Pilot: CUP_B_USMC_Soldier_06 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Crew: CUP_B_USMC_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_LHD_Crew_Blue: CUP_B_USMC_LHD_Crew_Base_Blue {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_LHD_Crew_Brown: CUP_B_USMC_LHD_Crew_Base_Brown {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_LHD_Crew_Green: CUP_B_USMC_LHD_Crew_Base_Green {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_LHD_Crew_Red: CUP_B_USMC_LHD_Crew_Base_Red {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_LHD_Crew_Violet: CUP_B_USMC_LHD_Crew_Base_Violet {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_LHD_Crew_White: CUP_B_USMC_LHD_Crew_Base_White {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_LHD_Crew_Yellow: CUP_B_USMC_LHD_Crew_Base_Yellow {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USNavy_LHD_Crew_Blue: CUP_B_USNavy_LHD_Crew_base_Blue {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USNavy_LHD_Crew_Brown: CUP_B_USNavy_LHD_Crew_base_Brown {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USNavy_LHD_Crew_Green: CUP_B_USNavy_LHD_Crew_base_Green {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USNavy_LHD_Crew_Red: CUP_B_USNavy_LHD_Crew_base_Red {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USNavy_LHD_Crew_Violet: CUP_B_USNavy_LHD_Crew_base_Violet {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USNavy_LHD_Crew_White: CUP_B_USNavy_LHD_Crew_base_White {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USNavy_LHD_Crew_Yellow: CUP_B_USNavy_LHD_Crew_base_Yellow {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_des: CUP_B_USMC_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_UAV_des: CUP_B_USMC_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_Light_des: CUP_B_USMC_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_SpecOps_SD_des: CUP_B_USMC_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_GL_des: CUP_B_USMC_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Officer_des: CUP_B_USMC_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_SL_des: CUP_B_USMC_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_TL_des: CUP_B_USMC_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_AT_Base_des: CUP_B_USMC_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_LAT_des: CUP_B_USMC_Soldier_AT_Base_des {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_AT_des: CUP_B_USMC_Soldier_AT_Base_des {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_HAT_des: CUP_B_USMC_Soldier_AT_Base_des {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_AA_des: CUP_B_USMC_Soldier_AT_Base_des {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Medic_des: CUP_B_USMC_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_AR_des: CUP_B_USMC_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_MG_des: CUP_B_USMC_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Spotter_des: CUP_B_USMC_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Sniper_M40A3_des: CUP_B_USMC_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Sniper_M107_des: CUP_B_USMC_Sniper_M40A3_des {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_Marksman_des: CUP_B_USMC_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_SpecOps_des: CUP_B_USMC_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Engineer_des: CUP_B_USMC_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Pilot_des: CUP_B_USMC_Soldier_06 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Crew_des: CUP_B_USMC_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_10: CUP_Creatures_Military_USMC_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_11: CUP_B_USMC_Soldier_10 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_12: CUP_Creatures_Military_USMC_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_13: CUP_B_USMC_Soldier_12 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_14: CUP_Creatures_Military_USMC_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_15: CUP_B_USMC_Soldier_14 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_16: CUP_Creatures_Military_USMC_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_17: CUP_B_USMC_Soldier_16 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_FROG_WDL: CUP_B_USMC_Soldier_12 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Crewman_FROG_WDL: CUP_B_USMC_Soldier_12 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_LAT_FROG_WDL: CUP_B_USMC_Soldier_14 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_AT_FROG_WDL: CUP_B_USMC_Soldier_16 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_HAT_FROG_WDL: CUP_B_USMC_Soldier_12 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_AA_FROG_WDL: CUP_B_USMC_Soldier_12 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_Light_FROG_WDL: CUP_B_USMC_Soldier_12 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_AR_FROG_WDL: CUP_B_USMC_Soldier_12 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_MG_FROG_WDL: CUP_B_USMC_Soldier_14 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_TL_FROG_WDL: CUP_B_USMC_Soldier_12 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_SL_FROG_WDL: CUP_B_USMC_Soldier_12 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Medic_FROG_WDL: CUP_B_USMC_Soldier_16 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_Marksman_FROG_WDL: CUP_B_USMC_Soldier_10 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Engineer_FROG_WDL: CUP_B_USMC_Soldier_12 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_GL_FROG_WDL: CUP_B_USMC_Soldier_12 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_SpecOps_FROG_WDL: CUP_B_USMC_Soldier_10 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_RTO_FROG_WDL: CUP_B_USMC_Soldier_12 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Officer_FROG_WDL: CUP_B_USMC_Soldier_10 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_UAV_FROG_WDL: CUP_B_USMC_Soldier_16 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_FROG_DES: CUP_B_USMC_Soldier_13 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Crewman_FROG_DES: CUP_B_USMC_Soldier_13 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_LAT_FROG_DES: CUP_B_USMC_Soldier_15 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_AT_FROG_DES: CUP_B_USMC_Soldier_17 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_HAT_FROG_DES: CUP_B_USMC_Soldier_13 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_AA_FROG_DES: CUP_B_USMC_Soldier_13 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_Light_FROG_DES: CUP_B_USMC_Soldier_13 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_AR_FROG_DES: CUP_B_USMC_Soldier_13 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_MG_FROG_DES: CUP_B_USMC_Soldier_15 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_TL_FROG_DES: CUP_B_USMC_Soldier_13 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_SL_FROG_DES: CUP_B_USMC_Soldier_13 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Medic_FROG_DES: CUP_B_USMC_Soldier_17 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_Marksman_FROG_DES: CUP_B_USMC_Soldier_11 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Engineer_FROG_DES: CUP_B_USMC_Soldier_13 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_GL_FROG_DES: CUP_B_USMC_Soldier_13 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_SpecOps_FROG_DES: CUP_B_USMC_Soldier_11 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_RTO_FROG_DES: CUP_B_USMC_Soldier_13 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Officer_FROG_DES: CUP_B_USMC_Soldier_11 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_Soldier_UAV_FROG_DES: CUP_B_USMC_Soldier_17 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_01: CUP_Creatures_Military_FR_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_02: CUP_Creatures_Military_FR_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_03: CUP_Creatures_Military_FR_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_04: CUP_Creatures_Military_FR_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_05: CUP_Creatures_Military_FR_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_06: CUP_Creatures_Military_FR_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_07: CUP_Creatures_Military_FR_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_08: CUP_Creatures_Military_FR_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_09: CUP_Creatures_Military_FR_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_10: CUP_Creatures_Military_FR_Soldier_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_TL: CUP_B_FR_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Commander: CUP_B_FR_Soldier_03 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Saboteur: CUP_B_FR_Soldier_08 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_Marksman: CUP_B_FR_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_Light: CUP_B_FR_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Medic: CUP_B_FR_Soldier_04 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_AR: CUP_B_FR_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_GL: CUP_B_FR_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_Exp: CUP_B_FR_Soldier_10 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_Operator: CUP_B_FR_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_UAV: CUP_B_FR_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_Assault: CUP_B_FR_Soldier_05 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_Assault_GL: CUP_B_FR_Soldier_06 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Story_Miles: CUP_B_FR_Soldier_09 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Story_Cooper: CUP_B_FR_Soldier_01 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Story_Sykes: CUP_B_FR_Soldier_07 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Story_OHara: CUP_B_FR_Medic {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Story_Rodriguez: CUP_B_FR_Soldier_AR {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_TL_DES: CUP_B_USMC_Soldier_13 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Commander_DES: CUP_B_USMC_Soldier_13 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Saboteur_DES: CUP_B_USMC_Soldier_11 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_Marksman_DES: CUP_B_USMC_Soldier_17 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_Light_DES: CUP_B_USMC_Soldier_11 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Medic_DES: CUP_B_USMC_Soldier_11 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_AR_DES: CUP_B_USMC_Soldier_13 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_GL_DES: CUP_B_USMC_Soldier_11 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_Exp_DES: CUP_B_USMC_Soldier_13 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_Operator_DES: CUP_B_USMC_Soldier_17 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_UAV_DES: CUP_B_USMC_Soldier_13 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_Assault_DES: CUP_B_USMC_Soldier_17 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Soldier_Assault_GL_DES: CUP_B_USMC_Soldier_17 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Story_Miles_DES: CUP_B_USMC_Soldier_13 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Story_Cooper_DES: CUP_B_USMC_Soldier_15 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Story_Sykes_DES: CUP_B_USMC_Soldier_15 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Story_OHara_DES: CUP_B_USMC_Soldier_11 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_FR_Story_Rodriguez_DES: CUP_B_USMC_Soldier_17 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_MARSOC: CUP_B_USMC_Soldier_02 {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_MARSOC_TL: CUP_B_USMC_MARSOC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_MARSOC_TC: CUP_B_USMC_MARSOC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_MARSOC_OC: CUP_B_USMC_MARSOC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_MARSOC_CC: CUP_B_USMC_MARSOC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_MARSOC_EL: CUP_B_USMC_MARSOC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_MARSOC_AR: CUP_B_USMC_MARSOC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_MARSOC_Medic: CUP_B_USMC_MARSOC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_MARSOC_Marksman: CUP_B_USMC_MARSOC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_MARSOC_DA: CUP_B_USMC_MARSOC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_MARSOC_TL_DA: CUP_B_USMC_MARSOC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_MARSOC_TC_DA: CUP_B_USMC_MARSOC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_MARSOC_OC_DA: CUP_B_USMC_MARSOC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_MARSOC_CC_DA: CUP_B_USMC_MARSOC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_MARSOC_EL_DA: CUP_B_USMC_MARSOC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_MARSOC_AR_DA: CUP_B_USMC_MARSOC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_MARSOC_Medic_DA: CUP_B_USMC_MARSOC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_USMC_MARSOC_Marksman_DA: CUP_B_USMC_MARSOC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
diff --git a/addons/hidden_units/CfgVehicles_Turrets.hpp b/addons/hidden_units/CfgVehicles_Turrets.hpp
index 53d094c3..6a99bd68 100644
--- a/addons/hidden_units/CfgVehicles_Turrets.hpp
+++ b/addons/hidden_units/CfgVehicles_Turrets.hpp
@@ -1,832 +1,629 @@
 // class all factional turrets.
 class CUP_B_L111A1_BAF_MPT: CUP_L111A1_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_L111A1_BAF_WDL: CUP_L111A1_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_L111A1_BAF_DDPM: CUP_L111A1_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_L111A1_MiniTripod_BAF_MPT: CUP_L111A1_MiniTripod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_L111A1_MiniTripod_BAF_DDPM: CUP_L111A1_MiniTripod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_L111A1_MiniTripod_BAF_WDL: CUP_L111A1_MiniTripod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_L134A1_TriPod_BAF_WDL: CUP_L134A1_TriPod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_L134A1_TriPod_BAF_MPT: CUP_L134A1_TriPod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_L134A1_TriPod_BAF_DDPM: CUP_L134A1_TriPod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_L16A2_BAF_DDPM: CUP_L16A2_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_L16A2_BAF_MPT: CUP_L16A2_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_L16A2_BAF_WDL: CUP_L16A2_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_SearchLight_static_BAF_DDPM: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_BSearchLight_static_BAF_WDL: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_SearchLight_static_BAF_MPT: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_B_AGS_CDF: CUP_AGS_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_D30_CDF: CUP_D30_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_D30_AT_CDF: CUP_D30_AT_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_DSHKM_CDF: CUP_DSHKM_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_DSHkM_MiniTriPod_CDF: CUP_DSHKM_MiniTripod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_Igla_AA_pod_CDF: CUP_Igla_AA_pod_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_2b14_82mm_CDF: CUP_2b14_82mm_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_SearchLight_static_CDF: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_SPG9_CDF: CUP_SPG9_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_ZU23_CDF: CUP_ZU23_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_B_AGS_ACR: CUP_AGS_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_DSHKM_ACR: CUP_DSHKM_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_2b14_82mm_ACR: CUP_2b14_82mm_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_RBS70_ACR: CUP_RBS70_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_SearchLight_static_ACR: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_B_M119_HIL: CUP_M119_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_M252_HIL: CUP_M252_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_RBS70_HIL: CUP_RBS70_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SearchLight_static_HIL: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_B_CUP_Stinger_AA_pod_US: CUP_Stinger_AA_pod_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_M119_US: CUP_M119_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_M2StaticMG_US: CUP_M2StaticMG_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_M2StaticMG_MiniTripod_US: CUP_M2StaticMG_MiniTripod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TOW_TriPod_US: CUP_TOW_TriPod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TOW2_TriPod_US: CUP_TOW2_TriPod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_M252_US: CUP_M252_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_MK19_TriPod_US: CUP_MK19_TriPod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_CUP_SearchLight_static_US: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_B_M2StaticMG_GER_Fleck: CUP_M2StaticMG_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_M2StaticMG_GER: CUP_M2StaticMG_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_M2StaticMG_MiniTripod_GER_Fleck: CUP_M2StaticMG_MiniTripod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_M2StaticMG_MiniTripod_GER: CUP_M2StaticMG_MiniTripod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_SearchLight_static_GER_Fleck: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_SearchLight_static_GER: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_B_Stinger_AA_pod_Base_USMC: CUP_Stinger_AA_pod_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_M119_USMC: CUP_M119_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_M2StaticMG_USMC: CUP_M2StaticMG_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_M2StaticMG_MiniTripod_USMC: CUP_M2StaticMG_MiniTripod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TOW_TriPod_USMC: CUP_TOW_TriPod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_TOW2_TriPod_USMC: CUP_TOW2_TriPod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_M252_USMC: CUP_M252_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_MK19_TriPod_USMC: CUP_MK19_TriPod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_SearchLight_static_USMC: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_AGS_RU_M_BeigeDigital: CUP_AGS_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_AGS_RU: CUP_AGS_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_AGS_RU_M_MSV: CUP_AGS_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_D30_RU_M_MSV: CUP_D30_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_D30_RU_M_BeigeDigital: CUP_D30_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_D30_RU: CUP_D30_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_D30_AT_RU_M_MSV: CUP_D30_AT_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_D30_AT_RU: CUP_D30_AT_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_D30_AT_RU_M_BeigeDigital: CUP_D30_AT_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Igla_AA_pod_RU: CUP_Igla_AA_pod_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Igla_AA_pod_RU_M_MSV: CUP_Igla_AA_pod_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Igla_AA_pod_RU_M_BeigeDigital: CUP_Igla_AA_pod_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_KORD_high_RU_M_BeigeDigital: CUP_KORD_High_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_KORD_high_RU_M_MSV: CUP_KORD_High_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_KORD_high_RU: CUP_KORD_High_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_KORD_RU: CUP_KORD_MiniTripod_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_KORD_RU_M_BeigeDigital: CUP_KORD_MiniTripod_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_KORD_RU_M_MSV: CUP_KORD_MiniTripod_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Kornet_RU: CUP_Kornet_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Kornet_RU_M_BeigeDigital: CUP_Kornet_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Kornet_RU_M_MSV: CUP_Kornet_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Metis_RU: CUP_Metis_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Metis_RU_M_MSV: CUP_Metis_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Metis_RU_M_BeigeDigital: CUP_Metis_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_2b14_82mm_RU_M_MSV: CUP_2b14_82mm_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_2b14_82mm_RU: CUP_2b14_82mm_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_2b14_82mm_RU_M_BeigeDigital: CUP_2b14_82mm_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SearchLight_static_RU: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SearchLight_static_RU_M_BeigeDigital: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SearchLight_static_RU_M_MSV: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_ZU23_RU: CUP_ZU23_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_ZU23_RU_M_MSV: CUP_ZU23_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_ZU23_RU_M_BeigeDigital: CUP_ZU23_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_ZU23_RUS_M_Summer: CUP_ZU23_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_KORD_RUS_M_Summer: CUP_KORD_MiniTripod_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_KORD_high_RUS_M_Summer: CUP_KORD_High_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_AGS_RUS_M_Summer: CUP_AGS_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Metis_RUS_M_Summer: CUP_Metis_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Igla_AA_pod_RUS_M_Summer: CUP_Igla_AA_pod_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_2b14_82mm_RUS_M_Summer: CUP_2b14_82mm_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_D30_RUS_M_Summer: CUP_D30_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_D30_AT_RUS_M_Summer: CUP_D30_AT_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Kornet_RUS_M_Summer: CUP_Kornet_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SearchLight_static_RUS_M_Summer: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_ZU23_RUS_M_Winter: CUP_ZU23_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_KORD_RUS_M_Winter: CUP_KORD_MiniTripod_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_KORD_high_RUS_M_Winter: CUP_KORD_High_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_AGS_RUS_M_Winter: CUP_AGS_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Metis_RUS_M_Winter: CUP_Metis_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Igla_AA_pod_RUS_M_Winter: CUP_Igla_AA_pod_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_2b14_82mm_RUS_M_Winter: CUP_2b14_82mm_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_D30_RUS_M_Winter: CUP_D30_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_D30_AT_RUS_M_Winter: CUP_D30_AT_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Kornet_RUS_M_Winter: CUP_Kornet_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SearchLight_static_RUS_M_Winter: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_ZU23_RUS_M_Desert: CUP_ZU23_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_KORD_RUS_M_Desert: CUP_KORD_MiniTripod_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_KORD_high_RUS_M_Desert: CUP_KORD_High_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_AGS_RUS_M_Desert: CUP_AGS_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Metis_RUS_M_Desert: CUP_Metis_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Igla_AA_pod_RUS_M_Desert: CUP_Igla_AA_pod_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_2b14_82mm_RUS_M_Desert: CUP_2b14_82mm_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_D30_RUS_M_Desert: CUP_D30_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_D30_AT_RUS_M_Desert: CUP_D30_AT_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Kornet_RUS_M_Desert: CUP_Kornet_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SearchLight_static_RUS_M_Desert: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_AGS_TK: CUP_AGS_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_D30_TK: CUP_D30_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_D30_AT_TK: CUP_D30_AT_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Igla_AA_pod_TK: CUP_Igla_AA_pod_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_KORD_high_TK: CUP_KORD_High_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_KORD_TK: CUP_KORD_MiniTripod_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Metis_TK: CUP_Metis_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_2b14_82mm_TK: CUP_2b14_82mm_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SearchLight_static_TK: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_ZU23_TK: CUP_ZU23_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_AGS_TK_INS: CUP_AGS_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_D30_TK_INS: CUP_D30_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_D30_AT_TK_INS: CUP_D30_AT_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_DSHKM_TK_INS: CUP_DSHKM_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_DSHkM_MiniTriPod_TK_INS: CUP_DSHKM_MiniTripod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_2b14_82mm_TK_INS: CUP_2b14_82mm_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SearchLight_static_TK_INS: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SPG9_TK_INS: CUP_SPG9_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_ZU23_TK_INS: CUP_ZU23_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_AGS_SLA: CUP_AGS_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_D30_SLA: CUP_D30_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_D30_AT_SLA: CUP_D30_AT_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_DSHKM_SLA: CUP_DSHKM_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_DSHKM_MiniTripod_SLA: CUP_DSHKM_MiniTripod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Igla_AA_pod_SLA: CUP_Igla_AA_pod_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_2b14_82mm_SLA: CUP_2b14_82mm_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SearchLight_static_SLA: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SPG9_SLA: CUP_SPG9_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_ZU23_SLA: CUP_ZU23_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_O_AGS_ChDKZ: CUP_AGS_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_D30_ChDKZ: CUP_D30_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_D30_AT_ChDKZ: CUP_D30_AT_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_DSHKM_ChDKZ: CUP_DSHKM_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_DSHkM_MiniTriPod_ChDKZ: CUP_DSHKM_MiniTripod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Igla_AA_pod_ChDKZ: CUP_Igla_AA_pod_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_2b14_82mm_ChDKZ: CUP_2b14_82mm_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SearchLight_static_ChDKZ: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_SPG9_ChDKZ: CUP_SPG9_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_ZU23_ChDKZ: CUP_ZU23_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_I_DSHKM_NAPA: CUP_DSHKM_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_DSHkM_MiniTriPod_NAPA: CUP_DSHKM_MiniTripod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_2b14_82mm_NAPA: CUP_2b14_82mm_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_SearchLight_static_NAPA: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_SPG9_NAPA: CUP_SPG9_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_ZU23_NAPA: CUP_ZU23_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_I_M119_RACS: CUP_M119_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_M2StaticMG_RACS: CUP_M2StaticMG_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_M2StaticMG_MiniTripod_RACS: CUP_M2StaticMG_MiniTripod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_M252_RACS: CUP_M252_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_SearchLight_static_RACS: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_I_AGS_TK_GUE: CUP_AGS_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_D30_TK_GUE: CUP_D30_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_D30_AT_TK_GUE: CUP_D30_AT_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_DSHKM_TK_GUE: CUP_DSHKM_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_DSHkM_MiniTriPod_TK_GUE: CUP_DSHKM_MiniTripod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_2b14_82mm_TK_GUE: CUP_2b14_82mm_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_SearchLight_static_TK_GUE: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_SPG9_TK_GUE: CUP_SPG9_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_ZU23_TK_GUE: CUP_ZU23_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_I_AGS_UN: CUP_AGS_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_KORD_high_UN: CUP_KORD_High_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_KORD_UN: CUP_KORD_MiniTripod_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_I_SearchLight_static_UN: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_M134_A_USMC: CUP_M134_A_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_M134_A_US_ARMY: CUP_B_M134_A_USMC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_M134_A_GER: CUP_B_M134_A_USMC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_M134_A_GB: CUP_B_M134_A_USMC {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class CUP_B_ZU23_AFU: CUP_ZU23_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_DSHKM_AFU: CUP_DSHKM_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_DSHkM_MiniTriPod_AFU: CUP_DSHKM_MiniTripod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_AGS_AFU: CUP_AGS_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_SPG9_AFU: CUP_SPG9_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_2b14_82mm_AFU: CUP_2b14_82mm_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_D30_AFU: CUP_D30_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_D30_AT_AFU: CUP_D30_AT_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_Igla_AA_pod_AFU: CUP_Igla_AA_pod_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_SearchLight_static_AFU: CUP_SearchLight_static_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_M2StaticMG_AFU: CUP_M2StaticMG_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_B_M2StaticMG_MiniTripod_AFU: CUP_M2StaticMG_MiniTripod_base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
diff --git a/addons/hidden_units/CfgVehicles_Vehicles.hpp b/addons/hidden_units/CfgVehicles_Vehicles.hpp
index e3fbb9cc..472cd1bf 100644
--- a/addons/hidden_units/CfgVehicles_Vehicles.hpp
+++ b/addons/hidden_units/CfgVehicles_Vehicles.hpp
@@ -1,61 +1,46 @@
 class CUP_Kamaz_6396_transport_Base: O_Truck_03_transport_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_Kamaz_6396_covered_Base: O_Truck_03_covered_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_Kamaz_6396_repair_Base: O_Truck_03_repair_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_Kamaz_6396_ammo_Base: O_Truck_03_ammo_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_Kamaz_6396_fuel_Base: O_Truck_03_fuel_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_Kamaz_6396_medical_Base: O_Truck_03_medical_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Kamaz_6396_transport_RUS_M: CUP_Kamaz_6396_transport_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Kamaz_6396_covered_RUS_M: CUP_Kamaz_6396_covered_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Kamaz_6396_repair_RUS_M: CUP_Kamaz_6396_repair_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Kamaz_6396_ammo_RUS_M: CUP_Kamaz_6396_ammo_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Kamaz_6396_fuel_RUS_M: CUP_Kamaz_6396_fuel_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class CUP_O_Kamaz_6396_medical_RUS_M: CUP_Kamaz_6396_medical_Base {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 class B_CTRG_LSV_01_light_F: LSV_01_light_base_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_CTRG_Heli_Transport_01_tropic_F: Heli_Transport_01_base_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_CTRG_Heli_Transport_01_sand_F: Heli_Transport_01_base_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
diff --git a/addons/hidden_units/Vanilla_Units/ctrg.hpp b/addons/hidden_units/Vanilla_Units/ctrg.hpp
index f2bf504a..6ce0edcc 100644
--- a/addons/hidden_units/Vanilla_Units/ctrg.hpp
+++ b/addons/hidden_units/Vanilla_Units/ctrg.hpp
@@ -1,42 +1,32 @@
 // CTRG - Units (including WS Desert Units)
 
 class B_CTRG_Soldier_AR_tna_F: B_CTRG_Soldier_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_CTRG_Soldier_Exp_tna_F: B_CTRG_Soldier_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_CTRG_Soldier_JTAC_tna_F: B_CTRG_Soldier_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_CTRG_Soldier_M_tna_F: B_CTRG_Soldier_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_CTRG_Soldier_Medic_tna_F: B_CTRG_Soldier_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_CTRG_Soldier_LAT2_tna_F: B_CTRG_Soldier_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_CTRG_Soldier_tna_F: B_CTRG_Soldier_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_CTRG_Soldier_LAT_tna_F: B_CTRG_Soldier_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_CTRG_Soldier_TL_tna_F: B_CTRG_Soldier_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_CTRG_Miller_F: B_CTRG_Soldier_3_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
diff --git a/addons/hidden_units/rf_ws/CfgVehicles.hpp b/addons/hidden_units/rf_ws/CfgVehicles.hpp
index 41ac5dfc..235b5b91 100644
--- a/addons/hidden_units/rf_ws/CfgVehicles.hpp
+++ b/addons/hidden_units/rf_ws/CfgVehicles.hpp
@@ -13,87 +13,66 @@ class CfgVehicles {
     class B_D_CTRG_Soldier_Exp_lxWS;
 
     class B_UN_Pickup_rf: Pickup_01_base_rf {
-        scope = 1;
-        scopeCurator = 1;
+        MACRO_HIDE_VEHICLE;
     };
     class B_UN_Pickup_mmg_rf: Pickup_01_mmg_base_rf {
-        scope = 1;
-        scopeCurator = 1;
+        MACRO_HIDE_VEHICLE;
     };
     class I_Tura_Pickup_01_RF: Pickup_01_base_rf {
-        scope = 1;
-        scopeCurator = 1;
+        MACRO_HIDE_VEHICLE;
     };
     class I_Tura_Pickup_fuel_rf: Pickup_fuel_base_rf {
-        scope = 1;
-        scopeCurator = 1;
+        MACRO_HIDE_VEHICLE;
     };
     class I_Tura_Pickup_01_hmg_rf: Pickup_01_hmg_base_rf {
-        scope = 1;
-        scopeCurator = 1;
+        MACRO_HIDE_VEHICLE;
     };
     class B_Tura_Pickup_01_RF: I_Tura_Pickup_01_RF {
-        scope = 1;
-        scopeCurator = 1;
+        MACRO_HIDE_VEHICLE;
     };
     class B_Tura_Pickup_01_fuel_RF: I_Tura_Pickup_fuel_rf {
-        scope = 1;
-        scopeCurator = 1;
+        MACRO_HIDE_VEHICLE;
     };
     class B_Tura_Pickup_01_hmg_RF: I_Tura_Pickup_01_hmg_rf {
-        scope = 1;
-        scopeCurator = 1;
+        MACRO_HIDE_VEHICLE;
     };
     class O_Tura_Pickup_01_RF: I_Tura_Pickup_01_RF {
-        scope = 1;
-        scopeCurator = 1;
+        MACRO_HIDE_VEHICLE;
     };
     class O_Tura_Pickup_01_fuel_RF: I_Tura_Pickup_fuel_rf {
-        scope = 1;
-        scopeCurator = 1;
+        MACRO_HIDE_VEHICLE;
     };
     class O_Tura_Pickup_01_hmg_RF: I_Tura_Pickup_01_hmg_rf {
-        scope = 1;
-        scopeCurator = 1;
+        MACRO_HIDE_VEHICLE;
     };
     class B_UN_Heli_EC_01A_military_RF: Heli_EC_01A_military_base_RF {
-        scope = 1;
-        scopeCurator = 1;
+        MACRO_HIDE_VEHICLE;
     };
     class O_SFIA_Heli_EC_02_RF: I_SFIA_Heli_EC_02_RF {
-        scope = 1;
-        scopeCurator = 1;
+        MACRO_HIDE_VEHICLE;
     };
     class I_Tura_Pickup_01_Rocket_rf: Pickup_01_Rocket_base_rf {
-        scope = 1;
-        scopeCurator = 1;
+        MACRO_HIDE_VEHICLE;
     };
     class B_Tura_Pickup_01_Rocket_rf: I_Tura_Pickup_01_Rocket_rf {
-        scope = 1;
-        scopeCurator = 1;
+        MACRO_HIDE_VEHICLE;
     };
     class O_Tura_Pickup_01_Rocket_rf: I_Tura_Pickup_01_Rocket_rf {
-        scope = 1;
-        scopeCurator = 1;
+        MACRO_HIDE_VEHICLE;
     };
     class B_UN_soldier_LAT_rf: B_UN_soldier_LAT2_lxWS {
-        scope = 1;
-        scopeCurator = 1;
+        MACRO_HIDE_VEHICLE;
     };
     class B_D_CTRG_support_CMort_RF: B_D_CTRG_Soldier_Exp_lxWS {
-        scope = 1;
-        scopeCurator = 1;
+        MACRO_HIDE_VEHICLE;
     };
     class B_D_CTRG_Soldier_LAT_RF: B_D_CTRG_Soldier_LAT2_lxWS {
-        scope = 1;
-        scopeCurator = 1;
+        MACRO_HIDE_VEHICLE;
     };
     class B_D_CTRG_Sharpshooter_lxWS: B_D_CTRG_Soldier_M_lxWS {
-        scope = 1;
-        scopeCurator = 1;
+        MACRO_HIDE_VEHICLE;
     };
     class B_D_CTRG_CommandoMortar_RF: B_CommandoMortar_RF {
-        scope = 1;
-        scopeCurator = 1;
+        MACRO_HIDE_VEHICLE;
     };
 };
diff --git a/addons/hidden_units/ws/ctrg.hpp b/addons/hidden_units/ws/ctrg.hpp
index 2d66bf85..62b8270e 100644
--- a/addons/hidden_units/ws/ctrg.hpp
+++ b/addons/hidden_units/ws/ctrg.hpp
@@ -1,41 +1,31 @@
 // CTRG
 class B_D_CTRG_Soldier_TL_lxWS: B_CTRG_Soldier_TL_tna_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_D_CTRG_soldier_UAV_lxWS: B_soldier_UAV_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_D_CTRG_Soldier_lxWS: B_CTRG_Soldier_tna_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_D_CTRG_Soldier_SG_lxWS: B_ION_Soldier_SG_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_D_CTRG_Soldier_LAT2_lxWS: B_CTRG_Soldier_LAT2_tna_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_D_CTRG_Soldier_Medic_lxWS: B_CTRG_Soldier_Medic_tna_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_D_CTRG_Soldier_M_lxWS: B_CTRG_Soldier_M_tna_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_D_CTRG_Soldier_JTAC_lxWS: B_CTRG_Soldier_JTAC_tna_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_D_CTRG_Soldier_HG_lxWS: B_CTRG_Soldier_AR_tna_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_D_CTRG_Soldier_Exp_lxWS: B_CTRG_Soldier_Exp_tna_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
diff --git a/addons/hidden_units/ws/sfia.hpp b/addons/hidden_units/ws/sfia.hpp
index a942c308..7959daae 100644
--- a/addons/hidden_units/ws/sfia.hpp
+++ b/addons/hidden_units/ws/sfia.hpp
@@ -1,429 +1,324 @@
 // Units - SFIA
 class I_SFIA_soldier_lxWS: I_soldier_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_Soldier_TL_lxWS: I_Soldier_TL_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_Soldier_GL_lxWS: I_Soldier_GL_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_Soldier_AR_lxWS: I_Soldier_AR_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_officer_lxWS: I_officer_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_sharpshooter_lxWS: I_G_Sharpshooter_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_crew_lxWS: I_crew_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_pilot_lxWS: I_pilot_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_soldier_at_lxWS: I_Soldier_AT_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_soldier_aa_lxWS: I_Soldier_AA_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_medic_lxWS: I_G_medic_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_exp_lxWS: I_G_Soldier_exp_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_repair_lxWS: I_Soldier_repair_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_Soldier_AAT_lxWS: I_Soldier_AAT_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_Soldier_AAA_lxWS: I_Soldier_AAA_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_soldier_lite_lxWS: I_SFIA_soldier_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_defector_lxWS: I_SFIA_soldier_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_Tura_deserter_lxWS: I_SFIA_deserter_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_enforcer_lxWS: I_C_Soldier_Para_2_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_hireling_lxWS: I_C_Soldier_Bandit_2_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_Tura_HeavyGunner_lxWS: I_Tura_deserter_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_scout_lxWS: I_C_Soldier_Bandit_5_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_medic2_lxWS: I_C_Soldier_Bandit_1_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_thug_lxWS: I_SFIA_scout_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_Tura_soldier_UAV_lxWS: I_Tura_deserter_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_watcher_lxWS: I_C_Soldier_Bandit_4_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_SFIA_Said_lxWS: I_SFIA_officer_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_PMC_Story_Gustavo_lxWS: I_PMC_Soldier_01_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_Tura_HMG_02_lxWS: I_SFIA_HMG_02_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_Tura_HMG_02_high_lxWS: I_SFIA_HMG_02_high_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_Tura_Mortar_lxWS: I_SFIA_Mortar_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_Tura_Offroad_armor_lxWS: Offroad_01_armor_base_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_Tura_Offroad_armor_AT_lxWS: Offroad_01_armor_AT_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_Tura_Offroad_armor_armed_lxWS: Offroad_01_armor_armed_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class I_Tura_UAV_02_IED_lxWS: UAV_02_IED_Base_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 // Opfor
 class O_SFIA_Soldier_AAA_lxWS: I_SFIA_Soldier_AAA_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_Soldier_AAT_lxWS: I_SFIA_Soldier_AAT_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_Soldier_AR_lxWS: I_SFIA_Soldier_AR_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_medic_lxWS: I_SFIA_medic_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_crew_lxWS: I_SFIA_crew_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_exp_lxWS: I_SFIA_exp_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_Soldier_GL_lxWS: I_SFIA_Soldier_GL_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_HeavyGunner_lxWS: O_SFIA_Soldier_AR_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_soldier_aa_lxWS: I_SFIA_soldier_aa_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_soldier_at_lxWS: I_SFIA_soldier_at_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_officer_lxWS: I_SFIA_officer_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_pilot_lxWS: I_SFIA_pilot_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_repair_lxWS: I_SFIA_repair_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_soldier_lxWS: I_SFIA_soldier_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_soldier_lite_lxWS: O_SFIA_soldier_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_soldier_unarmed_lxWS: I_SFIA_soldier_unarmed_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_sharpshooter_lxWS: I_SFIA_sharpshooter_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_survivor_lxWS: I_SFIA_survivor_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_Soldier_TL_lxWS: I_SFIA_Soldier_TL_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_Tura_defector_lxWS: I_SFIA_defector_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_Tura_deserter_lxWS: I_SFIA_deserter_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_Tura_enforcer_lxWS: I_SFIA_enforcer_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_Tura_hireling_lxWS: I_SFIA_hireling_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_Tura_HeavyGunner_lxWS: I_Tura_HeavyGunner_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_Tura_scout_lxWS: I_SFIA_scout_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_Tura_medic2_lxWS: I_SFIA_medic2_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_Tura_thug_lxWS: I_SFIA_thug_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_Tura_soldier_UAV_lxWS: O_Tura_deserter_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_Tura_watcher_lxWS: I_SFIA_watcher_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 // Vehicles
 class O_SFIA_Truck_02_aa_lxWS: I_SFIA_Truck_02_aa_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_APC_Tracked_02_AA_lxWS: I_SFIA_APC_Tracked_02_AA_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_APC_Tracked_02_cannon_lxWS: I_SFIA_APC_Tracked_02_cannon_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_APC_Tracked_02_30mm_lxWS: I_SFIA_APC_Tracked_02_30mm_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_APC_Wheeled_02_hmg_lxWS: I_SFIA_APC_Wheeled_02_hmg_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_APC_Wheeled_02_unarmed_lxWS: I_SFIA_APC_Wheeled_02_unarmed_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_Truck_02_MRL_lxWS: I_SFIA_Truck_02_MRL_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_Truck_02_fuel_lxWS: I_SFIA_Truck_02_fuel_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_Truck_02_transport_lxWS: I_SFIA_Truck_02_transport_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_Truck_02_covered_lxWS: I_SFIA_Truck_02_covered_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_Offroad_lxWS: I_SFIA_Offroad_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_Offroad_AT_lxWS: I_SFIA_Offroad_AT_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_Offroad_armed_lxWS: I_SFIA_Offroad_armed_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_Truck_02_Ammo_lxWS: I_SFIA_Truck_02_Ammo_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_Truck_02_cargo_lxWS: I_SFIA_Truck_02_cargo_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_Truck_02_flatbed_lxWS: I_SFIA_Truck_02_flatbed_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_Truck_02_box_lxWS: I_SFIA_Truck_02_box_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_Heli_Attack_02_dynamicLoadout_lxWS: I_SFIA_Heli_Attack_02_dynamicLoadout_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_MBT_02_cannon_lxWS: I_SFIA_MBT_02_cannon_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_HMG_02_lxWS: I_SFIA_HMG_02_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_HMG_02_high_lxWS: I_SFIA_HMG_02_high_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_Mortar_lxWS: I_SFIA_Mortar_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_SFIA_ZU23_lxWS: I_SFIA_ZU23_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_Tura_Offroad_armor_lxWS: I_Tura_Offroad_armor_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_Tura_Offroad_armor_AT_lxWS: I_Tura_Offroad_armor_AT_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_Tura_Offroad_armor_armed_lxWS: I_Tura_Offroad_armor_armed_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class O_Tura_UAV_02_IED_lxWS: UAV_02_IED_Base_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 // Blufor
 class B_Tura_defector_lxWS: I_SFIA_defector_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_Tura_deserter_lxWS: I_SFIA_deserter_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_Tura_enforcer_lxWS: I_SFIA_enforcer_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_Tura_hireling_lxWS: I_SFIA_hireling_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_Tura_HeavyGunner_lxWS: I_Tura_HeavyGunner_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_Tura_scout_lxWS: I_SFIA_scout_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_Tura_medic2_lxWS: I_SFIA_medic2_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_Tura_thug_lxWS: I_SFIA_thug_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_Tura_soldier_UAV_lxWS: B_Tura_deserter_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_Tura_watcher_lxWS: I_SFIA_watcher_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 // Vehicles
 class B_Tura_Offroad_armor_lxWS: I_Tura_Offroad_armor_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_Tura_Offroad_armor_AT_lxWS: I_Tura_Offroad_armor_AT_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_Tura_Offroad_armor_armed_lxWS: I_Tura_Offroad_armor_armed_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_Tura_UAV_02_IED_lxWS: UAV_02_IED_Base_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
diff --git a/addons/hidden_units/ws/una.hpp b/addons/hidden_units/ws/una.hpp
index d4ebc73d..f63c5467 100644
--- a/addons/hidden_units/ws/una.hpp
+++ b/addons/hidden_units/ws/una.hpp
@@ -1,126 +1,95 @@
 class B_UN_soldier_AR_lxWS: B_soldier_AR_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_HeavyGunner_lxWS: B_UN_soldier_AR_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_Soldier_lxWS: B_Soldier_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_Soldier_unarmed_lxWS: B_UN_Soldier_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_survivor_lxWS: B_UN_Soldier_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_medic_lxWS: B_medic_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_crew_lxWS: B_crew_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_engineer_lxWS: B_engineer_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_Soldier_GL_lxWS: B_Soldier_GL_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_Helipilot_lxWS: B_Helipilot_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_officer_lxWS: B_officer_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_soldier_repair_lxWS: B_soldier_repair_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_Soldier_lite_lxWS: B_Soldier_lite_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_Soldier_TL_lxWS: B_Soldier_TL_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_soldier_LAT2_lxWS: B_soldier_LAT2_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 
 // Vehicles
 class B_UN_APC_Wheeled_01_command_lxWS: APC_Wheeled_01_command_base_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UNA_APC_Wheeled_02_hmg_lxWS: APC_Wheeled_02_hmg_base_lxws {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UNA_APC_Wheeled_02_unarmed_lxWS: APC_Wheeled_02_unarmed_base_lxws {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_Truck_01_mover_lxWS: B_Truck_01_mover_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_Truck_01_ammo_lxWS: B_Truck_01_ammo_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_Truck_01_box_lxWS: B_Truck_01_box_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_Truck_01_fuel_lxWS: B_Truck_01_fuel_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_Truck_01_medical_lxWS: B_Truck_01_medical_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_Truck_01_Repair_lxWS: B_Truck_01_Repair_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_Truck_01_transport_lxWS: B_Truck_01_transport_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_Truck_01_covered_lxWS: B_Truck_01_covered_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_MRAP_01_lxWS: B_MRAP_01_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_Offroad_lxWS: Offroad_01_base_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_Offroad_Armor_lxWS: Offroad_01_armor_base_lxWS {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_UN_Heli_Transport_02_lxWS: Heli_Transport_02_base_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };
 class B_MBT_03_cannon_lxWS: I_MBT_03_cannon_F {
-    scope = 1;
-    scopeCurator = 1;
+    MACRO_HIDE_VEHICLE;
 };