Adds Query Datasets and Update Datasets support