Model Refactor