Refactored data with classes.