Changing handling of JSON