Updates to the DataQuery module