Changed Logger to singleton