Added support for query parameters.