Update to current Notification spec