Merge watch_spec_table and watch_table into one