Adding Notification functionality