More changes to FileCrawler