Added more instrumentation.