Beta 6: Logging Refactoring