Add support for required contexts.