Updated Query Interface