Flagging and structure changes