Add support for client_reader to handle more APIs