Improve comparator and add age