Made the field mapping use a dictionary representation to make the JSON nicer