Improved JSON format