Factored instrumentation