Updated scraper & middleware that uses scraper