Just match on type and not extractor?