Refactored Model classes