Draft: improve IMC/IMCC related functions