Updated logging mechanism