Added scraping resilience