Include field names in image_refs