Hashtable class refactored