Add more instrumentation.