Updated logging system