Adding instrumentation