Updated logging and configuration