Added additional tracing