Updated to match the latest RPC Spec