Improve logging data collected