Updating logging methods and classes refactoring