Improved scrape functionality