Add extra tracing