Improved watchlist functionality