Minor changes to AlarmModel