Revise the notification service