Extended the data scraper method