Update to notification system