More changes to data structure.