Add configurable watch mechanism