More Control Over RPC Replacement