Improve Loggging