Added alarms controller/models