* Fixes on the CM import logic