Update to follow message template changes