Add some logging enhacements