Improved Tactical Modes support