Added support for extra query string parameters