Replaced ModuleInfo arrays with Map container