Add the support for notification values