Multi-channel support added