[#4] Replaced state record for map.