WebModuleScrap improvements