Update data types in all places for the new data structures