Added unwatch method