Added JSON output for additional classes, some minor changes.