Improved logging further