VG-1570: Map fields to correct Voyager field types