Refactored model
Refactored model