Query constructor API changes