Added Hashtable functioning