Refactored model classes.