Added some instrumentation