Add support for Alerts