Added granularity for instrumentation.