[IM] More improvements