Added new features for Notification