Changed output to JSON