RPCService modified