Updates to how armed & switch states are managed