Added support for query string