Update scraper method to be more robust