Added multi endpoint support and watchdog versioning.