Add Query data structure