Refactor entityUtil