Added some instrumentation.