Start adding query helpers to example