Merge "Export support types from extractors"