Improved HashTable