Improved Logger compatibility