Updated the extractors