Adding support for notifications