Adding more tracing