Integrated old Message construction into new format