Fixed some bugs; added support for ModuleManager syntax