Updated message builders