RawMessages reworked