HashTable is smarter now