Update to use HashMaps