ModuleManager converted to a singleton