Add support for multi-device contexts