Added services and refactor of alarms