Change OECD extractor to adapt it to the new model