Extra tracer step, added tracing to monolithic exchoer also