[Update] Packet Refactoring