Improve instrumentation