Update for new data structure