Various data updates and structure changes