added support for modules