Get rid of rid in favor of req_handle