Updates to scrape functionality