Refactor 2
Alarm Json added
Alarm Json added