Refactor channel methods