Tracer refactoring