Channel connection working - refactoring