Updated PacketHandler