Changing Group to use TreeSet