Optimised for v2 scraper