Updated watchdog and logging