Update code to use changes in message builders