Updated query protocols.