Add watchdog for property scan