removed addModules, some api changed