(M-05933): Modify structure.