Code cleaning
Entities are sorted in their natural order