Changed Hashtable implementation