[m] Updated MMap extraction conditions with MOP maps