Updates to notification system