Updated File_Extractor