Adding fixes and refactoring for Logging component