adding support for watch tasks