Refactored Models
Refactored the model