Improve Logger