Add query string generation