[*] Improve packet parsing