2.3/dev Pass the model for more flexibility but still set the query