better support for multiple simultaneous contexts