Make the Client API more consistent with the Channel API