Added some channel handling