Updated fields to account for data format change