Refactored model methods