Improve logging possibilities