Improve logging
Improve logging