Update packet refactoring