Update Message structure, Notice this commit can not pass build.