Improve scraper