Switches to using the new query methods.