Add tracing for easier debugging