Refactoring Model