Change implementation to use util.collections.HashTable instead of deprecated util.Hashmap