changes to data classes