Update for final data format