Add watch and notify