Client plugin RPC call improvement