Further simplified ModuleRegistry