Adapt to UnMHT 6 structural change