Improved HashTable class