Modifications to data scraper