Modified for integration test
Refactor watchdog-related