Adding more elaborate tracing.