That is what I am thinking yes. I would actually like to do some refactoring of the "Query" api in light of raster being added. Was planning on tackling that later.