More logging refinement