Updated scraper and merger