Make logging more informative