toolbox: Improve hash map