More hash map changes.