RPC Request refactor complete