Made lookup faster with a Hashtable instead of a TreeMap