Added Notification class updates