Add custom query string support