Fixing mapping with json data.