Improve the notification system