Improve alarm service