improved map, json data