[m] More structure updates