small updates to data classes