Modified scraper to save state