Update to match new packet elements