Updated to include user_switch_role