On #752, updating the hash structure to be dict-style for easy name lookup and insert