Modifications and additions to notification service and mail service