added support for contexts