Updating Notification API following AT comments