#169 channel macros refactored