Revamp packet handler
Revamp packet handler