Adding 'watch' option