Added more keys to JSON output