Beefing up logging infrastructure