Improve Logging System