Improved logging calls