Moved channel subscription logic