Added additional instrumentation