More TreeMap Related Changes