Improved the json features.