Updated scraper