Further updates to RPC refactoring