Add SortEntities and SortPoints methods