Changed the JSON output a bit