add support for fielddata in mapping