Improvements to WatchTask