Added new data structures and funneled query data into them.