Improve logging accuracy