Refactored channel module