Update with latest message changes