Improve trace tool