Improved logging facilities