Added instrumentation for timing