Improve trace