EP-113: Migration for the new fields