FVF scraper and Fuels scraper added for testing