Refactored ModulesManager