Refactor channel connectors