Improved JSON file format,