DataService and Query interface changes + use study definition service