Added the Notification functionality