Logging support and some code refactoring