Updated with Notification enhancements