Reworked diagnostics updates to support traffic separation

I think this should be without the namespace surely?  The comment (and the later code) suggest so.