Channels refactored