Added a hashtable instead of array list