First step at aligning the JSON output with the new CTS2 JSON Spec.