Updated to use RPCClient