Got rid of Hashtable