Added watchdog in resource
Refactor of methods names