Update with new query methods