Added support for channels with keys