Changes for combo API update (combo.isSupportedModule)