Add support for alerts only