Reworked diagnostics updates to support traffic separation

I'm sure enough so I've made this change in my branch, shout tomorrow if I'm wrong.