Refactor channels from workers