More comprehensive DEBUG log instrumentation