ModuleLocator improvements