Change construction of packet