Changes for notification service