Added tracing diagnostic option