Updated logging implementation