Entities improvements