FEATURE: Use per logger for more compatibility