Added more tracer code