Added explicit abbreviation field plus data migrations