Add watchlist support