added support for notifications