adapted extraction and mapping module to the new output of the parser