Added support for the notify