Notification system improvements