Started adding a shim for the query serivce.