Updated Query to new packet format