Added a few more attributes to JSON output