I'd go ahead and change `Query()` as well