Extraction API refactored