Refactoring of Update packet