Entity Refactor