Add punycode support