Added support for modules.