Logging - more enhancements?