Add alarming support
6 files changed