Added channel management