Diagnostic tracing added