watch: add 'watch' support