Adding support for contexts.