[Michael] Add traces.