Updated logging behavior