Adding some support for modules.