Decouple trace functionality from principal
Improve trace command results