Improve the alert service