Added watched mechanism