Updated diagnostics for new diagnotic output