Add support for query strings