Changes to match the new data structure