Data updates

Data structure changes