Add Fields to all core mappings and deprecate MultiFieldMapping