Fleshing out query capabilities