Replaced Client with Channel, fixed numerous cycles