More RPC updates