Added multi-channel expansion