Added the event registration into the watchdog mechanic