Added support for new requests and notifications