Improved scraper loading