Refactoring data classes.