Replace instances of Hashtable with HashMap