Added watchdog, added singleton.