Logging feature added
Configuration class tested
Refactoring