Started adding multichannel support