Updated functionality to include additional components in JSON output