Fix circular reference in channels model