Add Logger support