Procedure Extractor updated