Add remaining watch tasks