Add multichannel support