Added tracing
Added tracing