Add support for query parameters