Added functionality for alerts