Improved logging in Infrastructure layer.