Improve Logging in order to get some better Performance info