Add support for multiple-device contexts