Refactored and renamed models for clarity