Improved scraping mechanism.