Add support for multiple video and audio streams