Updated diagnostics to support traffic separation