Added Hashtable support