Enhance the support for the modules not in CMD standard