More conversion to rpc