Switch over to HashMap/Map from TreeMap/SortedMap wherever possible