Added support for watch task