Improve the module management.