Adding more tracer functionality.