Refactoring model classes.