Starting to add more robust support for query services.