added support for new packet structure