Changed the scraper for V2