Enhancing the notification system