hash map enhancements part 2