Added hashtable support