Add support for channels