Using latest API for notification, update code