WIP: Added support for ContextNotification - changed hardcoded status to enum