Added adoption extractor