change: improved logging support