Added support for Modules