Moved the entity utils