Improve logging capabilities