Module build script imrprovements