First commit for QueryService