Changes for more versatile logging supports