Add DataQuery and replace getting via String.