Moved to PacketUtils