Add support for query string