Adding multi hashtable support