Made the MetadataExtractor interface just a little bit more generic.