Add UrlEncoded support