Added queries for dataset construction