Rearranged structs in Messenger for better data size packing