Data class refactoring.