Modules without core_resource now do not appear. Also refactored logic