Added querying capability

yea