Enhance the logging instrumentation