Added support for basic notifications