Revised version of Module Extract