ARC to WARC mapping improved