Add additional instrumentation