Added an extractor for filenames with extensions