Refactored code to reduce coupling between models
Refactored code to reduce coupling between models