Simplify query interface
Make version configurable