Reworked diagnostics updates to support traffic separation