Add extractors