Added JSON-output again