server changes for rpc