Greatly improved adding modules.