* Entities fix