Start to add support for multi-channel audio