Refactor - Entity mostly