Improvements to FD scraper