revise rpc structure.