Logging improvement