Refine the Client.proto