Extraction updated to the handlers