Context API corrections

Jira: API-11