Add base context interfaces and make existing context interface implement them