Updated DirectoryScanner