Rework the way modules are added to allow mail module be added even if it is not enabled