Added instrumentation for testing