Adds support for multi-stream on multiple devices