Add 'faceM-N' support