Updates to the NotificationService