Added trap v2 packet

New v2 hard packet and some rafactor.