Updated data scraping