Improve Strategy to have a the response type depend on the query type
-