Adding arming/disarming capability