Highly needed improvement to reference fields by id, so name changes don't affect the field map.