Add some more tracing