Adding Logging component fix and refactoring