Changed types from Hash to StringMap, IntHash to IntMap