Added support for notifications