Added more instrumentation