Logger rework