Moved code to FileSystemImporter