Update to packet structure