Refactoring Entity to Model