More flexible instrumentation