Channel refactor