Refactored model classes