Change scraper-code to new formats