Added Point and POINT_Sorter