Update to module_comp. 6/10