Extended logging output
Extended logging output
Extended logging output, refactoring