Add support for alerts