Add support for buffering channels