Add support for labels on field values