Add data structure and integrate to save watch states