Logger refactoring - WIP