Add Diagnostics tracing