Added the beginnings of DataQuery