Added Logger support