Extraction of the new API