Enhanced tracer

Closes #86