Added packet handler support