Refractoring Channel import