Added support for query strings