Update for newer versions of cdec/extractor