More integration of HashMaps