hashmap improvements