Reworked diagnostics updates to support traffic separation (for consistency)