Add support for different channels