Refactoring Entityes