Refactor Entities