Updated Packet classes