Updated watchdog for validation