[Extractor] Small tweak to make ExtractorType more readable
Add metadata system