Updates to module management