Removed RIV specifics