Started adding query param support to the Query type