changes for supporting RPC