Updated to support scanning for modules to load