Added support for passing ?query data