Improved JSON creation
Improved JSON output