Update to MessageWriter2