adding support for notifications