Move watchdog to service function