Some Changes for Logging