Refactor packet IDs