Added a `query` option for ease of use.