Updated logging.  Added enabled flag