Improve memory management of CMT