Added support for multiple channels